gn: Update python-schema-salad to 7

2 files changed, 5 insertions, 35 deletions

diff --git a/gn/packages/cwl.scm b/gn/packages/cwl.scm
index 2ee83d7..3e0576c 100644
--- a/gn/packages/cwl.scm
+++ b/gn/packages/cwl.scm
@@ -61,7 +61,7 @@
        ("python-rdflib" ,python-rdflib)
        ("python-requests" ,python-requests)
        ("python-ruamel.yaml" ,python-ruamel.yaml)
-       ("python-schema-salad" ,python-schema-salad-7)
+       ("python-schema-salad" ,python-schema-salad)
        ("python-setuptools" ,python-setuptools)
        ("python-shellescape" ,python-shellescape)
        ("python-typing-extensions" ,python-typing-extensions)
diff --git a/gn/packages/python.scm b/gn/packages/python.scm
index f0ba657..2940e40 100644
--- a/gn/packages/python.scm
+++ b/gn/packages/python.scm
@@ -1139,14 +1139,14 @@ server.")
 (define-public python-schema-salad
   (package
     (name "python-schema-salad")
-    (version "5.0.20200416112825")
+    (version "7.0.20200612160654")
     (source
       (origin
         (method url-fetch)
         (uri (pypi-uri "schema-salad" version))
         (sha256
          (base32
-          "1pm6q266qrw4r0w0vnzhsvqgk5j8b3q61hxg99awhgpjsmcvkmsz"))))
+          "15ma3lb6fkfc6sj75hnmmg0jj8q3pc5yrlyx15lpdd4dcp2jc39s"))))
     (build-system python-build-system)
     (propagated-inputs
      `(("python-cachecontrol" ,python-cachecontrol-0.11)
@@ -1155,15 +1155,12 @@ server.")
        ("python-rdflib" ,python-rdflib)
        ("python-rdflib-jsonld" ,python-rdflib-jsonld)
        ("python-requests" ,python-requests)
-       ("python-ruaml.yaml" ,python38-ruaml.yaml-0.15.76)
+       ("python-ruamel.yaml" ,python-ruamel.yaml)
        ("python-setuptools" ,python-setuptools)
        ("python-typing-extensions" ,python-typing-extensions)))
     (native-inputs
-     `(("python-pytest" ,python-pytest)
+     `(("python-pytest" ,python-pytest-4)
        ("python-pytest-runner" ,python-pytest-runner)))
-    (arguments
-     `(
-       #:tests? #f)) ; no tests
     (home-page "https://github.com/common-workflow-language/schema_salad")
     (synopsis "Schema Annotations for Linked Avro Data (SALAD)")
     (description
@@ -1176,33 +1173,6 @@ generation, and transformation to RDF.  Salad provides a bridge between document
 and record oriented data modeling and the Semantic Web.")
     (license license:asl2.0)))
 
-(define-public python-schema-salad-7
-  (package
-    (inherit python-schema-salad)
-    (name "python-schema-salad")
-    (version "7.0.20200612160654")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (pypi-uri "schema-salad" version))
-        (sha256
-         (base32
-          "15ma3lb6fkfc6sj75hnmmg0jj8q3pc5yrlyx15lpdd4dcp2jc39s"))))
-    (propagated-inputs
-     `(("python-cachecontrol" ,python-cachecontrol-0.11)
-       ("python-lockfile" ,python-lockfile)
-       ("python-mistune" ,python-mistune)
-       ("python-rdflib" ,python-rdflib)
-       ("python-rdflib-jsonld" ,python-rdflib-jsonld)
-       ("python-requests" ,python-requests)
-       ("python-ruamel.yaml" ,python-ruamel.yaml)
-       ("python-setuptools" ,python-setuptools)
-       ("python-typing-extensions" ,python-typing-extensions)))
-    (native-inputs
-     `(("python-pytest" ,python-pytest-4)
-       ("python-pytest-runner" ,python-pytest-runner)))
-    (arguments `())))
-
 (define-public python-cfgraph
   (package
     (name "python-cfgraph")