unit leftover fixed, conda build cleanp

neutrons · Feb 18, 2025 · 06a3f78 · 06a3f78
1 parent f58c336
commit 06a3f78
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/conda.recipe/build.sh b/conda.recipe/build.sh
@@ -9,8 +9,8 @@ cd lib/
 src_files=$(ls *.cc)
 
 mkdir -p $PREFIX/lib
-g++ -c -fPIC $src_files
-g++ -shared -o $PREFIX/lib/libhistogram.so $(ls *.o)
+${CXX} -c -fPIC $src_files
+${CXX} -shared -o $PREFIX/lib/libhistogram.so $(ls *.o)
 cd ..
 
 #Python files

diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml
@@ -25,10 +25,6 @@ build:
     - CXX
   noarch: python
   number: {{ build_number }}
-  #script: ./build.sh
-  #string: py{{py}}
-  #script: {{ PYTHON }} -m pip install . --no-deps --ignore-installed -vvv
-  #https://docs.conda.io/projects/conda-build/en/stable/resources/define-metadata.html
 
 requirements:
   host:

diff --git a/src/histogram/Histogram.py b/src/histogram/Histogram.py
@@ -1103,9 +1103,9 @@ def test_equalUnit():
     assert _equalUnit(1, 1) == True
     assert _equalUnit(1, 1 + 1e-10) == True
     from . import _units as units
+    from histogram.utils.units.SI import second
 
     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