From 0bc4a778bda3c5a6b127bc9979ba1f8157287f06 Mon Sep 17 00:00:00 2001
From: iarspider <iarspider@gmail.com>
Date: Fri, 21 Feb 2020 21:29:42 +0100
Subject: [PATCH] Add extra version of py-jsonschema (#14993)
* Add extra version of py-jsonschema
* Update dependencies
* Update dependencies + flake8
* Add py-pyrsistent package
* Update package.py
* Update var/spack/repos/builtin/packages/py-jsonschema/package.py
Co-Authored-By: Adam J. Stewart <ajstewart426@gmail.com>
* Update package.py
* Update package.py
* Apply suggestions from code review
Co-Authored-By: Adam J. Stewart <ajstewart426@gmail.com>
* Apply suggestions from code review
Co-Authored-By: Adam J. Stewart <ajstewart426@gmail.com>
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
---
.../builtin/packages/py-jsonschema/package.py | 16 +++++++++++---
.../builtin/packages/py-pyrsistent/package.py | 21 +++++++++++++++++++
2 files changed, 34 insertions(+), 3 deletions(-)
create mode 100644 var/spack/repos/builtin/packages/py-pyrsistent/package.py
diff --git a/var/spack/repos/builtin/packages/py-jsonschema/package.py b/var/spack/repos/builtin/packages/py-jsonschema/package.py
index 815decdbb2..0d62052f9b 100644
--- a/var/spack/repos/builtin/packages/py-jsonschema/package.py
+++ b/var/spack/repos/builtin/packages/py-jsonschema/package.py
@@ -12,9 +12,19 @@ class PyJsonschema(PythonPackage):
homepage = "http://github.com/Julian/jsonschema"
url = "https://pypi.io/packages/source/j/jsonschema/jsonschema-2.6.0.tar.gz"
+ version('3.0.1', sha256='0c0a81564f181de3212efa2d17de1910f8732fa1b71c42266d983cd74304e20d')
version('2.6.0', sha256='6ff5f3180870836cae40f06fa10419f557208175f13ad7bc26caa77beb1f6e02')
version('2.5.1', sha256='36673ac378feed3daa5956276a829699056523d7961027911f064b52255ead41')
- depends_on('py-setuptools', type='build')
- depends_on('py-vcversioner', type=('build', 'run'))
- depends_on('py-functools32', when="^python@2.7.0:2.7.999", type=('build', 'run'))
+ depends_on('python@2.6:2.8,3.4:', type=('build', 'run'))
+ depends_on('python@2.7:2.8,3.5:', when='@3:', type=('build', 'run'))
+
+ depends_on('py-setuptools', type='build', when='@:2')
+ depends_on('py-setuptools', type=('build', 'run'), when='@3:')
+ depends_on('py-vcversioner', type='build', when='@:2')
+ depends_on('py-setuptools-scm', type='build', when='@3:')
+
+ depends_on('py-functools32', when="^python@:2", type=('build', 'run'))
+ 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'))
diff --git a/var/spack/repos/builtin/packages/py-pyrsistent/package.py b/var/spack/repos/builtin/packages/py-pyrsistent/package.py
new file mode 100644
index 0000000000..0a1baafdd8
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-pyrsistent/package.py
@@ -0,0 +1,21 @@
+# 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 PyPyrsistent(PythonPackage):
+ """Pyrsistent is a number of persistent collections
+ (by some referred to as functional data structures).
+ Persistent in the sense that they are immutable."""
+
+ homepage = "http://github.com/tobgu/pyrsistent/"
+ url = "https://pypi.io/packages/source/p/pyrsistent/pyrsistent-0.15.7.tar.gz"
+
+ version('0.15.7', sha256='cdc7b5e3ed77bed61270a47d35434a30617b9becdf2478af76ad2c6ade307280')
+
+ depends_on('python@2.7:2.8,3.5:', type=('build', 'run'))
+ depends_on('py-setuptools', type='build')
+ depends_on('py-six', type=('build', 'run'))
--
GitLab