From f46f238a339716e8221ec2ee1860a5e85d05de23 Mon Sep 17 00:00:00 2001 From: iarspider Date: Wed, 19 Feb 2020 20:01:48 +0100 Subject: Add extra version of py-jedi (#14990) * Add extra version of py-jedi * Update package.py * Update package.py Correct dependency types * Update var/spack/repos/builtin/packages/py-jedi/package.py Co-Authored-By: Adam J. Stewart * Update var/spack/repos/builtin/packages/py-jedi/package.py Co-Authored-By: Adam J. Stewart * Update var/spack/repos/builtin/packages/py-jedi/package.py Co-Authored-By: Adam J. Stewart * Add py-parso package * Remove boilerplate from py-parso * Flake-8 Co-authored-by: Adam J. Stewart --- .../repos/builtin/packages/py-jedi/package.py | 12 +++++++++-- .../repos/builtin/packages/py-parso/package.py | 23 ++++++++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 var/spack/repos/builtin/packages/py-parso/package.py diff --git a/var/spack/repos/builtin/packages/py-jedi/package.py b/var/spack/repos/builtin/packages/py-jedi/package.py index 2c95433aa3..009b4c9d65 100644 --- a/var/spack/repos/builtin/packages/py-jedi/package.py +++ b/var/spack/repos/builtin/packages/py-jedi/package.py @@ -12,9 +12,17 @@ class PyJedi(PythonPackage): homepage = "https://github.com/davidhalter/jedi" url = "https://pypi.io/packages/source/j/jedi/jedi-0.9.0.tar.gz" - # unfortunately pypi.io only offers a .whl + version('0.13.3', sha256='2bb0603e3506f708e792c7f4ad8fc2a7a9d9c2d292a358fbbd58da531695595b') + # unfortunately pypi.io only offers a .whl for 0.10.0 version('0.10.0', sha256='d6a7344df9c80562c3f62199278004ccc7c5889be9f1a6aa5abde117ec085123', url='https://github.com/davidhalter/jedi/archive/v0.10.0.tar.gz') version('0.9.0', sha256='3b4c19fba31bdead9ab7350fb9fa7c914c59b0a807dcdd5c00a05feb85491d31') - depends_on('py-setuptools', type='build') + depends_on('py-setuptools', type=('build', 'run')) + depends_on('python@2.6:2.8,3.2:', type=('build', 'run'), when='@0.9.0') + depends_on('python@2.6:2.8,3.3:', type=('build', 'run'), when='@0.10.0') + depends_on('python@2.7:2.8,3.4:', type=('build', 'run'), when='@0.13.3') + depends_on('py-parso@0.1.0', type=('build', 'run'), when='@0.11.0') + depends_on('py-parso@0.1.1', type=('build', 'run'), when='@0.11.1') + depends_on('py-parso@0.2.0:', type=('build', 'run'), when='@0.12.0') + depends_on('py-parso@0.3.0:', type=('build', 'run'), when='@0.12.1:0.14.0') diff --git a/var/spack/repos/builtin/packages/py-parso/package.py b/var/spack/repos/builtin/packages/py-parso/package.py new file mode 100644 index 0000000000..3f54eca9ce --- /dev/null +++ b/var/spack/repos/builtin/packages/py-parso/package.py @@ -0,0 +1,23 @@ +# Copyright 2013-2020 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack import * + + +class PyParso(PythonPackage): + """Parso is a Python parser that supports error recovery and round-trip parsing + for different Python versions (in multiple Python versions). + Parso is also able to list multiple syntax errors + in your python file.""" + + homepage = "https://pypi.org/project/parso/" + url = "https://pypi.io/packages/source/p/parso/parso-0.6.1.tar.gz" + + version('0.6.1', sha256='56b2105a80e9c4df49de85e125feb6be69f49920e121406f15e7acde6c9dfc57') + + depends_on('python@2.7:2.8,3.4:', type=('build', 'run')) + depends_on('py-setuptools', type='build') + depends_on('py-pytest@3.0.7:', type='test') + depends_on('py-docopt', type='test') -- cgit v1.2.3-70-g09d2