Conda package lib inclusion

.github/workflows/actions.yml

@@ -50,19 +50,19 @@ jobs:
         cache-downloads-key: ${{ runner.os }}-downloads-${{ hashFiles('**/environment.yml') }}
         condarc: |
           channels:
-            - mcvine
             - conda-forge
     - name: build python wheel
       shell: bash -l {0}
       run: |
         python -m build --wheel --no-isolation
+        check-wheel-contents dist/histogram*.whl
     - name: build conda package
       run: |
         # set up environment
         cd conda.recipe
         echo "versioningit $(versioningit ../)"
         # build the package
-        CHANNELS="--channel mcvine --channel conda-forge"
+        CHANNELS="--channel conda-forge"
         VERSION=$(versioningit ../) conda mambabuild $CHANNELS --output-folder . .
         conda verify noarch/histogram*.tar.bz2
     - name: upload conda package to anaconda

README.md

@@ -19,7 +19,7 @@ histogram data object
     # create a conda package
     $ cd conda.recipe
     $ echo "versioningit $(versioningit ../)"
-    $ CHANNELS="--channel mcvine --channel conda-forge"
+    $ CHANNELS="--channel conda-forge"
     $ VERSION=$(versioningit ../) conda mambabuild $CHANNELS --output-folder . .
     $ conda verify noarch/histogram-*.tar.bz2
     # install a local conda package

conda.recipe/build.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+#lib folder
+mkdir -p $PREFIX/include/histogram
+cp -r lib/* $PREFIX/include/histogram/
+
+# in case a shared library is needed
+# shared library for linux
+# cd lib/
+# src_files=$(ls *.cc)
+
+# mkdir -p $PREFIX/lib
+# ${CXX} -c -fPIC $src_files
+# ${CXX} -shared -o $PREFIX/lib/libhistogram.so $(ls *.o)
+# cd ..
+
+#Python files
+mkdir -p $PREFIX/lib/python$(python -c 'import sys; print(".".join(map(str, sys.version_info[:2])))')/site-packages/histogram
+cp -r src/histogram/* $PREFIX/lib/python$(python -c 'import sys; print(".".join(map(str, sys.version_info[:2])))')/site-packages/histogram/
+
+#Executable plothist
+mkdir -p $PREFIX/bin
+cp -r bin/plothist $PREFIX/bin/

conda.recipe/meta.yaml

@@ -18,11 +18,13 @@ package:
 source:
   path: ..
 
+
 build:
+  script_env:
+    - {{ compiler("c") }}
+    - {{ compiler("cxx") }}
   noarch: python
   number: {{ build_number }}
-  string: py{{py}}
-  script: {{ PYTHON }} -m pip install . --no-deps --ignore-installed -vvv
 
 requirements:
   host:
@@ -34,8 +36,11 @@ requirements:
   build:
     - setuptools>=42
     - versioningit
+
   run:
     - numpy
+    - matplotlib
+    - h5py
 
 test:
   imports:

environment.yml

@@ -1,6 +1,5 @@
 name: histogram-dev
 channels:
-  - mcvine
   - conda-forge
 dependencies:
   - anaconda-client

src/histogram/Histogram.py

@@ -11,6 +11,8 @@
 
 import operator
 from .DictAttributeCont import AttributeCont
+from . import _units as units
+from histogram.utils.units.SI import second
 import logging
 
 logger = logging.getLogger("Histogram")
@@ -1102,10 +1104,8 @@ def test_equalUnit():
     assert _equalUnit(1, 2) == False
     assert _equalUnit(1, 1) == True
     assert _equalUnit(1, 1 + 1e-10) == True
-    from . import _units as units
 
     meter = units.length.meter
-    second = units.time.second
     assert _equalUnit(1 * meter, 1 * meter) == True
     assert _equalUnit(1 * meter, 1) == False
     assert _equalUnit(1 * meter, 1 * second) == False