From patchwork Sun Sep 5 16:33:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Sundberg X-Patchwork-Id: 32647 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 6B19427BBE3; Sun, 5 Sep 2021 17:35:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D7E3527BBE1 for ; Sun, 5 Sep 2021 17:35:09 +0100 (BST) Received: from localhost ([::1]:36782 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mMv6r-0004BZ-01 for patchwork@mira.cbaines.net; Sun, 05 Sep 2021 12:35:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42258) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mMv6k-0004BD-PD for guix-patches@gnu.org; Sun, 05 Sep 2021 12:35:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39310) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mMv6k-00015f-Hb for guix-patches@gnu.org; Sun, 05 Sep 2021 12:35:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mMv6k-000834-BX for guix-patches@gnu.org; Sun, 05 Sep 2021 12:35:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50405] [PATCH] python-packaging: upgrade to 20.9 Resent-From: Ryan Sundberg Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 05 Sep 2021 16:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 50405 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50405@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163085965030875 (code B ref -1); Sun, 05 Sep 2021 16:35:02 +0000 Received: (at submit) by debbugs.gnu.org; 5 Sep 2021 16:34:10 +0000 Received: from localhost ([127.0.0.1]:50856 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mMv5u-00081v-BM for submit@debbugs.gnu.org; Sun, 05 Sep 2021 12:34:10 -0400 Received: from lists.gnu.org ([209.51.188.17]:40162) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mMv5s-00081n-GG for submit@debbugs.gnu.org; Sun, 05 Sep 2021 12:34:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42148) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mMv5q-00048n-Lh for guix-patches@gnu.org; Sun, 05 Sep 2021 12:34:07 -0400 Received: from mail.arctype.co ([138.68.9.245]:44055) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mMv5l-000091-6A for guix-patches@gnu.org; Sun, 05 Sep 2021 12:34:04 -0400 Received: from authenticated-user (mail.arctype.co [138.68.9.245]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by mail.arctype.co (Postfix) with ESMTPSA id 25E5D13B22A for ; Sun, 5 Sep 2021 16:33:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=arctype.co; s=mail; t=1630859607; bh=THnRVQK4LSVzc1okApFwuG3fkWEYFH73K2vWW7/hJ5U=; h=To:From:Subject:Date:From; b=Batt6HBF941/gcpdAhG/FwG/f9zQwB+lhyKzlsTe42mT4kx7RxD6zCFEqspJiZ915 Rwud/efY3VZg6JBvktMF0HQ1R5PpCrk/pFYLptYf/VqNqmW1DIYY/6OCwpBZBOAub4 5IErVkRkZPsuHDoVGbG7ECeVWC6hKQHOTheBGhiaUGdMWjAB4K5PB4NP4dotfRgYws H5DptbUKMljFxZGKhtbQEdgr25fUKOCLyN3uw+nlEIpoS9TB/H91wwnox3ulpu6/aa YMpdqL70s9zeHl3qGMwdJccLTWGZE/FdW0RZ522raVwqT0eVgPx60+NtXlbITBv0D7 D6wsc/vRRVI5A== Message-ID: Date: Sun, 5 Sep 2021 09:33:25 -0700 MIME-Version: 1.0 Received-SPF: pass client-ip=138.68.9.245; envelope-from=ryan@arctype.co; helo=mail.arctype.co X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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" Reply-to: Ryan Sundberg X-ACL-Warn: , Ryan Sundberg via Guix-patches X-Patchwork-Original-From: Ryan Sundberg via Guix-patches via From: Ryan Sundberg X-getmail-retrieved-from-mailbox: Patches Upgrade python-packaging from 20.0 to 20.9. Also conveniently removes a patch file that is now upstream. --- Sincerely, Ryan Sundberg From 485b5c2f0717f4d79ae0376b2a06a4383141a650 Mon Sep 17 00:00:00 2001 From: Ryan Sundberg Date: Mon, 3 May 2021 00:42:08 -0700 Subject: [PATCH] python-packaging: upgrade to 20.9 * gnu/local.mk: Remove patch file gnu/packages/patches/python-packaging-test-arch.patch * gnu/packages/patches/python-packaging-test-arch.patch: Deleted * gnu/packages/python-xyz.scm (python-packaging): Upgrade to 20.9. Remove obsolete patch. --- gnu/local.mk | 1 - .../patches/python-packaging-test-arch.patch | 65 ------------------- gnu/packages/python-xyz.scm | 7 +- 3 files changed, 2 insertions(+), 71 deletions(-) delete mode 100644 gnu/packages/patches/python-packaging-test-arch.patch diff --git a/gnu/local.mk b/gnu/local.mk index 891d924ad9..33d49bf26d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1649,7 +1649,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-memcached-syntax-warnings.patch \ %D%/packages/patches/python-mox3-python3.6-compat.patch \ %D%/packages/patches/python-testtools.patch \ - %D%/packages/patches/python-packaging-test-arch.patch \ %D%/packages/patches/python2-parameterized-docstring-test.patch \ %D%/packages/patches/python-paste-remove-timing-test.patch \ %D%/packages/patches/python-pycrypto-CVE-2013-7459.patch \ diff --git a/gnu/packages/patches/python-packaging-test-arch.patch b/gnu/packages/patches/python-packaging-test-arch.patch deleted file mode 100644 index df80a62544..0000000000 --- a/gnu/packages/patches/python-packaging-test-arch.patch +++ /dev/null @@ -1,65 +0,0 @@ -Fix tests that are "hard coded" to expect x86_64 output by mocking the platform interface. - -Submitted upstream: -https://github.com/pypa/packaging/pull/176 - -diff --git a/tests/test_tags.py b/tests/test_tags.py -index 1eacf68..0a3f1b4 100644 ---- a/tests/test_tags.py -+++ b/tests/test_tags.py -@@ -435,37 +435,43 @@ class TestManylinuxPlatform: - linux_platform = list(tags._linux_platforms(is_32bit=False)) - assert linux_platform == ["linux_x86_64"] - -- def test_linux_platforms_manylinux1(self, monkeypatch): -+ def test_linux_platforms_manylinux1(self, is_x86, monkeypatch): - monkeypatch.setattr( - tags, "_is_manylinux_compatible", lambda name, _: name == "manylinux1" - ) -- if platform.system() != "Linux": -+ if platform.system() != "Linux" or not is_x86: - monkeypatch.setattr(distutils.util, "get_platform", lambda: "linux_x86_64") -+ monkeypatch.setattr(platform, "machine", lambda: "x86_64") - platforms = list(tags._linux_platforms(is_32bit=False)) -- assert platforms == ["manylinux1_x86_64", "linux_x86_64"] -+ arch = platform.machine() -+ assert platforms == ["manylinux1_" + arch, "linux_" + arch] - -- def test_linux_platforms_manylinux2010(self, monkeypatch): -+ def test_linux_platforms_manylinux2010(self, is_x86, monkeypatch): - monkeypatch.setattr( - tags, "_is_manylinux_compatible", lambda name, _: name == "manylinux2010" - ) -- if platform.system() != "Linux": -+ if platform.system() != "Linux" or not is_x86: - monkeypatch.setattr(distutils.util, "get_platform", lambda: "linux_x86_64") -+ monkeypatch.setattr(platform, "machine", lambda: "x86_64") - platforms = list(tags._linux_platforms(is_32bit=False)) -- expected = ["manylinux2010_x86_64", "manylinux1_x86_64", "linux_x86_64"] -+ arch = platform.machine() -+ expected = ["manylinux2010_" + arch, "manylinux1_" + arch, "linux_" + arch] - assert platforms == expected - -- def test_linux_platforms_manylinux2014(self, monkeypatch): -+ def test_linux_platforms_manylinux2014(self, is_x86, monkeypatch): - monkeypatch.setattr( - tags, "_is_manylinux_compatible", lambda name, _: name == "manylinux2014" - ) -- if platform.system() != "Linux": -+ if platform.system() != "Linux" or not is_x86: - monkeypatch.setattr(distutils.util, "get_platform", lambda: "linux_x86_64") -+ monkeypatch.setattr(platform, "machine", lambda: "x86_64") - platforms = list(tags._linux_platforms(is_32bit=False)) -+ arch = platform.machine() - expected = [ -- "manylinux2014_x86_64", -- "manylinux2010_x86_64", -- "manylinux1_x86_64", -- "linux_x86_64", -+ "manylinux2014_" + arch, -+ "manylinux2010_" + arch, -+ "manylinux1_" + arch, -+ "linux_" + arch, - ] - assert platforms == expected - diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index eb96d0a3dc..3ced6f3909 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17905,17 +17905,14 @@ several utilities, as well as an API for building localization tools.") (define-public python-packaging (package (name "python-packaging") - (version "20.0") + (version "20.9") (source (origin (method url-fetch) (uri (pypi-uri "packaging" version)) - ;; XXX: The URL in the patch file is wrong, it should be - ;; . - (patches (search-patches "python-packaging-test-arch.patch")) (sha256 (base32 - "1y2ip3a4ykkpgnwgn85j6hkspcl0cg3mzms97f40mk57vwqq67gy")))) + "1rgadxvzvhac6wqa512bfj313ww6q3n18i9glzf67j0d6b0plcjv")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- 2.31.1