Fix Conda

gnu/packages/package-management.scm

@@ -900,7 +900,7 @@ transactions from C or Python.")
 (define-public python-anaconda-client
   (package
     (name "python-anaconda-client")
-    (version "1.8.0")
+    (version "1.11.2")
     (source
      (origin
        (method git-fetch)
@@ -910,10 +910,10 @@ transactions from C or Python.")
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "1vyk0g0gci4z9psisb8h50zi3j1nwfdg1jw3j76cxv0brln0v3fw"))))
+         "1cd1ycpa9b4i5hn7fqksddk6iky2ap6gw6f3l8fy95ypdjyk2z3d"))))
     (build-system python-build-system)
     (propagated-inputs
-     (list python-clyent python-nbformat python-pyyaml python-requests))
+     (list python-clyent python-nbformat python-pyyaml python-requests python-requests-toolbelt python-tqdm python-defusedxml python-conda-package-handling conda))
     (native-inputs
      (list python-coverage
            python-dateutil
@@ -934,12 +934,11 @@ transactions from C or Python.")
                                     "tests/test_authorizations.py"
                                     "tests/test_login.py"
                                     "tests/test_whoami.py"
-                                    "utils/notebook/tests/test_data_uri.py"
-                                    "utils/notebook/tests/test_base.py"
-                                    "utils/notebook/tests/test_downloader.py"
-                                    "inspect_package/tests/test_conda.py")))
-               (with-directory-excursion "binstar_client"
-                 (for-each delete-file network-tests)))
+                                    "tests/utils/notebook/test_data_uri.py"
+                                    "tests/utils/notebook/test_base.py"
+                                    "tests/utils/notebook/test_downloader.py"
+                                    "tests/utils/test_conda.py")))
+               (for-each delete-file network-tests))
              #t)))))
     (home-page "https://github.com/Anaconda-Platform/anaconda-client")
     (synopsis "Anaconda Cloud command line client library")
@@ -952,7 +951,7 @@ environments.")
 (define-public python-conda-package-handling
   (package
     (name "python-conda-package-handling")
-    (version "1.7.3")
+    (version "2.1.0")
     (source
      (origin
        (method git-fetch)
@@ -962,25 +961,20 @@ environments.")
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "1dq6f5ks3cinb355x712bls9bvv6bli6x3c43sdkqvawdw8xgv9j"))))
+         "17k363s2ad8cfngyrazzqvq287dab64ssah2rhzj4h7v1mfy47bm"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'use-unmodified-libarchive
-           (lambda _
-             (substitute* "setup.py"
-               (("archive_and_deps") "archive"))))
          (replace 'check
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (add-installed-pythonpath inputs outputs)
-             (invoke "pytest" "-vv" "tests"))))))
+           (lambda* (#:key tests? inputs outputs #:allow-other-keys)
+             (when tests?
+               (add-installed-pythonpath inputs outputs)
+               (invoke "pytest" "-vv" "tests")))))))
     (propagated-inputs
-     (list python-six python-tqdm))
-    (inputs
-     (list libarchive))
+     (list python-conda-package-streaming))
     (native-inputs
-     (list python-cython python-pytest python-pytest-cov
+     (list python-wheel python-pytest python-pytest-cov
            python-pytest-mock python-mock))
     (home-page "https://conda.io")
     (synopsis "Create and extract conda packages of various formats")
@@ -1106,23 +1100,21 @@ extracting, creating, and converting between formats.")
     (inputs
      (list python-wrapper))
     (propagated-inputs
-     (list python-anaconda-client
-           python-boto3
+     (list python-boto3
            python-conda-package-handling
            python-cytoolz
            python-pluggy
            python-pycosat
-           python-pytest
            python-pyyaml
            python-requests
            python-responses
            python-ruamel.yaml
-           python-tqdm
-           ;; XXX: This is dragged in by libarchive and is needed at runtime.
-           zstd))
+           python-tqdm))
     (native-inputs
      (list python-coverage
            python-flaky
+           python-mock
+           python-pytest
            python-pytest-timeout
            python-pytest-xprocess))
     (home-page "https://github.com/conda/conda")

gnu/packages/python-xyz.scm

@@ -1688,6 +1688,37 @@ and function call return values in a human-readable way.")
 by @code{binstar}, @code{binstar-build}, and @code{chalmers}.")
     (license license:bsd-3)))
 
+(define-public python-conda-package-streaming
+  (package
+    (name "python-conda-package-streaming")
+    (version "0.7.0")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "conda_package_streaming" version))
+              (sha256
+               (base32
+                "01a8yhfiww3ac0glnb41iqcrz5n6ya1k0w4vwc5wg06qcp6ipbq2"))))
+    (build-system pyproject-build-system)
+    (arguments
+     ;; All tests require conda to be installed. However conda requires
+     ;; python-conda-package-handling, which requires
+     ;; python-conda-package-streaming (this package), so the tests
+     ;; cannot be run.
+     `(#:tests? #f))
+    (propagated-inputs (list python-requests python-zstandard))
+    (native-inputs (list python-pytest
+                         python-pytest-cov
+                         python-pytest-mock
+                         python-flit
+                         python-bottle
+                         python-boto3))
+    (home-page "https://github.com/conda/conda-package-streaming")
+    (synopsis
+     "Download metadata from conda packages without transferring entire file.")
+    (description
+     "Download conda metadata from packages without transferring entire file. Get metadata from local .tar.bz2 packages without reading entire files.")
+    (license license:bsd-3)))
+
 (define-public python-babel
   (package
     (name "python-babel")

gnu/packages/xml.scm

@@ -1439,16 +1439,16 @@ files.  It is designed to be fast and to handle large input files.")
 (define-public python-defusedxml
   (package
     (name "python-defusedxml")
-    (version "0.6.0")
+    (version "0.7.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "defusedxml" version))
        (sha256
         (base32
-         "1xbp8fivl3wlbyg2jrvs4lalaqv1xp9a9f29p75wdx2s2d6h717n"))))
+         "0s9ym98jrd819v4arv9gmcr6mgljhxd9q866sxi5p4c5n4nh7cqv"))))
     (build-system python-build-system)
-    (home-page "https://bitbucket.org/tiran/defusedxml")
+    (home-page "https://github.com/tiran/defusedxml")
     (synopsis "XML bomb protection for Python stdlib modules")
     (description
      "Defusedxml provides XML bomb protection for Python stdlib modules.")