use pytest

Author: JLBegin

.github/workflows/ci.yaml

@@ -42,8 +42,14 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Install tox
-        run: pip install tox
+      - name : Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          python -I -m pip install setuptools>=40.8.0 wheel pytest
+          python -m pip freeze --all
+          python -m pip install -r requirements.txt
+          python -m pip freeze --all
 
       - name: Run tests
-        run: tox -e py${{ matrix.python-version }}
+        run: |
+          python -m pytest -v

pytest.ini

@@ -0,0 +1,3 @@
+[pytest]
+testpaths = pytissueoptics
+python_files = test*.py

pytissueoptics/rayscattering/opencl/config/CLConfig.py

@@ -212,7 +212,11 @@ def save(self):
     def _devices(self) -> List[cl.Device]:
         devices = []
         for platform in cl.get_platforms():
-            devices += platform.get_devices()
+            try:
+                devices += platform.get_devices()
+            except Exception as e:
+                warnings.warn(f"Error getting devices from platform {platform.name}: {e}")
+                continue
         return devices
 
     @property

pytissueoptics/scene/tests/intersection/testBoundingBoxIntersect.py

@@ -5,7 +5,7 @@
 from pytissueoptics.scene.intersection.bboxIntersect import BoxIntersectStrategy, GemsBoxIntersect, ZacharBoxIntersect
 
 
-class TestAnyBoxIntersect:
+class BaseTestAnyBoxIntersect:
     @property
     def intersectStrategy(self) -> BoxIntersectStrategy:
         raise NotImplementedError
@@ -83,7 +83,7 @@ def testGivenRayLengthLongerThanBoxIntersection_shouldReturnIntersection(self):
         self.assertEqual(0.0, intersection.z)
 
 
-class TestGemsBoxIntersect(TestAnyBoxIntersect, unittest.TestCase):
+class TestGemsBoxIntersect(BaseTestAnyBoxIntersect, unittest.TestCase):
     def testGivenLineIntersectingRayAndBox_shouldReturnClosestIntersectionPoint(self):
         box = BoundingBox([1, 2], [1, 2], [-1, 0])
         rayOrigin = Vector(-1, -1, 0)
@@ -103,7 +103,7 @@ def intersectStrategy(self) -> BoxIntersectStrategy:
         return GemsBoxIntersect()
 
 
-class TestZacharBoxIntersect(TestAnyBoxIntersect, unittest.TestCase):
+class TestZacharBoxIntersect(BaseTestAnyBoxIntersect, unittest.TestCase):
     def testGivenLineIntersectingRayAndBox_shouldReturnNone(self):
         box = BoundingBox([0, 1], [0, 1], [-1, 0])
         rayOrigin = Vector(-1, -1, 0)

pytissueoptics/scene/tests/intersection/testIntersectionFinder.py

@@ -13,7 +13,7 @@
 )
 
 
-class TestAnyIntersectionFinder:
+class BaseTestAnyIntersectionFinder:
     def getIntersectionFinder(self, solids) -> IntersectionFinder:
         raise NotImplementedError
 
@@ -227,13 +227,13 @@ def assertVectorEqual(self, expected, actual):
         self.assertEqual(expected.z, actual.z)
 
 
-class TestSimpleIntersectionFinder(TestAnyIntersectionFinder, unittest.TestCase):
+class TestSimpleIntersectionFinder(BaseTestAnyIntersectionFinder, unittest.TestCase):
     def getIntersectionFinder(self, solids) -> IntersectionFinder:
         scene = Scene(solids)
         return SimpleIntersectionFinder(scene)
 
 
-class TestFastIntersectionFinder(TestAnyIntersectionFinder, unittest.TestCase):
+class TestFastIntersectionFinder(BaseTestAnyIntersectionFinder, unittest.TestCase):
     def getIntersectionFinder(self, solids) -> IntersectionFinder:
         scene = Scene(solids)
         return FastIntersectionFinder(scene)

pytissueoptics/scene/tests/intersection/testPolygonIntersect.py

@@ -5,7 +5,7 @@
 from pytissueoptics.scene.intersection.mollerTrumboreIntersect import MollerTrumboreIntersect
 
 
-class TestAnyPolygonIntersect(unittest.TestCase):
+class BaseTestAnyPolygonIntersect(unittest.TestCase):
     vertices = [Vertex(0, 0, 0), Vertex(1, 0, 0), Vertex(1, 1, 0), Vertex(0, 1, 0)]
     triangle = Triangle(vertices[0], vertices[1], vertices[3])
     quad = Quad(vertices[0], vertices[1], vertices[2], vertices[3])