import speedups from vectorized (#1197)

* import speedups from vectorized

* Add LineString to doctest_namespace

* Move conftest.py to geometry module to support doctests

* Add conftest.py

CHANGES.txt

@@ -9,6 +9,11 @@ Deprecations:
 The almost_exact() method of BaseGeometry has been deprecated. It is confusing
 and will be removed in 2.0.0. The equals_exact() method is to be used instead.
 
+Bug fixes:
+
+- We ensure that the _speedups module is always imported before _vectorized to
+  avoid an unexplained condition on Windows with Python 3.8 and 3.9 (#1184).
+
 1.8a3 (2021-08-24)
 ------------------
 

appveyor.yml

@@ -65,6 +65,7 @@ build_script:
   - python -c "import shapely; print(shapely.__version__)"
   - python -c "from shapely.geos import geos_version_string; print(geos_version_string)"
   - python -c "from shapely import speedups; assert speedups.enabled"
+  - python -c "from shapely import vectorized"
 
 
 cache:

shapely/geometry/base.py

@@ -781,9 +781,9 @@ def equals(self, other):
         Examples
         --------
         >>> LineString(
-        ...     (0, 0), (2, 2)
+        ...     [(0, 0), (2, 2)]
         ... ).equals(
-        ...     LineString((0, 0), (1, 1), (2, 2))
+        ...     LineString([(0, 0), (1, 1), (2, 2)])
         ... )
         True
 
@@ -831,9 +831,9 @@ def equals_exact(self, other, tolerance):
         Examples
         --------
         >>> LineString(
-        ...     (0, 0), (2, 2)
+        ...     [(0, 0), (2, 2)]
         ... ).equals_exact(
-        ...     LineString((0, 0), (1, 1), (2, 2)),
+        ...     LineString([(0, 0), (1, 1), (2, 2)]),
         ...     1e-6
         ... )
         False
@@ -864,9 +864,10 @@ def almost_equals(self, other, decimal=6):
         Examples
         --------
         >>> LineString(
-        ...     (0, 0), (2, 2)
-        ... ).almost_equals(
-        ...     LineString((0, 0), (1, 1), (2, 2))
+        ...     [(0, 0), (2, 2)]
+        ... ).equals_exact(
+        ...     LineString([(0, 0), (1, 1), (2, 2)]),
+        ...     1e-6
         ... )
         False
 

shapely/geometry/conftest.py

@@ -0,0 +1,10 @@
+"""Autouse fixtures for doctests."""
+
+import pytest
+
+from .linestring import LineString
+
+
+@pytest.fixture(autouse=True)
+def add_linestring(doctest_namespace):
+        doctest_namespace["LineString"] = LineString

shapely/vectorized/__init__.py

@@ -1,3 +1,5 @@
 """Provides multi-point element-wise operations such as ``contains``."""
 
+from shapely import speedups
+
 from ._vectorized import (contains, touches)

tests/conftest.py

@@ -15,6 +15,7 @@ def pytest_addoption(parser):
     parser.addoption("--without-speedups", action="store_true", default=False,
                      help="Run tests without speedups.")
 
+
 def pytest_runtest_setup(item):
     if item.config.getoption("--with-speedups"):
         import shapely.speedups
@@ -30,6 +31,7 @@ def pytest_runtest_setup(item):
         assert(shapely.speedups.enabled is False)
         print("Speedups disabled for %s." % item.name)
 
+
 def pytest_report_header(config):
     headers = []
     try: