TST: Handle OSError on shapely import (#1152)

pyproj4 · Sep 22, 2022 · e88393c · e88393c
1 parent 2c0abe3
commit e88393c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -133,7 +133,7 @@ jobs:
           CIBW_BEFORE_ALL_LINUX: bash ./ci/proj-compile-wheels.sh
           CIBW_BEFORE_ALL_MACOS: bash ./ci/proj-compile-wheels.sh
           CIBW_TEST_REQUIRES: cython pytest oldest-supported-numpy pandas xarray
-          CIBW_BEFORE_TEST: python -m pip install shapely~=1.7.1 || echo "Shapely install failed"
+          CIBW_BEFORE_TEST: python -m pip install shapely || echo "Shapely install failed"
           CIBW_TEST_COMMAND: >
             pyproj -v &&
             python -c "import pyproj; pyproj.Proj(init='epsg:4269')"  &&

diff --git a/requirements-test.txt b/requirements-test.txt
@@ -3,5 +3,5 @@ pytest>3.6
 pytest-cov
 numpy
 pandas
-shapely; python_version < '3.11'
+shapely
 xarray
diff --git a/test/test_doctest_wrapper.py b/test/test_doctest_wrapper.py
@@ -26,8 +26,8 @@ def test_doctests():
     failure_count = failure_count_proj + failure_count_crs + failure_count_geod
     expected_failure_count = 0
     try:
-        import shapely  # noqa: F401 pylint: disable=unused-import
-    except ImportError:
+        import shapely.geometry  # noqa: F401 pylint: disable=unused-import
+    except (ImportError, OSError):
         # missing shapely
         expected_failure_count = 6
 

diff --git a/test/test_geod.py b/test/test_geod.py
@@ -27,7 +27,7 @@
     from shapely.geometry.polygon import orient
 
     SHAPELY_LOADED = True
-except ImportError:
+except (ImportError, OSError):
     SHAPELY_LOADED = False