From ac433134e57c519a30a6776eebc95db664dfa31a Mon Sep 17 00:00:00 2001
From: Francesco Di Natale <frank.dinatale1988@gmail.com>
Date: Sun, 2 Aug 2020 17:42:56 -0700
Subject: [PATCH] Updates to jsonschema to include newer versions. (#17613)
* Additional versions of py-jsonschema.
* Tweak to force Maestro to use jsonschema@3.2.0:
* Correction of whitespace (flake8 error).
* Merges importlib's Python version conditons
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
---
.../builtin/packages/py-jsonschema/package.py | 7 +++++-
.../builtin/packages/py-maestrowf/package.py | 24 +++++++++----------
2 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/var/spack/repos/builtin/packages/py-jsonschema/package.py b/var/spack/repos/builtin/packages/py-jsonschema/package.py
index 0d62052f9b..c33cfc63e4 100644
--- a/var/spack/repos/builtin/packages/py-jsonschema/package.py
+++ b/var/spack/repos/builtin/packages/py-jsonschema/package.py
@@ -10,8 +10,11 @@ class PyJsonschema(PythonPackage):
"""Jsonschema: An(other) implementation of JSON Schema for Python."""
homepage = "http://github.com/Julian/jsonschema"
- url = "https://pypi.io/packages/source/j/jsonschema/jsonschema-2.6.0.tar.gz"
+ url = "https://pypi.io/packages/source/j/jsonschema/jsonschema-3.2.0.tar.gz"
+ version('3.2.0', sha256='c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a')
+ version('3.1.1', sha256='2fa0684276b6333ff3c0b1b27081f4b2305f0a36cf702a23db50edb141893c3f')
+ version('3.0.2', sha256='8d4a2b7b6c2237e0199c8ea1a6d3e05bf118e289ae2b9d7ba444182a2959560d')
version('3.0.1', sha256='0c0a81564f181de3212efa2d17de1910f8732fa1b71c42266d983cd74304e20d')
version('2.6.0', sha256='6ff5f3180870836cae40f06fa10419f557208175f13ad7bc26caa77beb1f6e02')
version('2.5.1', sha256='36673ac378feed3daa5956276a829699056523d7961027911f064b52255ead41')
@@ -28,3 +31,5 @@ class PyJsonschema(PythonPackage):
depends_on('py-attrs@17.4.0:', when='@3:', type=('build', 'run'))
depends_on('py-pyrsistent@0.14.0:', when='@3:', type=('build', 'run'))
depends_on('py-six@1.11.0:', when='@3:', type=('build', 'run'))
+
+ depends_on('py-importlib-metadata', when='@3.1.1: ^python@:3.7.99', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-maestrowf/package.py b/var/spack/repos/builtin/packages/py-maestrowf/package.py
index a5a6f5f89d..46a8a24c3e 100644
--- a/var/spack/repos/builtin/packages/py-maestrowf/package.py
+++ b/var/spack/repos/builtin/packages/py-maestrowf/package.py
@@ -34,15 +34,15 @@ class PyMaestrowf(PythonPackage):
version('1.1.0', sha256='1bfec546831f2ef577d7823bb50dcd12622644dad0d3d761998eafd0905b6977')
version('1.0.1', sha256='dd42ffeac1f0492a576c630b37e5d3593273e59664407f2ebf78d49322d37146')
- depends_on('python@2.7:2.8,3.5:', type=('build', 'run'))
- depends_on('py-setuptools', type='build')
- depends_on('py-pyyaml@4.2b1:', type=('build', 'run'))
- depends_on('py-six', type=('build', 'run'))
- depends_on('py-enum34', type=('build', 'run'), when='^python@:3.3')
- depends_on('py-enum34', type=('build', 'run'), when='@:1.1.3')
- depends_on('py-tabulate', type=('build', 'run'), when='@1.1.0:')
- depends_on('py-filelock', type=('build', 'run'), when='@1.1.0:')
- depends_on('py-coloredlogs', type=('build', 'run'), when='@1.1.7:')
- depends_on('py-chainmap', type=('build', 'run'), when='@1.1.7: ^python@:2')
- depends_on('py-dill', type=('build', 'run'), when='@1.1.7:')
- depends_on('py-jsonschema', type=('build', 'run'), when='@1.1.7:')
+ depends_on('python@2.7:2.8,3.5:', type=('build', 'run'))
+ depends_on('py-setuptools', type='build')
+ depends_on('py-pyyaml@4.2b1:', type=('build', 'run'))
+ depends_on('py-six', type=('build', 'run'))
+ depends_on('py-enum34', type=('build', 'run'), when='^python@:3.3')
+ depends_on('py-enum34', type=('build', 'run'), when='@:1.1.3')
+ depends_on('py-tabulate', type=('build', 'run'), when='@1.1.0:')
+ depends_on('py-filelock', type=('build', 'run'), when='@1.1.0:')
+ depends_on('py-coloredlogs', type=('build', 'run'), when='@1.1.7:')
+ depends_on('py-chainmap', type=('build', 'run'), when='@1.1.7: ^python@:2')
+ depends_on('py-dill', type=('build', 'run'), when='@1.1.7:')
+ depends_on('py-jsonschema@3.2.0:', type=('build', 'run'), when='@1.1.7:')
--
GitLab