Merge pull request #66 from Sparks29032/patch-1

sbillinge · web-flow · commit 3a8ab08b779f · 2024-07-04T03:29:59.000-04:00
Fix tests
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -44,11 +44,11 @@ jobs:
           conda activate test
           conda install --file requirements/run.txt
           conda install --file requirements/test.txt
-          pip install .
+          pip install -e .
       - name: Validate diffpy.structure
         shell: bash -l {0}
         run: |
           conda activate test
-          coverage run -m pytest -vv -s
+          coverage run -m diffpy.structure.tests.run
           coverage report -m
           codecov
diff --git a/environment.yml b/environment.yml
@@ -0,0 +1,6 @@
+name: diffpy.structure
+channels:
+  - conda-forge
+dependencies:
+  - python=3
+  - pip
diff --git a/requirements/run.txt b/requirements/run.txt
@@ -0,0 +1,3 @@
+numpy < 2.0.0  # Need to fix deprecations before 2.0.0 compat
+pycifrw
+six
diff --git a/src/diffpy/structure/lattice.py b/src/diffpy/structure/lattice.py
@@ -25,7 +25,7 @@
 import numpy
 import numpy.linalg as numalg
 
-from diffpy.structure import LatticeError
+from diffpy.structure.structureerrors import LatticeError
 
 # Helper Functions -----------------------------------------------------------
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+numpy < 2.0.0 # Need to fix deprecations before 2.0.0 compat`
	`2`	`+pycifrw`
	`3`	`+six`