From: Roel Janssen <roel@gnu.org>
To: Brett Gilio <brettg@gnu.org>, Ricardo Wurmus <rekado@elephly.net>
Cc: joseph@lafreniere.xyz, 38824@debbugs.gnu.org
Subject: [bug#38824] [PATCH] gnu: mercurial: Update to 5.2.1.
Date: Tue, 07 Jan 2020 22:00:30 +0100 [thread overview]
Message-ID: <b52c811a5facf212bbd6af1a64cfe4d423caed7c.camel@gnu.org> (raw)
In-Reply-To: <46bbed98-fc0e-4382-b077-1387c7394dfd@localhost>
[-- Attachment #1: Type: text/plain, Size: 1365 bytes --]
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
[-- Attachment #2: 0001-gnu-Update-mercurial-to-5.2.1.patch --]
[-- Type: text/x-patch, Size: 3064 bytes --]
From 577aee9b75249783349ef48109f580c4d27a067b Mon Sep 17 00:00:00 2001
From: Roel Janssen <roel@gnu.org>
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 <bit4bit@riseup.net>
;;; Copyright © 2019 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2019 Alex Griffin <a@ajgrf.com>
+;;; Copyright © 2020 Roel Janssen <roel@gnu.org>
;;;
;;; 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
next prev parent reply other threads:[~2020-01-07 21:01 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-30 21:56 [bug#38824] [PATCH] gnu: mercurial: Update to 5.2.1 Roel Janssen
2020-01-03 23:02 ` Brett Gilio
2020-01-04 7:13 ` Roel Janssen
2020-01-05 6:15 ` LaFreniere, Joseph
2020-01-05 8:29 ` Ricardo Wurmus
2020-01-06 2:06 ` Brett Gilio
2020-01-07 21:00 ` Roel Janssen [this message]
2020-01-11 1:54 ` bug#38824: " Brett Gilio
2020-01-06 17:55 ` [bug#38824] " Marius Bakke
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b52c811a5facf212bbd6af1a64cfe4d423caed7c.camel@gnu.org \
--to=roel@gnu.org \
--cc=38824@debbugs.gnu.org \
--cc=brettg@gnu.org \
--cc=joseph@lafreniere.xyz \
--cc=rekado@elephly.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).