diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2017-05-25 09:49:00 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-25 09:49:00 -0500 |
| commit | f8a7549f513586c5399d243e23e05f01e6339c98 (patch) | |
| tree | d63603b41fdb1307af2996cdff80109433d86582 /var | |
| parent | 8e9d9057940bc3ed092530c6d2e6835e84ab0574 (diff) | |
| download | spack-f8a7549f513586c5399d243e23e05f01e6339c98.tar.gz spack-f8a7549f513586c5399d243e23e05f01e6339c98.tar.bz2 spack-f8a7549f513586c5399d243e23e05f01e6339c98.tar.xz spack-f8a7549f513586c5399d243e23e05f01e6339c98.zip | |
Add missing dependency to py-entrypoints (#4330)
Diffstat (limited to 'var')
3 files changed, 17 insertions, 11 deletions
diff --git a/var/spack/repos/builtin/packages/py-configparser/package.py b/var/spack/repos/builtin/packages/py-configparser/package.py index 0a8660aa71..a489c89327 100644 --- a/var/spack/repos/builtin/packages/py-configparser/package.py +++ b/var/spack/repos/builtin/packages/py-configparser/package.py @@ -29,16 +29,13 @@ class PyConfigparser(PythonPackage): """This library brings the updated configparser from Python 3.5 to Python 2.6-3.5.""" - homepage = "https://pypi.python.org/pypi/configparser" - url = "https://pypi.python.org/packages/source/c/configparser/configparser-3.5.0.tar.gz" + homepage = "https://docs.python.org/3/library/configparser.html" + url = "https://pypi.io/packages/source/c/configparser/configparser-3.5.0.tar.gz" - version('3.5.0', 'cfdd915a5b7a6c09917a64a573140538', - url="https://pypi.python.org/packages/7c/69/c2ce7e91c89dc073eb1aa74c0621c3eefbffe8216b3f9af9d3885265c01c/configparser-3.5.0.tar.gz") + version('3.5.0', 'cfdd915a5b7a6c09917a64a573140538') - depends_on('python@2.6:2.8,3.4:') + depends_on('py-setuptools', type='build') # This dependency breaks concretization # See https://github.com/LLNL/spack/issues/2793 - # depends_on('py-ordereddict', when='^python@2.6:2.6.999', type=('build', 'run')) # noqa - - depends_on('py-setuptools', type='build') + # depends_on('py-ordereddict', when='^python@:2.6', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-entrypoints/package.py b/var/spack/repos/builtin/packages/py-entrypoints/package.py index 944999d69b..76f6b37b74 100644 --- a/var/spack/repos/builtin/packages/py-entrypoints/package.py +++ b/var/spack/repos/builtin/packages/py-entrypoints/package.py @@ -25,15 +25,22 @@ from spack import * -class PyEntrypoints(Package): +class PyEntrypoints(PythonPackage): """Discover and load entry points from installed packages.""" homepage = "https://pypi.python.org/pypi/entrypoints" - url = "https://files.pythonhosted.org/packages/f8/ad/0e77a853c745a15981ab51fa9a0cb4eca7a7a007b4c1970106ee6ba01e0c/entrypoints-0.2.2-py2.py3-none-any.whl" + url = "https://pypi.python.org/packages/f8/ad/0e77a853c745a15981ab51fa9a0cb4eca7a7a007b4c1970106ee6ba01e0c/entrypoints-0.2.2-py2.py3-none-any.whl" + + import_modules = ['entrypoints'] version('0.2.2', '73bd7ce92c19b25dc5a20aff41be996a', expand=False) + depends_on('python@2.7:', type=('build', 'run')) + depends_on('py-pip', type='build') + depends_on('py-configparser', when='^python@:2.8', type=('build', 'run')) + + phases = ['install'] def install(self, spec, prefix): pip = which('pip') diff --git a/var/spack/repos/builtin/packages/py-ordereddict/package.py b/var/spack/repos/builtin/packages/py-ordereddict/package.py index b560990f00..29d5786237 100644 --- a/var/spack/repos/builtin/packages/py-ordereddict/package.py +++ b/var/spack/repos/builtin/packages/py-ordereddict/package.py @@ -30,6 +30,8 @@ class PyOrdereddict(PythonPackage): OrderedDict that works in Python 2.4-2.6.""" homepage = "https://pypi.python.org/pypi/ordereddict" - url = "https://pypi.python.org/packages/source/o/ordereddict/ordereddict-1.1.tar.gz" + url = "https://pypi.io/packages/source/o/ordereddict/ordereddict-1.1.tar.gz" + + import_modules = ['ordereddict'] version('1.1', 'a0ed854ee442051b249bfad0f638bbec') |