diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2019-06-17 19:23:41 -0500 |
|---|---|---|
| committer | Elizabeth Fischer <rpf2116@columbia.edu> | 2019-06-17 20:23:40 -0400 |
| commit | e23adbd4a97542c0109ddad11402d195450e1912 (patch) | |
| tree | 1b6adb704cb76490b6d726d00b40729a6a92e2e7 /var | |
| parent | 10d5008ef553d4624107f26f23d0477f49bafd43 (diff) | |
| download | spack-e23adbd4a97542c0109ddad11402d195450e1912.tar.gz spack-e23adbd4a97542c0109ddad11402d195450e1912.tar.bz2 spack-e23adbd4a97542c0109ddad11402d195450e1912.tar.xz spack-e23adbd4a97542c0109ddad11402d195450e1912.zip | |
Add py-pyproj 2.2.0 (#11735)
* Add py-pyproj 2.2.0
* PR review requests
* Make Python requirements more explicit
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/py-pyproj/package.py | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/var/spack/repos/builtin/packages/py-pyproj/package.py b/var/spack/repos/builtin/packages/py-pyproj/package.py index 0d06b232a8..143cf0f39b 100644 --- a/var/spack/repos/builtin/packages/py-pyproj/package.py +++ b/var/spack/repos/builtin/packages/py-pyproj/package.py @@ -9,19 +9,26 @@ from spack import * class PyPyproj(PythonPackage): """Python interface to the PROJ.4 Library.""" - homepage = "http://jswhit.github.io/pyproj/" - url = "https://github.com/jswhit/pyproj/tarball/v1.9.5.1rel" - git = "https://www.github.com/jswhit/pyproj.git" + homepage = "https://github.com/pyproj4/pyproj" + url = "https://pypi.io/packages/source/p/pyproj/pyproj-2.2.0.tar.gz" + git = "https://github.com/pyproj4/pyproj.git" - # This is not a tagged release of pyproj. - # The changes in this "version" fix some bugs, especially with Python3 use. - version('1.9.5.1.1', commit='0be612cc9f972e38b50a90c946a9b353e2ab140f') - version('1.9.5.1', 'a4b80d7170fc82aee363d7f980279835') + maintainers = ['citibeth', 'adamjstewart'] + import_modules = ['pyproj'] - depends_on('py-cython', type='build') + version('2.2.0', sha256='0a4f793cc93539c2292638c498e24422a2ec4b25cb47545addea07724b2a56e5') + version('1.9.6', sha256='e0c02b1554b20c710d16d673817b2a89ff94738b0b537aead8ecb2edc4c4487b') + version('1.9.5.1', sha256='53fa54c8fa8a1dfcd6af4bf09ce1aae5d4d949da63b90570ac5ec849efaf3ea8') + + depends_on('python@:2', when='@:1.9.5.1') + depends_on('python@3:', when='@2.3:') depends_on('py-setuptools', type='build') + depends_on('py-cython', type='build') + depends_on('py-aenum', type=('build', 'run'), when='@2.2:^python@:3.5') + depends_on('proj') + depends_on('proj@:5', when='@:1') + depends_on('proj@6.1:', when='@2.2:') + depends_on('proj@6.0:', when='@2.0:') - # NOTE: py-pyproj does NOT depends_on('proj'). - # The py-proj git repo actually includes the correct version of PROJ.4, - # which is built internally as part of the py-proj build. - # Adding depends_on('proj') will cause mysterious build errors. + def setup_environment(self, spack_env, run_env): + spack_env.set('PROJ_DIR', self.spec['proj'].prefix) |