diff --git a/test/test_doctest_wrapper.py b/test/test_doctest_wrapper.py index a2ae70743..56ed40cac 100644 --- a/test/test_doctest_wrapper.py +++ b/test/test_doctest_wrapper.py @@ -5,6 +5,7 @@ import doctest import os import platform +import sys import pyproj @@ -25,12 +26,16 @@ def test_doctests(): + failure_count_geod + failure_count_transform ) - # shapely wheels not on windows, so allow failures there + # Missing shapely wheels for Windows, non x86_64 platforms, and python 3.8 expected_failure_count = 0 try: import shapely # noqa except ImportError: - if os.name == "nt" or platform.uname()[4] != "x86_64": + if ( + os.name == "nt" + or platform.uname()[4] != "x86_64" + or (sys.version_info.major, sys.version_info.minor) >= (3, 8) + ): expected_failure_count = 6 # if the below line fails, doctests have failed diff --git a/test/test_geod.py b/test/test_geod.py index bc54d1e22..f4b7c0e08 100644 --- a/test/test_geod.py +++ b/test/test_geod.py @@ -3,6 +3,7 @@ import pickle import platform import shutil +import sys import tempfile from contextlib import contextmanager @@ -28,8 +29,13 @@ skip_shapely = pytest.mark.skipif( - not SHAPELY_LOADED and (os.name == "nt" or platform.uname()[4] != "x86_64"), - reason="Missing shapely wheels for Windows.", + not SHAPELY_LOADED + and ( + os.name == "nt" + or platform.uname()[4] != "x86_64" + or (sys.version_info.major, sys.version_info.minor) >= (3, 8) + ), + reason="Missing shapely wheels for Windows, non x86_64 platforms, and python 3.8.", )