Merge 879c9e4 into 2fe0630

pyproj4 · Aug 20, 2019 · ab3226d · ab3226d
2 parents 2fe0630 + 879c9e4
commit ab3226d
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 24 deletions.
diff --git a/test/test_doctest_wrapper.py b/test/test_doctest_wrapper.py
@@ -15,7 +15,7 @@ def test_doctests():
     try:
         import shapely  # noqa
     except ImportError:
-        if os.name == "nt":
+        if os.name == "nt" or os.environ.get("PLAT") == "i686":
             expected_failure_count = 6
 
     # if the below line fails, doctests have failed

diff --git a/test/test_geod.py b/test/test_geod.py
@@ -26,8 +26,9 @@
     SHAPELY_LOADED = False
 
 
-skip_shapely_windows = pytest.mark.skipif(
-    not SHAPELY_LOADED and os.name == "nt", reason="Missing shapely wheels for Windows."
+skip_shapely = pytest.mark.skipif(
+    not SHAPELY_LOADED and (os.name == "nt" or os.environ.get("PLAT") == "i686"),
+    reason="Missing shapely wheels for Windows.",
 )
 
 
@@ -171,13 +172,13 @@ def test_polygon_area_perimeter__single_point():
     assert perimeter == 0
 
 
-@skip_shapely_windows
+@skip_shapely
 def test_geometry_length__point():
     geod = Geod(ellps="WGS84")
     assert geod.geometry_length(Point(1, 2)) == 0
 
 
-@skip_shapely_windows
+@skip_shapely
 def test_geometry_length__linestring():
     geod = Geod(ellps="WGS84")
     assert_almost_equal(
@@ -187,7 +188,7 @@ def test_geometry_length__linestring():
     )
 
 
-@skip_shapely_windows
+@skip_shapely
 def test_geometry_length__linestring__radians():
     geod = Geod(ellps="WGS84")
     assert_almost_equal(
@@ -205,7 +206,7 @@ def test_geometry_length__linestring__radians():
     )
 
 
-@skip_shapely_windows
+@skip_shapely
 def test_geometry_length__linearring():
     geod = Geod(ellps="WGS84")
     assert_almost_equal(
@@ -217,7 +218,7 @@ def test_geometry_length__linearring():
     )
 
 
-@skip_shapely_windows
+@skip_shapely
 def test_geometry_length__polygon():
     geod = Geod(ellps="WGS84")
     assert_almost_equal(
@@ -229,7 +230,7 @@ def test_geometry_length__polygon():
     )
 
 
-@skip_shapely_windows
+@skip_shapely
 def test_geometry_length__polygon__radians():
     geod = Geod(ellps="WGS84")
     assert_almost_equal(
@@ -250,7 +251,7 @@ def test_geometry_length__polygon__radians():
     )
 
 
-@skip_shapely_windows
+@skip_shapely
 def test_geometry_length__multipolygon():
     geod = Geod(ellps="WGS84")
     polygon = Polygon(LineString([Point(1, 2), Point(3, 4), Point(5, 2)]))
@@ -261,7 +262,7 @@ def test_geometry_length__multipolygon():
     )
 
 
-@skip_shapely_windows
+@skip_shapely
 def test_geometry_length__multipolygon__radians():
     geod = Geod(ellps="WGS84")
     polygon = Polygon(
@@ -280,7 +281,7 @@ def test_geometry_length__multipolygon__radians():
     )
 
 
-@skip_shapely_windows
+@skip_shapely
 def test_geometry_length__multilinestring():
     geod = Geod(ellps="WGS84")
     line_string = LineString([Point(1, 2), Point(3, 4), Point(5, 2)])
@@ -291,21 +292,21 @@ def test_geometry_length__multilinestring():
     )
 
 
-@skip_shapely_windows
+@skip_shapely
 def test_geometry_length__multipoint():
     geod = Geod(ellps="WGS84")
     assert (
         geod.geometry_length(MultiPoint([Point(1, 2), Point(3, 4), Point(5, 2)])) == 0
     )
 
 
-@skip_shapely_windows
+@skip_shapely
 def test_geometry_area_perimeter__point():
     geod = Geod(ellps="WGS84")
     assert geod.geometry_area_perimeter(Point(1, 2)) == (0, 0)
 
 
-@skip_shapely_windows
+@skip_shapely
 def test_geometry_area_perimeter__linestring():
     geod = Geod(ellps="WGS84")
     assert_almost_equal(
@@ -315,7 +316,7 @@ def test_geometry_area_perimeter__linestring():
     )
 
 
-@skip_shapely_windows
+@skip_shapely
 def test_geometry_area_perimeter__linestring__radians():
     geod = Geod(ellps="WGS84")
     assert_almost_equal(
@@ -333,7 +334,7 @@ def test_geometry_area_perimeter__linestring__radians():
     )
 
 
-@skip_shapely_windows
+@skip_shapely
 def test_geometry_area_perimeter__linearring():
     geod = Geod(ellps="WGS84")
     assert_almost_equal(
@@ -345,7 +346,7 @@ def test_geometry_area_perimeter__linearring():
     )
 
 
-@skip_shapely_windows
+@skip_shapely
 def test_geometry_area_perimeter__polygon():
     geod = Geod(ellps="WGS84")
     assert_almost_equal(
@@ -357,7 +358,7 @@ def test_geometry_area_perimeter__polygon():
     )
 
 
-@skip_shapely_windows
+@skip_shapely
 def test_geometry_area_perimeter__polygon__radians():
     geod = Geod(ellps="WGS84")
     assert_almost_equal(
@@ -378,7 +379,7 @@ def test_geometry_area_perimeter__polygon__radians():
     )
 
 
-@skip_shapely_windows
+@skip_shapely
 def test_geometry_area_perimeter__polygon__holes():
     geod = Geod(ellps="WGS84")
     assert_almost_equal(
@@ -393,7 +394,7 @@ def test_geometry_area_perimeter__polygon__holes():
     )
 
 
-@skip_shapely_windows
+@skip_shapely
 def test_geometry_area_perimeter__multipolygon():
     geod = Geod(ellps="WGS84")
     polygon = Polygon(LineString([Point(1, 2), Point(3, 4), Point(5, 2)]))
@@ -404,7 +405,7 @@ def test_geometry_area_perimeter__multipolygon():
     )
 
 
-@skip_shapely_windows
+@skip_shapely
 def test_geometry_area_perimeter__multipolygon__radians():
     geod = Geod(ellps="WGS84")
     polygon = Polygon(
@@ -423,7 +424,7 @@ def test_geometry_area_perimeter__multipolygon__radians():
     )
 
 
-@skip_shapely_windows
+@skip_shapely
 def test_geometry_area_perimeter__multilinestring():
     geod = Geod(ellps="WGS84")
     line_string = LineString([Point(1, 2), Point(3, 4), Point(5, 2)])
@@ -434,7 +435,7 @@ def test_geometry_area_perimeter__multilinestring():
     )
 
 
-@skip_shapely_windows
+@skip_shapely
 def test_geometry_area_perimeter__multipoint():
     geod = Geod(ellps="WGS84")
     assert geod.geometry_area_perimeter(