From 6282e337f381d683ddb14a278186969dacba091e Mon Sep 17 00:00:00 2001 From: iarspider Date: Sun, 31 May 2020 20:54:33 +0200 Subject: Add new version of py-astroid (#16805) * Add new version of py-astroid * Add new version of py-lazy-object-proxy * Apply suggestions from code review Co-authored-by: Adam J. Stewart * Apply suggestions from code review Co-authored-by: Adam J. Stewart --- .../repos/builtin/packages/py-astroid/package.py | 23 +++++++++++++++------- .../packages/py-lazy-object-proxy/package.py | 3 ++- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-astroid/package.py b/var/spack/repos/builtin/packages/py-astroid/package.py index 34cd769a0b..3eb5aece5b 100644 --- a/var/spack/repos/builtin/packages/py-astroid/package.py +++ b/var/spack/repos/builtin/packages/py-astroid/package.py @@ -13,6 +13,7 @@ class PyAstroid(PythonPackage): homepage = "https://github.com/PyCQA/astroid" url = "https://github.com/PyCQA/astroid/archive/astroid-1.4.5.tar.gz" + version('2.3.3', sha256='3a82983cf34dcbfe42ebcffeb98739e8a7bb868f03c1d9e298c530179b5075e7') version('2.2.0', sha256='7e289d0aa4a537b4aa798bd609fdf745de0f3c37e6b67642ed328e1482421a6d') version('1.6.6', sha256='3fbcc144457ba598fb48e0ddce5eacee62610ab11e6fe374b6eef5f7df2a3fbb') # version('1.5.3', sha256='6f65e4ea8290ec032320460905afb828') # has broken unit tests @@ -22,10 +23,18 @@ class PyAstroid(PythonPackage): version('1.4.2', sha256='f9007d651f4b3514ea5812127677a4bb681ff194164290cea358987920f24ee6') version('1.4.1', sha256='f1ab3ee6f17f9d30981399a52b56a7a7d2747ba24f0aa504e411ee6205a01fc0') - depends_on('py-lazy-object-proxy') - depends_on('py-six') - depends_on('py-wrapt') - depends_on('py-enum34@1.1.3:', when='^python@:3.3.99') - depends_on('py-singledispatch', when='^python@:3.3.99') - depends_on('py-backports-functools-lru-cache', when='^python@:3.2.99') - depends_on('py-setuptools@17.1:') + # Dependencies taken from astroid/__pkginfo__.py + depends_on('python@2.7:2.8,3.4:', when='@:1.999', type=('build', 'run')) + depends_on('python@3.4:', when='@2.0.0:', type=('build', 'run')) + depends_on('python@3.5:', when='@2.3.3:', type=('build', 'run')) + depends_on('py-lazy-object-proxy', type=('build', 'run')) + depends_on('py-lazy-object-proxy@1.4:1.4.999', when='@2.3.3:', type=('build', 'run')) + depends_on('py-six', type=('build', 'run')) + depends_on('py-six@1.12:1.999', when='@2.3.3:', type=('build', 'run')) + depends_on('py-wrapt', type=('build', 'run')) + depends_on('py-wrapt@1.11:1.11.999', when='@2.3.3:', type=('build', 'run')) + depends_on('py-enum34@1.1.3:', when='^python@:3.3.99', type=('build', 'run')) + depends_on('py-singledispatch', when='^python@:3.3.99', type=('build', 'run')) + depends_on('py-backports-functools-lru-cache', when='^python@:3.2.99', type=('build', 'run')) + depends_on('py-typed-ast@1.4.0:1.4.999', when='@2.3.3: ^python@:3.7.999', type=('build', 'run')) + depends_on('py-setuptools@17.1:', type='build') diff --git a/var/spack/repos/builtin/packages/py-lazy-object-proxy/package.py b/var/spack/repos/builtin/packages/py-lazy-object-proxy/package.py index 606dc00136..36cac03c58 100644 --- a/var/spack/repos/builtin/packages/py-lazy-object-proxy/package.py +++ b/var/spack/repos/builtin/packages/py-lazy-object-proxy/package.py @@ -12,8 +12,9 @@ class PyLazyObjectProxy(PythonPackage): homepage = "https://github.com/ionelmc/python-lazy-object-proxy" url = "https://pypi.io/packages/source/l/lazy-object-proxy/lazy-object-proxy-1.3.1.tar.gz" + version('1.4.3', sha256='f3900e8a5de27447acbf900b4750b0ddfd7ec1ea7fbaf11dfa911141bc522af0') version('1.3.1', sha256='eb91be369f945f10d3a49f5f9be8b3d0b93a4c2be8f8a5b83b0571b8123e0a7a') - conflicts('^python@3.0:3.2.99') + depends_on('python@2.7:2.8,3.4:', type=('build', 'run')) depends_on('py-setuptools', type='build') -- cgit v1.2.3-60-g2f50