diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2022-06-24 01:20:04 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-24 10:20:04 +0200 |
| commit | e5cc3c51d14025d43d82f81570fc33c569715d70 (patch) | |
| tree | 89db20c7a41bb7864456f073452a67cf62de0e8e /var | |
| parent | 70650cacbd95025985a912c3aa17a78756bb6e4a (diff) | |
| download | spack-e5cc3c51d14025d43d82f81570fc33c569715d70.tar.gz spack-e5cc3c51d14025d43d82f81570fc33c569715d70.tar.bz2 spack-e5cc3c51d14025d43d82f81570fc33c569715d70.tar.xz spack-e5cc3c51d14025d43d82f81570fc33c569715d70.zip | |
py-numpy: add v1.23.0 (#31250)
Diffstat (limited to 'var')
3 files changed, 15 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/py-numexpr/package.py b/var/spack/repos/builtin/packages/py-numexpr/package.py index 08f0a2b2d6..455a83ea61 100644 --- a/var/spack/repos/builtin/packages/py-numexpr/package.py +++ b/var/spack/repos/builtin/packages/py-numexpr/package.py @@ -23,5 +23,6 @@ class PyNumexpr(PythonPackage): depends_on('python@2.7:', when='@2.7.3:', type=('build', 'run')) depends_on('python@2.6:', when='@:2.7.2', type=('build', 'run')) - depends_on('py-numpy@1.7:', type=('build', 'run')) + # https://github.com/pydata/numexpr/issues/397 + depends_on('py-numpy@1.7:1.22', type=('build', 'run')) depends_on('py-setuptools', type='build') diff --git a/var/spack/repos/builtin/packages/py-numpy/package.py b/var/spack/repos/builtin/packages/py-numpy/package.py index c543ae2f8d..3998617191 100644 --- a/var/spack/repos/builtin/packages/py-numpy/package.py +++ b/var/spack/repos/builtin/packages/py-numpy/package.py @@ -17,12 +17,13 @@ class PyNumpy(PythonPackage): number capabilities""" homepage = "https://numpy.org/" - pypi = "numpy/numpy-1.19.4.zip" + pypi = "numpy/numpy-1.23.0.tar.gz" git = "https://github.com/numpy/numpy.git" maintainers = ['adamjstewart', 'rgommers'] version('main', branch='main') + version('1.23.0', sha256='bd3fa4fe2e38533d5336e1272fc4e765cabbbde144309ccee8675509d5cd7b05') version('1.22.4', sha256='425b390e4619f58d8526b3dcf656dde069133ae5c240229821f01b5f44ea07af') version('1.22.3', sha256='dbc7601a3b7472d559dc7b933b18b4b66f9aa7452c120e87dfb33d02008c8a18') version('1.22.2', sha256='076aee5a3763d41da6bef9565fdf3cb987606f567cd8b104aded2b38b7b47abf') @@ -115,6 +116,7 @@ class PyNumpy(PythonPackage): depends_on('py-nose@1.0.0:', when='@:1.14', type='test') depends_on('py-pytest', when='@1.15:', type='test') depends_on('py-hypothesis', when='@1.19:', type='test') + depends_on('py-typing-extensions@4.2:', when='@1.23:', type='test') # Allows you to specify order of BLAS/LAPACK preference # https://github.com/numpy/numpy/pull/13132 @@ -152,6 +154,14 @@ class PyNumpy(PythonPackage): # NVHPC support added in https://github.com/numpy/numpy/pull/17344 conflicts('%nvhpc', when='@:1.19') + def url_for_version(self, version): + url = 'https://files.pythonhosted.org/packages/source/n/numpy/numpy-{}.{}' + if version >= Version('1.23'): + ext = 'tar.gz' + else: + ext = 'zip' + return url.format(version, ext) + def flag_handler(self, name, flags): # -std=c99 at least required, old versions of GCC default to -std=c90 if self.spec.satisfies('%gcc@:5.1') and name == 'cflags': diff --git a/var/spack/repos/builtin/packages/py-typing-extensions/package.py b/var/spack/repos/builtin/packages/py-typing-extensions/package.py index 24e5b1c356..4e7790bd1c 100644 --- a/var/spack/repos/builtin/packages/py-typing-extensions/package.py +++ b/var/spack/repos/builtin/packages/py-typing-extensions/package.py @@ -15,6 +15,7 @@ class PyTypingExtensions(PythonPackage): homepage = "https://github.com/python/typing/tree/master/typing_extensions" pypi = "typing_extensions/typing_extensions-3.7.4.tar.gz" + version('4.2.0', sha256='f1c24655a0da0d1b67f07e17a5e6b2a105894e6824b92096378bb3668ef02376') version('4.1.1', sha256='1a9462dcc3347a79b1f1c0271fbe79e844580bb598bafa1ed208b94da3cdcd42') version('3.10.0.2', sha256='49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e') version('3.10.0.0', sha256='50b6f157849174217d0656f99dc82fe932884fb250826c18350e159ec6cdf342') @@ -24,6 +25,7 @@ class PyTypingExtensions(PythonPackage): version('3.6.6', sha256='51e7b7f3dcabf9ad22eed61490f3b8d23d9922af400fe6656cb08e66656b701f') # typing-extensions 4+ uses flit + depends_on('python@3.7:', when='@4.2:', type=('build', 'run')) depends_on('python@3.6:', when='@4:', type=('build', 'run')) depends_on('py-flit-core@3.4:3', when='@4:', type='build') |