Merge pull request #208 from bgilbert/pytest

Fix running pytest in root of repo

.github/workflows/python.yml

@@ -53,11 +53,11 @@ jobs:
           ;;
         esac
     - name: Install
-      run: pip install -e .
+      run: pip install .
     - name: Run tests
       run: pytest -v
     - name: Tile slide
-      run: python examples/deepzoom/deepzoom_tile.py --viewer -o tiled tests/small.svs
+      run: python examples/deepzoom/deepzoom_tile.py --viewer -o tiled tests/fixtures/small.svs
   windows:
     name: Windows
     needs: pre-commit
@@ -117,7 +117,7 @@ jobs:
         python examples/deepzoom/deepzoom_tile.py -h >/dev/null
     - name: Tile slide
       # Reads OPENSLIDE_PATH
-      run: python examples/deepzoom/deepzoom_tile.py --viewer -o tiled tests/small.svs
+      run: python examples/deepzoom/deepzoom_tile.py --viewer -o tiled tests/fixtures/small.svs
     - name: Archive wheel
       uses: actions/upload-artifact@v3
       with:

.gitignore

@@ -2,5 +2,4 @@
 /dist
 /MANIFEST
 /*.egg-info
-/openslide/_convert*.so
 *.pyc

MANIFEST.in

@@ -1,4 +1,4 @@
-include *.md
+include *.md pytest.ini
 recursive-include doc *.py *.rst
 recursive-include examples *.html *.js *.png *.py
 recursive-include tests *.png *.py *.svs *.tiff

pytest.ini

@@ -0,0 +1,7 @@
+[pytest]
+minversion = 6.0
+# don't try to import openslide from the source directory, since it doesn't
+# have the compiled extension module
+addopts = --import-mode importlib
+# allow tests to import common module
+pythonpath = tests

tests/__init__.py → tests/common.py

@@ -45,7 +45,7 @@
 
 
 def file_path(name):
-    return Path(__file__).parent / name
+    return Path(__file__).parent / 'fixtures' / name
 
 
 def maybe_supported(f):

tests/test_base.py

@@ -19,9 +19,9 @@
 
 import unittest
 
-from openslide import ImageSlide, OpenSlide, open_slide
+from common import file_path
 
-from . import file_path
+from openslide import ImageSlide, OpenSlide, open_slide
 
 
 class TestLibrary(unittest.TestCase):

tests/test_deepzoom.py

@@ -19,11 +19,11 @@
 
 import unittest
 
+from common import file_path
+
 from openslide import ImageSlide, OpenSlide
 from openslide.deepzoom import DeepZoomGenerator
 
-from . import file_path
-
 
 class _BoxesDeepZoomTest:
     def setUp(self):

tests/test_imageslide.py

@@ -20,11 +20,10 @@
 import unittest
 
 from PIL import Image
+from common import file_path, maybe_supported
 
 from openslide import ImageSlide, OpenSlideCache, OpenSlideError
 
-from . import file_path, maybe_supported
-
 
 class TestImageWithoutOpening(unittest.TestCase):
     def test_detect_format(self):

tests/test_openslide.py

@@ -23,6 +23,7 @@
 import unittest
 
 from PIL import Image
+from common import file_path, maybe_supported
 
 from openslide import (
     OpenSlide,
@@ -31,8 +32,6 @@
     OpenSlideUnsupportedFormatError,
 )
 
-from . import file_path, maybe_supported
-
 
 class TestCache(unittest.TestCase):
     @maybe_supported