diff options
| author | Bernhard Kaindl <43588962+bernhardkaindl@users.noreply.github.com> | 2021-10-08 23:20:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-08 21:20:39 +0000 |
| commit | 21ce23816e959a123397463b665cbe16149a7b53 (patch) | |
| tree | 447cde276b64d1066010b656dd267b73fed209da | |
| parent | 8ebb705871440b4841b34f4c1e44e178c56acb8a (diff) | |
| download | spack-21ce23816e959a123397463b665cbe16149a7b53.tar.gz spack-21ce23816e959a123397463b665cbe16149a7b53.tar.bz2 spack-21ce23816e959a123397463b665cbe16149a7b53.tar.xz spack-21ce23816e959a123397463b665cbe16149a7b53.zip | |
py-twisted,py-storm: dep on zope.interface, bump storm version (#26610)
* py-twisted,py-storm: dep on zope.interface, bump storm version
py-twisted and py-storm's import tests need zope.interface.
py-storm: Use pypi and add version 0.25. It didn't change reqs.
zope.infterface@4.5.0 imports removed Feature: Use setuptools@:45
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
* py-storm: all deps updated with type=('build', 'run')
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
3 files changed, 13 insertions, 7 deletions
diff --git a/var/spack/repos/builtin/packages/py-storm/package.py b/var/spack/repos/builtin/packages/py-storm/package.py index 8361f87a90..5eead17bab 100644 --- a/var/spack/repos/builtin/packages/py-storm/package.py +++ b/var/spack/repos/builtin/packages/py-storm/package.py @@ -9,12 +9,15 @@ from spack import * class PyStorm(PythonPackage): """Storm is an object-relational mapper (ORM) for Python""" homepage = "https://storm.canonical.com/" - url = "https://launchpad.net/storm/trunk/0.20/+download/storm-0.20.tar.bz2" + pypi = 'storm/storm-0.25.tar.gz' - version('0.23', sha256='01c59f1c898fb9891333abd65519ba2dd5f68623ac8e67b54932e99ce52593d3') - version('0.20', sha256='1fe016c9ec40520eafc3cf359f1ec2b7fa86be91e45c9279bfb0ea3b06390a82') + version('0.25', sha256='ec7cc8897638f94f6b75c6a2af74aa9b31f5492d7a2f9482c08a8dd7b46adb14') + version('0.23', sha256='01c59f1c898fb9891333abd65519ba2dd5f68623ac8e67b54932e99ce52593d3', + url='https://files.pythonhosted.org/packages/source/s/storm/storm-0.23.tar.bz2') + version('0.20', sha256='35f5883e93a262002ca59dbb39645c67434a182d758543c4a2467ff690ac23a5') depends_on('py-setuptools', type='build') - depends_on('py-six', when='@0.23:') - depends_on('python@2.7:2.8', when='@:0.20') - depends_on('python@2.7:2.8,3.5:', when='@0.21:') + depends_on('py-six', type=('build', 'run'), when='@0.23:') + depends_on('py-zope-interface@4:', type=('build', 'run')) + depends_on('python@2.7:2.8', type=('build', 'run'), when='@:0.20') + depends_on('python@2.7:2.8,3.5:', type=('build', 'run'), when='@0.21:') diff --git a/var/spack/repos/builtin/packages/py-twisted/package.py b/var/spack/repos/builtin/packages/py-twisted/package.py index 2c6579d48c..82354c3456 100644 --- a/var/spack/repos/builtin/packages/py-twisted/package.py +++ b/var/spack/repos/builtin/packages/py-twisted/package.py @@ -15,3 +15,5 @@ class PyTwisted(PythonPackage): version('15.3.0', sha256='025729751cf898842262375a40f70ae1d246daea88369eab9f6bb96e528bf285') depends_on('py-setuptools', type='build') + depends_on('py-zope-interface@3.6.0:', type=('build', 'run'), when='^python@:2') + depends_on('py-zope-interface@4.0.2:', type=('build', 'run'), when='^python@3:') diff --git a/var/spack/repos/builtin/packages/py-zope-interface/package.py b/var/spack/repos/builtin/packages/py-zope-interface/package.py index c5545aef0f..b46605ee62 100644 --- a/var/spack/repos/builtin/packages/py-zope-interface/package.py +++ b/var/spack/repos/builtin/packages/py-zope-interface/package.py @@ -21,4 +21,5 @@ class PyZopeInterface(PythonPackage): depends_on('python@2.7:2.8,3.4:', type=('build', 'run'), when='@4.5.0') depends_on('python@2.7:2.8,3.5:', type=('build', 'run'), when='@5.1.0:') - depends_on('py-setuptools', type=('build', 'run')) + depends_on('py-setuptools', type=('build', 'run')) + depends_on('py-setuptools@:45', type=('build', 'run'), when='@4.5.0') |