py-shapely: new version, Python 3.7 fix (#16438)

var/spack/repos/builtin/packages/py-shapely/package.py

@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+import os
 
 
 class PyShapely(PythonPackage):
@@ -11,7 +11,7 @@ class PyShapely(PythonPackage):
     """
 
     homepage = "https://github.com/Toblerity/Shapely"
-    url      = "https://pypi.io/packages/source/S/Shapely/Shapely-1.6.4.post2.tar.gz"
+    url      = "https://pypi.io/packages/source/S/Shapely/Shapely-1.7.0.tar.gz"
 
     maintainers = ['adamjstewart']
     import_modules = [
@@ -19,9 +19,11 @@ class PyShapely(PythonPackage):
         'shapely.examples', 'shapely.speedups', 'shapely.vectorized',
     ]
 
+    version('1.7.0', sha256='e21a9fe1a416463ff11ae037766fe410526c95700b9e545372475d2361cc951e')
     version('1.6.4.post2', sha256='c4b87bb61fc3de59fc1f85e71a79b0c709dc68364d9584473697aad4aa13240f')
     version('1.6.4', sha256='b10bc4199cfefcf1c0e5d932eac89369550320ca4bdf40559328d85f1ca4f655')
 
+    depends_on('python@2.7:2.8,3.4:', when='@1.7:', type=('build', 'run'))
     depends_on('python@2.6:', type=('build', 'run'))
     depends_on('py-setuptools', type='build')
     depends_on('py-cython', type='build')
@@ -29,6 +31,14 @@ class PyShapely(PythonPackage):
     depends_on('geos')
     depends_on('geos@3.3:', when='@1.3:')
     depends_on('py-pytest', type='test')
+    depends_on('py-pytest-cov', type='test')
+
+    @when('^python@3.7:')
+    def patch(self):
+        # Python 3.7 changed the thread storage API, precompiled *.c files
+        # need to be re-cythonized
+        os.remove('shapely/speedups/_speedups.c')
+        os.remove('shapely/vectorized/_vectorized.c')
 
     def setup_build_environment(self, env):
         env.set('GEOS_CONFIG',