From patchwork Fri May 31 14:04:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Neidhardt X-Patchwork-Id: 14172 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E7E6D17066; Fri, 31 May 2019 15:06:26 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 06F681704F for ; Fri, 31 May 2019 15:06:25 +0100 (BST) Received: from localhost ([127.0.0.1]:44145 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWiAq-0008D7-JB for patchwork@mira.cbaines.net; Fri, 31 May 2019 10:06:24 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40395) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWiAZ-0007v8-Qq for guix-patches@gnu.org; Fri, 31 May 2019 10:06:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hWiAX-0007cJ-5R for guix-patches@gnu.org; Fri, 31 May 2019 10:06:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50554) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hWiAW-0007bw-Tp for guix-patches@gnu.org; Fri, 31 May 2019 10:06:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hWiAW-0001SO-Np for guix-patches@gnu.org; Fri, 31 May 2019 10:06:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36026] [PATCH 4/4] gnu: python-conda: Update to 4.7.0. Resent-From: Pierre Neidhardt Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 31 May 2019 14:06:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36026 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36026@debbugs.gnu.org Received: via spool by 36026-submit@debbugs.gnu.org id=B36026.15593115245472 (code B ref 36026); Fri, 31 May 2019 14:06:04 +0000 Received: (at 36026) by debbugs.gnu.org; 31 May 2019 14:05:24 +0000 Received: from localhost ([127.0.0.1]:35862 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hWi9g-0001Pb-HV for submit@debbugs.gnu.org; Fri, 31 May 2019 10:05:24 -0400 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:57815) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hWi9V-0001Nx-6D for 36026@debbugs.gnu.org; Fri, 31 May 2019 10:05:09 -0400 X-Originating-IP: 92.169.116.19 Received: from localhost.localdomain (lfbn-1-4117-19.w92-169.abo.wanadoo.fr [92.169.116.19]) (Authenticated sender: mail@ambrevar.xyz) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id E6B24E0002 for <36026@debbugs.gnu.org>; Fri, 31 May 2019 14:04:58 +0000 (UTC) From: Pierre Neidhardt Date: Fri, 31 May 2019 16:04:44 +0200 Message-Id: <20190531140444.3810-4-mail@ambrevar.xyz> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190531140444.3810-1-mail@ambrevar.xyz> References: <20190531140444.3810-1-mail@ambrevar.xyz> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/package-management.scm (python-conda): Update to 4.7.0. --- gnu/packages/package-management.scm | 45 +++++++---------------------- 1 file changed, 10 insertions(+), 35 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 28e23fd1d3..fb84f9abfc 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -755,16 +755,17 @@ extracting, creating, and converting between formats.") (define-public python-conda (package (name "python-conda") - (version "4.3.16") + (version "4.7.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/conda/conda/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/conda/conda/") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1jq8hyrc5npb5sf4vw6s6by4602yj8f79vzpbwdfgpkn02nfk1dv")))) + "0dzplykxrlri9a5c65bc48sdjpg2i50qzjf1qf9448qkghvmnmpr")))) (build-system python-build-system) (arguments `(#:phases @@ -774,33 +775,6 @@ extracting, creating, and converting between formats.") (with-output-to-file "conda/.version" (lambda () (display ,version))) #t)) - (add-before 'check 'remove-failing-tests - (lambda _ - ;; These tests require internet/network access - (let ((network-tests '("test_cli.py" - "test_create.py" - "test_export.py" - "test_fetch.py" - "test_history.py" - "test_info.py" - "test_install.py" - "test_priority.py" - "conda_env/test_cli.py" - "conda_env/test_create.py" - "conda_env/specs/test_notebook.py" - "conda_env/utils/test_notebooks.py" - "core/test_index.py" - "core/test_repodata.py"))) - (with-directory-excursion "tests" - (for-each delete-file network-tests) - - ;; FIXME: This test creates a file, then deletes it and tests - ;; that the file was deleted. For some reason it fails when - ;; building with guix, but does not when you run it in the - ;; directory left when you build with the --keep-failed - ;; option - (delete-file "gateways/disk/test_delete.py") - #t)))) (replace 'check (lambda _ (setenv "HOME" "/tmp") @@ -813,8 +787,9 @@ extracting, creating, and converting between formats.") ("python-pytest" ,python-pytest) ("python-responses" ,python-responses) ("python-pyyaml" ,python-pyyaml) - ("python-anaconda-client" ,python-anaconda-client))) - (home-page "https://github.com/conda/conda") + ("python-anaconda-client" ,python-anaconda-client) + ("python-conda-package-handling" ,python-conda-package-handling))) + (home-page "https://conda.io") (synopsis "Cross-platform, OS-agnostic, system-level binary package manager") (description "Conda is a cross-platform, Python-agnostic binary package manager. It