diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2020-05-02 23:38:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-02 23:38:30 -0500 |
| commit | eb4451dd1e48527d600715673ff214f3af9b3048 (patch) | |
| tree | 2777c83f001153be0ac9f351d6039bf2dfd7a789 /var | |
| parent | 2e63e08192d5f309049c65d415e6c05c11d968e8 (diff) | |
| download | spack-eb4451dd1e48527d600715673ff214f3af9b3048.tar.gz spack-eb4451dd1e48527d600715673ff214f3af9b3048.tar.bz2 spack-eb4451dd1e48527d600715673ff214f3af9b3048.tar.xz spack-eb4451dd1e48527d600715673ff214f3af9b3048.zip | |
py-shapely: new version, Python 3.7 fix (#16438)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/py-shapely/package.py | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/py-shapely/package.py b/var/spack/repos/builtin/packages/py-shapely/package.py index 9edb86674f..e609d61011 100644 --- a/var/spack/repos/builtin/packages/py-shapely/package.py +++ b/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', |