summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorhealther <healther@users.noreply.github.com>2017-09-19 22:10:13 +0200
committerscheibelp <scheibel1@llnl.gov>2017-09-19 13:10:13 -0700
commit21059c39ca48c7501a8952e459487e3a61a8919d (patch)
tree1e8a1cd7ad6e53bd15d8a5d5d81959b7a32c9478 /var
parentb1d129e68199a94b6210af0a6d8e2aa5b4df576e (diff)
downloadspack-21059c39ca48c7501a8952e459487e3a61a8919d.tar.gz
spack-21059c39ca48c7501a8952e459487e3a61a8919d.tar.bz2
spack-21059c39ca48c7501a8952e459487e3a61a8919d.tar.xz
spack-21059c39ca48c7501a8952e459487e3a61a8919d.zip
pr-quantities: add version & py-numpy conflict (#5307)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/py-quantities/package.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/py-quantities/package.py b/var/spack/repos/builtin/packages/py-quantities/package.py
index 2b78e643aa..b8ab901549 100644
--- a/var/spack/repos/builtin/packages/py-quantities/package.py
+++ b/var/spack/repos/builtin/packages/py-quantities/package.py
@@ -29,9 +29,13 @@ class PyQuantities(PythonPackage):
"""Support for physical quantities with units, based on numpy"""
homepage = "http://python-quantities.readthedocs.org"
- url = "https://pypi.io/packages/source/q/quantities/quantities-0.11.1.zip"
+ url = "https://pypi.io/packages/source/q/quantities/quantities-0.12.1.tar.gz"
- version('0.11.1', 'f4c6287bfd2e93322b25a7c1311a0243')
+ version('0.12.1', '9c9ecda15e905cccfc420e5341199512')
+ version('0.11.1', 'f4c6287bfd2e93322b25a7c1311a0243',
+ url="https://pypi.io/packages/source/q/quantities/quantities-0.11.1.zip")
+
+ conflicts('py-numpy@1.13:', when='@:0.11.99')
depends_on('python@2.6.0:')
depends_on('py-numpy@1.4.0:', type=('build', 'run'))