CI: move testing into virtualenv

osmcode · Sep 18, 2024 · 486d4af · 486d4af
1 parent bf10625
commit 486d4af
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 20 deletions.
diff --git a/.github/actions/run-tests/action.yml b/.github/actions/run-tests/action.yml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -109,15 +109,19 @@ jobs:
 
             - name: Install osmium
               run: |
-                pip install osmium*${PYVER/./}*.whl
+                pip install virtualenv
+                virtualenv osmium-test
+                WHEEL=`ls osmium*${PYVER/./}*.whl`
+                ./osmium-test/bin/pip install ${WHEEL}[tests]
               shell: bash
               env:
                 PYVER: ${{ matrix.python-version }}
 
-            - uses: ./.github/actions/run-tests
-
+            - name: Run tests
+              run: ./osmium-test/bin/pytest test
+              shell: bash
 
-    build-ubuntu:
+    build-platform:
         runs-on: ${{ matrix.platform }}
 
         strategy:
@@ -193,7 +197,7 @@ jobs:
               if: ${{ matrix.flavour == 'linux' }}
 
             - name: Install packages
-              run: brew install boost geos lz4
+              run: brew install boost geos
               shell: bash
               if: ${{ matrix.flavour == 'macos' }}
 
@@ -345,9 +349,14 @@ jobs:
 
             - name: Install osmium
               run: |
-                pip install osmium*${PYVER/./}*.whl
+                pip install virtualenv
+                virtualenv osmium-test
+                WHEEL=`ls osmium*${PYVER/./}*.whl`
+                ./osmium-test/Scripts/pip install ${WHEEL}[tests]
               shell: bash
               env:
                 PYVER: ${{ matrix.python-version }}
 
-            - uses: ./.github/actions/run-tests
+            - name: Run tests
+              run: ./osmium-test/Scripts/pytest test
+              shell: bash
diff --git a/setup.py b/setup.py
@@ -177,7 +177,7 @@ def build_extension(self, ext):
     python_requires = ">=3.7",
     install_requires = ['requests'],
     extras_require = {
-        'tests': ['pytest', 'pytest-httpserver', 'werkzeug'],
+        'tests': ['pytest', 'pytest-httpserver', 'werkzeug', 'shapely'],
     },
     cmdclass=dict(build_ext=CMakeBuild, sdist=Pyosmium_sdist),
     zip_safe=False,