From patchwork Tue Jan 7 21:00:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Roel Janssen X-Patchwork-Id: 19686 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 7ABA717A27; Tue, 7 Jan 2020 21:01:10 +0000 (GMT) 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=unavailable 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 1FA0316B41 for ; Tue, 7 Jan 2020 21:01:10 +0000 (GMT) Received: from localhost ([::1]:55976 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iovyP-0005pt-Hb for patchwork@mira.cbaines.net; Tue, 07 Jan 2020 16:01:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46433) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iovyK-0005oT-4N for guix-patches@gnu.org; Tue, 07 Jan 2020 16:01:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iovyI-0000ln-M7 for guix-patches@gnu.org; Tue, 07 Jan 2020 16:01:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:43492) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iovyI-0000lX-Ii for guix-patches@gnu.org; Tue, 07 Jan 2020 16:01:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iovyI-0005dX-Gi for guix-patches@gnu.org; Tue, 07 Jan 2020 16:01:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38824] [PATCH] gnu: mercurial: Update to 5.2.1. Resent-From: Roel Janssen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 07 Jan 2020 21:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38824 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Brett Gilio , Ricardo Wurmus Cc: joseph@lafreniere.xyz, 38824@debbugs.gnu.org Received: via spool by 38824-submit@debbugs.gnu.org id=B38824.157843085621646 (code B ref 38824); Tue, 07 Jan 2020 21:01:02 +0000 Received: (at 38824) by debbugs.gnu.org; 7 Jan 2020 21:00:56 +0000 Received: from localhost ([127.0.0.1]:49465 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iovy7-0005cx-5E for submit@debbugs.gnu.org; Tue, 07 Jan 2020 16:00:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36984) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iovy2-0005ci-DC for 38824@debbugs.gnu.org; Tue, 07 Jan 2020 16:00:49 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:55466) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iovxw-0000Gy-Jq; Tue, 07 Jan 2020 16:00:40 -0500 Received: from 2001-1c02-0b03-a700-f532-4553-7f2a-9b68.cable.dynamic.v6.ziggo.nl ([2001:1c02:b03:a700:f532:4553:7f2a:9b68]:51562) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1iovxr-0001tZ-6X; Tue, 07 Jan 2020 16:00:40 -0500 Message-ID: From: Roel Janssen Date: Tue, 07 Jan 2020 22:00:30 +0100 In-Reply-To: <46bbed98-fc0e-4382-b077-1387c7394dfd@localhost> References: <162d0ac10569d0aa3ba451a1ab2b115667ba6dc8.camel@gnu.org> <8736cw16uh.fsf@gnu.org> <0e2a74312eba3617dda3613038d16e76c55c4e0b.camel@gnu.org> <87h81ah1in.fsf@lafreniere.xyz> <87pnfy71dt.fsf@elephly.net> <46bbed98-fc0e-4382-b077-1387c7394dfd@localhost> User-Agent: Evolution 3.34.2 (3.34.2-1.fc31) MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] 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 On Mon, 2020-01-06 at 02:06 +0000, Brett Gilio wrote: > > Jan 5, 2020 2:30:14 AM Ricardo Wurmus : > > > LaFreniere, Joseph writes: > > > > > > > I think that for now the options are to > > > 1. continue using Python2 for Mercurial; > > > 2. use Python3 but disable all tests, as Janssen's patch suggests; > > > 3. use Python3 but disable the known-failing tests; or > > > 4. hold off on updating the package until upstream supports > > > Python3 across its entire test suite. > > > > > > Of those three, I am most in favor of the third option. I would > > > be glad to submit a patch that implements it if there is agreement > > > to take that direction. > > > > > > > I agree that option 3 (with a link to the upstream discussion) is the > > right way to go forward. > > > > Thanks! > > > > -- > > Ricardo > > > > I am also in agreement that working-around the failing tests is the best > option, with a backup of just disabling the tests until the python3 > incompatibilities are resolved. We need to work away from python2 wherever > possible. Since the upstream is aware of the problem I see avoiding python2 as > a reasonable alternative to work-arounds. > > The attached patch runs most tests, except those that failed on my machine. Note that it took my 16-core machine quite some time to run the whole test suite. Kind regards, Roel Janssen From 577aee9b75249783349ef48109f580c4d27a067b Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Tue, 7 Jan 2020 21:57:21 +0100 Subject: [PATCH] gnu: Update mercurial to 5.2.1. * gnu/packages/version-control.scm (mercurial): Update to 5.2.1. --- gnu/packages/version-control.scm | 38 +++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index d354a807a3..ca8af00752 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -25,6 +25,7 @@ ;;; Copyright © 2019 Jovany Leandro G.C ;;; Copyright © 2019 Kei Kebreau ;;; Copyright © 2019 Alex Griffin +;;; Copyright © 2020 Roel Janssen ;;; ;;; This file is part of GNU Guix. ;;; @@ -1230,22 +1231,43 @@ control to Git repositories.") (define-public mercurial (package (name "mercurial") - (version "5.0.2") + (version "5.2.1") (source (origin (method url-fetch) (uri (string-append "https://www.mercurial-scm.org/" "release/mercurial-" version ".tar.gz")) (sha256 (base32 - "1y60hfc8gh4ha9sw650qs7hndqmvbn0qxpmqwpn4q18z5xwm1f19")))) + "1pxkd37b0a1mi2zakk1hi122lgz1ffy2fxdnbs8acwlqpw55bc8q")))) (build-system python-build-system) (arguments - `(;; Restrict to Python 2, as Python 3 would require - ;; the argument --c2to3. - #:python ,python-2 - ;; FIXME: Disabled tests because they require the nose unit - ;; testing framework: https://nose.readthedocs.org/en/latest/ . - #:tests? #f)) + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + ;; The following tests are known to fail. + (for-each (lambda (file) + (delete-file (string-append "tests/" file))) + '("test-extdiff.t" + "test-hghave.t" + "test-hgwebdir.t" + "test-http-branchmap.t" + "test-logtoprocess.t" + "test-merge-combination.t" + "test-nointerrupt.t" + "test-patchbomb.t" + "test-pull-bundle.t" + "test-push-http.t" + "test-run-tests.t" + "test-serve.t" + "test-subrepo-deep-nested-change.t" + "test-subrepo-recursion.t" + "test-transplant.t")) + (invoke "make" "check")))))) + ;; The following inputs are only needed to run the tests. + (native-inputs + `(("python-nose" ,python-nose) + ("unzip" ,unzip))) (home-page "https://www.mercurial-scm.org/") (synopsis "Decentralized version control system") (description -- 2.24.1