From patchwork Fri Apr 18 11:46:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 41766 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 24E3227BC4A; Fri, 18 Apr 2025 12:50:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A316C27BC49 for ; Fri, 18 Apr 2025 12:50:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u5kCe-0006qZ-Oz; Fri, 18 Apr 2025 07:48:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u5kCc-0006pj-Sd for guix-patches@gnu.org; Fri, 18 Apr 2025 07:48:14 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u5kCc-0007ci-Gh for guix-patches@gnu.org; Fri, 18 Apr 2025 07:48:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=3BIqqQO4SrY1v08bJQYKwqQkLdkWsr+L2KRGD4BwHvM=; b=rsgFLhQNbqThG5GL+jz4Pi5zdk5IPrYp6FRwWYILqQbvEoQQGMVJnoR3zfjL+TeNnw4/SmHYFw0FuHTZ9EzkGp7m2d6a+eyrsYY8fA5nWPkfOo2xMv3i5A2qERg9vgu7FibiQXuJ3e4lGIUhqgoVqZoOe2zVNTDFJzEkO3XuYEHvsHomTbj8w0gh6rhBF3+KG9NDRg5B9ZXSS7sHYlSDjL6mUewjRApjM7ROxrCe+xpRdxW3D9WZIgv8LcYCMI5UKCvKUqEvMEc3Phjnf1XAdSshlvhq2XhE/9jQj+TGc1coQrTYTRqWh1acapT6A6hMrHCkR/vpObzD+9OZDJMWEA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u5kCc-0007wr-8u for guix-patches@gnu.org; Fri, 18 Apr 2025 07:48:14 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77895] [PATCH 4/7] gnu: Remove python-mox3. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Apr 2025 11:48:14 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77895 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77895@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 77895-submit@debbugs.gnu.org id=B77895.174497688430421 (code B ref 77895); Fri, 18 Apr 2025 11:48:14 +0000 Received: (at 77895) by debbugs.gnu.org; 18 Apr 2025 11:48:04 +0000 Received: from localhost ([127.0.0.1]:50454 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u5kCN-0007to-Re for submit@debbugs.gnu.org; Fri, 18 Apr 2025 07:48:03 -0400 Received: from 5.mo563.mail-out.ovh.net ([46.105.53.64]:56005) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u5kBX-0007ji-Q7 for 77895@debbugs.gnu.org; Fri, 18 Apr 2025 07:47:13 -0400 Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net [79.137.60.36]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4ZfCfJ09ztz1PgR; Fri, 18 Apr 2025 11:46:48 +0000 (UTC) Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net. [127.0.0.1]) by director2.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <77895@debbugs.gnu.org>; Fri, 18 Apr 2025 11:46:47 +0000 (UTC) Received: from mta10.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.113.103]) by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4ZfCfH6hK7zy7P; Fri, 18 Apr 2025 11:46:47 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.7]) by mta10.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 47D71DA3A04; Fri, 18 Apr 2025 11:46:47 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-107S0016e062038-5cb2-4103-9cb6-3b2183b7de51, 87B5F7520F1C12C50596DB6AAE10C577A8A8D40E) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Fri, 18 Apr 2025 13:46:22 +0200 Message-ID: <20250418114642.2538-4-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250418114642.2538-1-ngraves@ngraves.fr> References: <20250418114642.2538-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 4298404371342353122 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvfedvtdejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepjeevfedvheevgfdtieeuudelueduveefheeglefffefgieeuffetfeefvdeltdejnecuffhomhgrihhnpehophgvnhhsthgrtghkrdhorhhgpdhgohhoghhlvgdrtghomhdpphihthhhohhnrdhorhhgpdhlrghunhgthhhprggurdhnvghtnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejjeekleehseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=3BIqqQO4SrY1v08bJQYKwqQkLdkWsr+L2KRGD4BwHvM=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1744976808; v=1; b=cwuVdnlZpHxx+hutOXPPHSmEMWPct8KsqaIbyLEiFRbvncq7PqiXgYOuD/KpQK6Z3yQrjr8A ICw9+Lwyp79gYrEHGsu48xumexbr6RGaX3iPiOk0Hy8i60dzp+UX8PY/5/siKjFjXJiYv5tb6u2 mVBRB+ArttY8I48h1i4eS43tf06AcML++CFcMy4e8n5M1v+vcqR6MdNzI0Wp0PPUpqKzKJUgBmh mieK63jAnYziIXY2uOniVg4Omk30KfoIBQDg+jLZpko4dgAtlCtBem7jT/phTdmV5L+nNYB9nSN /zmigDxU1/13h8tJbt3CobtB+UE04xbXn+XS1dLEGz/sQ== 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches This python library is now a leaf package undevelopped for 5 years and not failing on the latest python version. * gnu/packages/openstack.scm (python-mox3): Remove variable. * gnu/packages/patches/python-mox3-python3.6-compat.patch: Remove patch. * gnu/local.mk: Deregister patch. --- gnu/local.mk | 1 - gnu/packages/openstack.scm | 26 ----------- .../python-mox3-python3.6-compat.patch | 43 ------------------- 3 files changed, 70 deletions(-) delete mode 100644 gnu/packages/patches/python-mox3-python3.6-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index d4b2d4ad51..7bdc9baa3e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2127,7 +2127,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-pyfakefs-remove-bad-test.patch \ %D%/packages/patches/python-libxml2-utf8.patch \ %D%/packages/patches/python-memcached-syntax-warnings.patch \ - %D%/packages/patches/python-mox3-python3.6-compat.patch \ %D%/packages/patches/python-packaging-test-arch.patch \ %D%/packages/patches/python-property-cached-asyncio-3_11.patch \ %D%/packages/patches/python-pyan3-fix-absolute-path-bug.patch \ diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index e78a1f614f..eab255464d 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -181,32 +181,6 @@ (define-public python-hacking guidelines}.") (license asl2.0))) -(define-public python-mox3 - (package - (name "python-mox3") - (version "0.24.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "mox3" version)) - (patches (search-patches "python-mox3-python3.6-compat.patch")) - (sha256 - (base32 - "0w58adwv7q9wzvmq9mlrk2asfk73myq9fpwy7mjkzsz3baa95zf5")))) - (build-system python-build-system) - (propagated-inputs - (list python-fixtures python-pbr)) - (native-inputs - (list python-openstackdocstheme python-sphinx python-subunit - python-testrepository python-testtools)) - (home-page "https://www.openstack.org/") - (synopsis "Mock object framework for Python") - (description - "Mox3 is an unofficial port of the @uref{https://code.google.com/p/pymox/, -Google mox framework} to Python 3. It was meant to be as compatible -with mox as possible, but small enhancements have been made.") - (license asl2.0))) - (define-public python-openstackdocstheme (package (name "python-openstackdocstheme") diff --git a/gnu/packages/patches/python-mox3-python3.6-compat.patch b/gnu/packages/patches/python-mox3-python3.6-compat.patch deleted file mode 100644 index 0426d07cf9..0000000000 --- a/gnu/packages/patches/python-mox3-python3.6-compat.patch +++ /dev/null @@ -1,43 +0,0 @@ -Fix regex so that it works with Python 3.6. - -See . - -Copied from upstream bug report: -https://bugs.launchpad.net/python-mox3/+bug/1665266 - -From 05064cdb6ea7a16450c6beae2b6f7c6074212a69 Mon Sep 17 00:00:00 2001 -From: Zac Medico -Date: Thu, 16 Feb 2017 00:24:10 -0800 -Subject: [PATCH] RegexTest: python3.6 compatibility - -These fixes are backward-compatible with older python versions: - -* raw strings fix invalid escape sequences -* flags=8 fixes ValueError: cannot use LOCALE flag with a str pattern ---- - mox3/tests/test_mox.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/mox3/tests/test_mox.py b/mox3/tests/test_mox.py -index 15ac565..3a1af17 100644 ---- a/mox3/tests/test_mox.py -+++ b/mox3/tests/test_mox.py -@@ -312,12 +312,12 @@ class RegexTest(testtools.TestCase): - def testReprWithoutFlags(self): - """repr should return the regular expression pattern.""" - self.assertTrue( -- repr(mox.Regex(r"a\s+b")) == "") -+ repr(mox.Regex(r"a\s+b")) == r"") - - def testReprWithFlags(self): - """repr should return the regular expression pattern and flags.""" -- self.assertTrue(repr(mox.Regex(r"a\s+b", flags=4)) == -- "") -+ self.assertTrue(repr(mox.Regex(r"a\s+b", flags=8)) == -+ r"") - - - class IsTest(testtools.TestCase): --- -2.10.2 -