From mboxrd@z Thu Jan 1 00:00:00 1970 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 Subject: [bug#38824] [PATCH] gnu: mercurial: Update to 5.2.1. Resent-Message-ID: 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> Content-Type: multipart/mixed; boundary="=-Wv2je9GVbDrDQvuCBkEm" MIME-Version: 1.0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Brett Gilio , Ricardo Wurmus Cc: joseph@lafreniere.xyz, 38824@debbugs.gnu.org --=-Wv2je9GVbDrDQvuCBkEm Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit 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 --=-Wv2je9GVbDrDQvuCBkEm Content-Disposition: attachment; filename="0001-gnu-Update-mercurial-to-5.2.1.patch" Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name="0001-gnu-Update-mercurial-to-5.2.1.patch"; charset="UTF-8" RnJvbSA1NzdhZWU5Yjc1MjQ5NzgzMzQ5ZWY0ODEwOWY1ODBjNGQyN2EwNjdiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSb2VsIEphbnNzZW4gPHJvZWxAZ251Lm9yZz4KRGF0ZTogVHVl LCA3IEphbiAyMDIwIDIxOjU3OjIxICswMTAwClN1YmplY3Q6IFtQQVRDSF0gZ251OiBVcGRhdGUg bWVyY3VyaWFsIHRvIDUuMi4xLgoKKiBnbnUvcGFja2FnZXMvdmVyc2lvbi1jb250cm9sLnNjbSAo bWVyY3VyaWFsKTogVXBkYXRlIHRvIDUuMi4xLgotLS0KIGdudS9wYWNrYWdlcy92ZXJzaW9uLWNv bnRyb2wuc2NtIHwgMzggKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0KIDEgZmlsZSBj aGFuZ2VkLCAzMCBpbnNlcnRpb25zKCspLCA4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2du dS9wYWNrYWdlcy92ZXJzaW9uLWNvbnRyb2wuc2NtIGIvZ251L3BhY2thZ2VzL3ZlcnNpb24tY29u dHJvbC5zY20KaW5kZXggZDM1NGE4MDdhMy4uY2E4YWYwMDc1MiAxMDA2NDQKLS0tIGEvZ251L3Bh Y2thZ2VzL3ZlcnNpb24tY29udHJvbC5zY20KKysrIGIvZ251L3BhY2thZ2VzL3ZlcnNpb24tY29u dHJvbC5zY20KQEAgLTI1LDYgKzI1LDcgQEAKIDs7OyBDb3B5cmlnaHQgwqkgMjAxOSBKb3Zhbnkg TGVhbmRybyBHLkMgPGJpdDRiaXRAcmlzZXVwLm5ldD4KIDs7OyBDb3B5cmlnaHQgwqkgMjAxOSBL ZWkgS2VicmVhdSA8a2tlYnJlYXVAcG9zdGVvLm5ldD4KIDs7OyBDb3B5cmlnaHQgwqkgMjAxOSBB bGV4IEdyaWZmaW4gPGFAYWpncmYuY29tPgorOzs7IENvcHlyaWdodCDCqSAyMDIwIFJvZWwgSmFu c3NlbiA8cm9lbEBnbnUub3JnPgogOzs7CiA7OzsgVGhpcyBmaWxlIGlzIHBhcnQgb2YgR05VIEd1 aXguCiA7OzsKQEAgLTEyMzAsMjIgKzEyMzEsNDMgQEAgY29udHJvbCB0byBHaXQgcmVwb3NpdG9y aWVzLiIpCiAoZGVmaW5lLXB1YmxpYyBtZXJjdXJpYWwKICAgKHBhY2thZ2UKICAgICAobmFtZSAi bWVyY3VyaWFsIikKLSAgICAodmVyc2lvbiAiNS4wLjIiKQorICAgICh2ZXJzaW9uICI1LjIuMSIp CiAgICAgKHNvdXJjZSAob3JpZ2luCiAgICAgICAgICAgICAgKG1ldGhvZCB1cmwtZmV0Y2gpCiAg ICAgICAgICAgICAgKHVyaSAoc3RyaW5nLWFwcGVuZCAiaHR0cHM6Ly93d3cubWVyY3VyaWFsLXNj bS5vcmcvIgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgInJlbGVhc2UvbWVyY3Vy aWFsLSIgdmVyc2lvbiAiLnRhci5neiIpKQogICAgICAgICAgICAgIChzaGEyNTYKICAgICAgICAg ICAgICAgKGJhc2UzMgotICAgICAgICAgICAgICAgIjF5NjBoZmM4Z2g0aGE5c3c2NTBxczdobmRx bXZibjBxeHBtcXdwbjRxMTh6NXh3bTFmMTkiKSkpKQorICAgICAgICAgICAgICAgIjFweGtkMzdi MGExbWkyemFrazFoaTEyMmxnejFmZnkyZnhkbmJzOGFjd2xxcHc1NWJjOHEiKSkpKQogICAgIChi dWlsZC1zeXN0ZW0gcHl0aG9uLWJ1aWxkLXN5c3RlbSkKICAgICAoYXJndW1lbnRzCi0gICAgIGAo OzsgUmVzdHJpY3QgdG8gUHl0aG9uIDIsIGFzIFB5dGhvbiAzIHdvdWxkIHJlcXVpcmUKLSAgICAg ICA7OyB0aGUgYXJndW1lbnQgLS1jMnRvMy4KLSAgICAgICAjOnB5dGhvbiAscHl0aG9uLTIKLSAg ICAgICA7OyBGSVhNRTogRGlzYWJsZWQgdGVzdHMgYmVjYXVzZSB0aGV5IHJlcXVpcmUgdGhlIG5v c2UgdW5pdAotICAgICAgIDs7IHRlc3RpbmcgZnJhbWV3b3JrOiBodHRwczovL25vc2UucmVhZHRo ZWRvY3Mub3JnL2VuL2xhdGVzdC8gLgotICAgICAgICM6dGVzdHM/ICNmKSkKKyAgICAgYCgjOnBo YXNlcworICAgICAgIChtb2RpZnktcGhhc2VzICVzdGFuZGFyZC1waGFzZXMKKyAgICAgICAgIChy ZXBsYWNlICdjaGVjaworICAgICAgICAgICAobGFtYmRhIF8KKyAgICAgICAgICAgICA7OyBUaGUg Zm9sbG93aW5nIHRlc3RzIGFyZSBrbm93biB0byBmYWlsLgorICAgICAgICAgICAgIChmb3ItZWFj aCAobGFtYmRhIChmaWxlKQorICAgICAgICAgICAgICAgICAgICAgICAgIChkZWxldGUtZmlsZSAo c3RyaW5nLWFwcGVuZCAidGVzdHMvIiBmaWxlKSkpCisgICAgICAgICAgICAgICAgICAgICAgICco InRlc3QtZXh0ZGlmZi50IgorICAgICAgICAgICAgICAgICAgICAgICAgICJ0ZXN0LWhnaGF2ZS50 IgorICAgICAgICAgICAgICAgICAgICAgICAgICJ0ZXN0LWhnd2ViZGlyLnQiCisgICAgICAgICAg ICAgICAgICAgICAgICAgInRlc3QtaHR0cC1icmFuY2htYXAudCIKKyAgICAgICAgICAgICAgICAg ICAgICAgICAidGVzdC1sb2d0b3Byb2Nlc3MudCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAi dGVzdC1tZXJnZS1jb21iaW5hdGlvbi50IgorICAgICAgICAgICAgICAgICAgICAgICAgICJ0ZXN0 LW5vaW50ZXJydXB0LnQiCisgICAgICAgICAgICAgICAgICAgICAgICAgInRlc3QtcGF0Y2hib21i LnQiCisgICAgICAgICAgICAgICAgICAgICAgICAgInRlc3QtcHVsbC1idW5kbGUudCIKKyAgICAg ICAgICAgICAgICAgICAgICAgICAidGVzdC1wdXNoLWh0dHAudCIKKyAgICAgICAgICAgICAgICAg ICAgICAgICAidGVzdC1ydW4tdGVzdHMudCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAidGVz dC1zZXJ2ZS50IgorICAgICAgICAgICAgICAgICAgICAgICAgICJ0ZXN0LXN1YnJlcG8tZGVlcC1u ZXN0ZWQtY2hhbmdlLnQiCisgICAgICAgICAgICAgICAgICAgICAgICAgInRlc3Qtc3VicmVwby1y ZWN1cnNpb24udCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAidGVzdC10cmFuc3BsYW50LnQi KSkKKyAgICAgICAgICAgICAoaW52b2tlICJtYWtlIiAiY2hlY2siKSkpKSkpCisgICAgOzsgVGhl IGZvbGxvd2luZyBpbnB1dHMgYXJlIG9ubHkgbmVlZGVkIHRvIHJ1biB0aGUgdGVzdHMuCisgICAg KG5hdGl2ZS1pbnB1dHMKKyAgICAgYCgoInB5dGhvbi1ub3NlIiAscHl0aG9uLW5vc2UpCisgICAg ICAgKCJ1bnppcCIgLHVuemlwKSkpCiAgICAgKGhvbWUtcGFnZSAiaHR0cHM6Ly93d3cubWVyY3Vy aWFsLXNjbS5vcmcvIikKICAgICAoc3lub3BzaXMgIkRlY2VudHJhbGl6ZWQgdmVyc2lvbiBjb250 cm9sIHN5c3RlbSIpCiAgICAgKGRlc2NyaXB0aW9uCi0tIAoyLjI0LjEKCg== --=-Wv2je9GVbDrDQvuCBkEm--