gn: Update bh20-seq-resource.

2 files changed, 51 insertions, 27 deletions

diff --git a/gn/packages/bioinformatics.scm b/gn/packages/bioinformatics.scm
index 09a706b..5a33929 100644
--- a/gn/packages/bioinformatics.scm
+++ b/gn/packages/bioinformatics.scm
@@ -1232,8 +1232,8 @@ runApp(launch.browser=0, port=4206)~%\n"
         (license #f))))
 
 (define-public bh20-seq-resource
-  (let ((commit "ddabd9390d2b221786ef58a6d85200eecf82ca2f")
-        (revision "1"))
+  (let ((commit "bbca5ac9b2538e410efe3e09651f87e5573145de")
+        (revision "2"))
     (package
       (name "bh20-seq-resource")
       (version (git-version "1.0" revision commit))
@@ -1244,11 +1244,12 @@ runApp(launch.browser=0, port=4206)~%\n"
                        (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
-                 (base32 "04j8b7rz1vqczm6dlyvf1gx58idjhy0swmjbz4bm5r4zgpkps6mb"))))
+                 (base32 "1kkysjgmhp7kfb17470ik821p9djsidyqmkbjvv37jx2w9pvw31z"))))
       (build-system python-build-system)
       (inputs
        `(("python-arvados-python-client" ,python-arvados-python-client)
          ("python-flask" ,python-flask)
+         ("python-magic" ,python-magic)
          ("python-pyyaml" ,python-pyyaml)
          ("python-schema-salad" ,python-schema-salad)))
       (native-inputs
@@ -1269,25 +1270,17 @@ available to other researchers.")
 (define-public python-arvados-python-client
   (package
     (name "python-arvados-python-client")
-    (version "2.0.1")
+    (version "2.0.2")
     (source
       (origin
         (method url-fetch)
         (uri (pypi-uri "arvados-python-client" version))
         (sha256
          (base32
-          "1a363kdykj5jcrvh3q8wz06g6pqfnm2z48nfy64bls25pkiac1lr"))))
+          "19l4w6m5426x5k2kick630dh2jx26j16ycs2nhbfgr4cd43d29y4"))))
     (build-system python-build-system)
     (arguments
-     `(#:tests? #f  ; tests not included?
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'loosen-version-requirements
-           (lambda _
-             (substitute* "setup.py"
-               (("ruamel.yaml.*") "ruamel.yaml',\n")
-               (("pbr<1.7.0") "pbr"))
-             #t)))))
+     `(#:tests? #f))    ; tests not included?
     (propagated-inputs
      `(("python-ciso8601" ,python-ciso8601)
        ("python-future" ,python-future)
@@ -1295,13 +1288,13 @@ available to other researchers.")
        ("python-google-api-client" ,python-google-api-client)
        ("python-httplib2" ,python-httplib2)
        ("python-pycurl" ,python-pycurl)
-       ("python-ruamel.yaml" ,python-ruamel.yaml)
+       ("python-ruamel.yaml" ,python-ruamel.yaml-0.15)
        ("python-setuptools" ,python-setuptools)
        ("python-ws4py" ,python-ws4py)))
     (native-inputs
      `(("python-mock" ,python-mock)
        ("python-oauth2client" ,python-oauth2client)
-       ("python-pbr" ,python-pbr)
+       ("python-pbr" ,python-pbr-1.6.0)
        ("python-pyyaml" ,python-pyyaml)
        ("python-uritemplate" ,python-uritemplate)))
     (home-page "https://arvados.org")
@@ -1315,25 +1308,17 @@ server.")
 (define-public python-schema-salad
   (package
     (name "python-schema-salad")
-    (version "5.0.20200302192450")
+    (version "5.0.20200416112825")
     (source
       (origin
         (method url-fetch)
         (uri (pypi-uri "schema-salad" version))
         (sha256
          (base32
-          "14vqmfnnvpdaqpajwzi9gyjxx4y2mbgi3y5x3kwk2zqjnnadciv3"))))
+          "1pm6q266qrw4r0w0vnzhsvqgk5j8b3q61hxg99awhgpjsmcvkmsz"))))
     (build-system python-build-system)
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'loosen-version-requirements
-           (lambda _
-             (substitute* "setup.py"
-               (("CacheControl.*") "CacheControl',\n"))
-             #t)))))
     (propagated-inputs
-     `(("python-cachecontrol" ,python-cachecontrol)
+     `(("python-cachecontrol" ,python-cachecontrol-0.11)
        ("python-lockfile" ,python-lockfile)
        ("python-mistune" ,python-mistune)
        ("python-rdflib" ,python-rdflib)
diff --git a/gn/packages/python.scm b/gn/packages/python.scm
index e285880..8004507 100644
--- a/gn/packages/python.scm
+++ b/gn/packages/python.scm
@@ -1101,3 +1101,42 @@ spreadsheets without the need for COM objects.")
 
 (define-public python2-admiral
   (package-with-python2 python-admiral))
+
+(define-public python-cachecontrol-0.11
+  (package
+    (inherit python-cachecontrol)
+    (name "python-cachecontrol")
+    (version "0.11.7")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "CacheControl" version))
+        (sha256
+         (base32
+          "07jsfhlbcwgqg6ayz8nznzaqg5rmxqblbzxz1qvg5wc44pcjjy4g"))))))
+
+(define-public python-ruamel.yaml-0.15
+  (package
+    (inherit python-ruamel.yaml)
+    (name "python-ruamel.yaml")
+    (version "0.15.77")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "ruamel.yaml" version))
+        (sha256
+         (base32
+          "1mhzxkkiv3xmr9izrgk78x7f1r5gi8kd5ac7z3vn7j00q1ydn6da"))))))
+
+(define-public python-pbr-1.6.0
+  (package
+    (inherit python-pbr)
+    (name "python-pbr")
+    (version "1.6.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "pbr" version))
+        (sha256
+         (base32
+          "1lg1klrczvzfan89y3bl9ykrknl3nb01vvai37fkww24apzyibjf"))))))