summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam J. Stewart <ajstewart426@gmail.com>2018-03-20 01:18:20 -0500
committerMassimiliano Culpo <massimiliano.culpo@gmail.com>2018-03-20 07:18:20 +0100
commit6058cc177031ff8ce05a5a7b4c1df20b84d3226a (patch)
tree6e5fff133f1349febad0ebf92749994d6de437db
parentc11b46ae9916b2811d06da8a72fea75b3bdc00e7 (diff)
downloadspack-6058cc177031ff8ce05a5a7b4c1df20b84d3226a.tar.gz
spack-6058cc177031ff8ce05a5a7b4c1df20b84d3226a.tar.bz2
spack-6058cc177031ff8ce05a5a7b4c1df20b84d3226a.tar.xz
spack-6058cc177031ff8ce05a5a7b4c1df20b84d3226a.zip
Add latest version of py-setuptools (#7523)
-rw-r--r--var/spack/repos/builtin/packages/py-setuptools/package.py34
1 files changed, 23 insertions, 11 deletions
diff --git a/var/spack/repos/builtin/packages/py-setuptools/package.py b/var/spack/repos/builtin/packages/py-setuptools/package.py
index de7b47367b..c6fb8b18d0 100644
--- a/var/spack/repos/builtin/packages/py-setuptools/package.py
+++ b/var/spack/repos/builtin/packages/py-setuptools/package.py
@@ -30,16 +30,14 @@ class PySetuptools(PythonPackage):
upgrading, installing, and uninstalling Python packages."""
homepage = "https://pypi.python.org/pypi/setuptools"
- url = "https://pypi.io/packages/source/s/setuptools/setuptools-25.2.0.tar.gz"
+ url = "https://pypi.io/packages/source/s/setuptools/setuptools-39.0.1.zip"
import_modules = ['pkg_resources', 'setuptools', 'setuptools.command']
- version('35.0.2', 'c368b4970d3ad3eab5afe4ef4dbe2437',
- url="https://pypi.io/packages/source/s/setuptools/setuptools-35.0.2.zip")
- version('34.4.1', '5f9b07aeaafd29eac2548fc0b89a4934',
- url="https://pypi.io/packages/source/s/setuptools/setuptools-34.4.1.zip")
- version('34.2.0', '41b630da4ea6cfa5894d9eb3142922be',
- url="https://pypi.io/packages/source/s/setuptools/setuptools-34.2.0.zip")
+ version('39.0.1', '75310b72ca0ab4e673bf7679f69d7a62')
+ version('35.0.2', 'c368b4970d3ad3eab5afe4ef4dbe2437')
+ version('34.4.1', '5f9b07aeaafd29eac2548fc0b89a4934')
+ version('34.2.0', '41b630da4ea6cfa5894d9eb3142922be')
version('25.2.0', 'a0dbb65889c46214c691f6c516cf959c')
version('20.7.0', '5d12b39bf3e75e80fdce54e44b255615')
version('20.6.7', '45d6110f3ec14924e44c33411db64fe6')
@@ -53,7 +51,21 @@ class PySetuptools(PythonPackage):
# Previously, setuptools vendored all of its dependencies to allow
# easy bootstrapping. As of version 34.0.0, this is no longer done
- # and the dependencies need to be installed externally.
- depends_on('py-packaging@16.8:', when='@34.0.0:', type=('build', 'run'))
- depends_on('py-six@1.6.0:', when='@34.0.0:', type=('build', 'run'))
- depends_on('py-appdirs@1.4.0:', when='@34.0.0:', type=('build', 'run'))
+ # and the dependencies need to be installed externally. As of version
+ # 36.0.0, setuptools now vendors its dependencies again. See
+ # https://github.com/pypa/setuptools/issues/980 for the reason they
+ # reverted back to vendoring again.
+ depends_on('py-packaging@16.8:', when='@34:35', type=('build', 'run'))
+ depends_on('py-six@1.6.0:', when='@34:35', type=('build', 'run'))
+ depends_on('py-appdirs@1.4.0:', when='@34:35', type=('build', 'run'))
+
+ def url_for_version(self, version):
+ url = 'https://pypi.io/packages/source/s/setuptools/setuptools-{0}'
+ url = url.format(version)
+
+ if version > Version('32.1.2'):
+ url += '.zip'
+ else:
+ url += '.tar.gz'
+
+ return url