commit: abc0817f3b09a5a1fcdc33935cfe93719782d4a4 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Apr 13 14:52:28 2024 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Apr 13 14:54:44 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abc0817f
dev-python/future: Remove last-rited pkg Closes: https://bugs.gentoo.org/888271 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/future/Manifest | 2 - dev-python/future/files/future-0.18.2-py3.10.patch | 29 ---------- .../future/files/future-0.18.2-py39-fileurl.patch | 22 -------- dev-python/future/files/future-0.18.2-py39.patch | 65 ---------------------- dev-python/future/future-0.18.3.ebuild | 46 --------------- dev-python/future/metadata.xml | 13 ----- profiles/package.deprecated | 7 --- profiles/package.mask | 12 ---- 8 files changed, 196 deletions(-) diff --git a/dev-python/future/Manifest b/dev-python/future/Manifest deleted file mode 100644 index fff2affc2df3..000000000000 --- a/dev-python/future/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST future-0.18.3-tests.patch.xz 2736 BLAKE2B 55f9f233fb65f006d2055adf8b5d5b3ab00b4cd9b9f5a78d09b3fa2c1e347ef2d8370569fa5374968bf3e84b4fcbc220ad8da1cc2b32da57c46d36050ba1440a SHA512 c18434bc6efe88381aed8c86ed494352a2749c5680a52f62ae043bec70e3adb0163f91a971daa04134508d59172fe2e71ebbf694a74afce060b7fa1e7c385810 -DIST future-0.18.3.tar.gz 840896 BLAKE2B 13172c639b0eee80581133a2d46b9fa3a38fb9c47ea6eecc8f0715782536be5965bbd153d6a6dda49d8fa9cfea29231c6cc60a4b3b3a6c0cc5406f02c494a425 SHA512 6de56a5aa5c5dd56a0dc5a6732c753530f9868036bd97e9d355f9ee6e1305e266a60c167de779cba93f09b5b3fae615193074caba2afe857ca7ea944532ef910 diff --git a/dev-python/future/files/future-0.18.2-py3.10.patch b/dev-python/future/files/future-0.18.2-py3.10.patch deleted file mode 100644 index 65cbc8e7a40d..000000000000 --- a/dev-python/future/files/future-0.18.2-py3.10.patch +++ /dev/null @@ -1,29 +0,0 @@ -From ca1362a4250b7124d9ae03506eb80a767f06e282 Mon Sep 17 00:00:00 2001 -From: Arthur Zamarin <[email protected]> -Date: Fri, 20 Aug 2021 10:15:59 +0300 -Subject: [PATCH] Fix for Python3.10 - -Signed-off-by: Arthur Zamarin <[email protected]> ---- - src/future/moves/test/support.py | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/future/moves/test/support.py b/src/future/moves/test/support.py -index e9aa0f4..4ae2ffd 100644 ---- a/src/future/moves/test/support.py -+++ b/src/future/moves/test/support.py -@@ -3,6 +3,11 @@ from future.standard_library import suspend_hooks - from future.utils import PY3 - - if PY3: -+ try: -+ from test.support.os_helper import * -+ from test.support.warnings_helper import * -+ except ImportError: -+ pass - from test.support import * - else: - __future_module__ = True --- -2.33.0 - diff --git a/dev-python/future/files/future-0.18.2-py39-fileurl.patch b/dev-python/future/files/future-0.18.2-py39-fileurl.patch deleted file mode 100644 index 71ed088edcb5..000000000000 --- a/dev-python/future/files/future-0.18.2-py39-fileurl.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/tests/test_future/test_urllib_toplevel.py b/tests/test_future/test_urllib_toplevel.py -index 68bc4c9..923b2e8 100644 ---- a/tests/test_future/test_urllib_toplevel.py -+++ b/tests/test_future/test_urllib_toplevel.py -@@ -120,7 +120,7 @@ class urlopen_FileTests(unittest.TestCase): - finally: - f.close() - self.pathname = support.TESTFN -- self.returned_obj = urlopen("file:%s" % self.pathname) -+ self.returned_obj = urlopen("file:%s" % urllib_parse.quote(self.pathname)) - - def tearDown(self): - """Shut down the open object""" -@@ -167,7 +167,7 @@ class urlopen_FileTests(unittest.TestCase): - self.assertIsInstance(self.returned_obj.info(), email_message.Message) - - def test_geturl(self): -- self.assertEqual(self.returned_obj.geturl(), self.pathname) -+ self.assertEqual(self.returned_obj.geturl(), urllib_parse.quote(self.pathname)) - - def test_getcode(self): - self.assertIsNone(self.returned_obj.getcode()) diff --git a/dev-python/future/files/future-0.18.2-py39.patch b/dev-python/future/files/future-0.18.2-py39.patch deleted file mode 100644 index 4524cb0c093b..000000000000 --- a/dev-python/future/files/future-0.18.2-py39.patch +++ /dev/null @@ -1,65 +0,0 @@ -From edda349a2d4fffa6c7f277483ccb40a66c0795b9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <[email protected]> -Date: Mon, 10 Feb 2020 23:17:28 +0100 -Subject: [PATCH] Test fixes for Python 3.9 - -Fixes https://github.com/PythonCharmers/python-future/issues/540 -Fixes https://github.com/PythonCharmers/python-future/issues/541 ---- - src/future/moves/_dummy_thread.py | 2 +- - src/future/standard_library/__init__.py | 2 +- - tests/test_future/test_standard_library.py | 1 - - tests/test_future/test_urllib_toplevel.py | 2 -- - 4 files changed, 2 insertions(+), 5 deletions(-) - -diff --git a/src/future/moves/_dummy_thread.py b/src/future/moves/_dummy_thread.py -index 688d249b..cc2fc891 100644 ---- a/src/future/moves/_dummy_thread.py -+++ b/src/future/moves/_dummy_thread.py -@@ -2,7 +2,7 @@ - from future.utils import PY3 - - if PY3: -- from _dummy_thread import * -+ from _thread import * - else: - __future_module__ = True - from dummy_thread import * -diff --git a/src/future/standard_library/__init__.py b/src/future/standard_library/__init__.py -index cff02f95..3e8da8a6 100644 ---- a/src/future/standard_library/__init__.py -+++ b/src/future/standard_library/__init__.py -@@ -125,7 +125,7 @@ - # 'Tkinter': 'tkinter', - '_winreg': 'winreg', - 'thread': '_thread', -- 'dummy_thread': '_dummy_thread', -+ 'dummy_thread': '_thread', - # 'anydbm': 'dbm', # causes infinite import loop - # 'whichdb': 'dbm', # causes infinite import loop - # anydbm and whichdb are handled by fix_imports2 -diff --git a/tests/test_future/test_standard_library.py b/tests/test_future/test_standard_library.py -index 3ac5d2d7..8ab27a27 100644 ---- a/tests/test_future/test_standard_library.py -+++ b/tests/test_future/test_standard_library.py -@@ -422,7 +422,6 @@ def test_urllib_imports_install_hooks(self): - - def test_underscore_prefixed_modules(self): - import _thread -- import _dummy_thread - import _markupbase - self.assertTrue(True) - -diff --git a/tests/test_future/test_urllib_toplevel.py b/tests/test_future/test_urllib_toplevel.py -index 11e77201..25f4ca82 100644 ---- a/tests/test_future/test_urllib_toplevel.py -+++ b/tests/test_future/test_urllib_toplevel.py -@@ -781,8 +781,6 @@ def test_unquoting(self): - "%s" % result) - self.assertRaises((TypeError, AttributeError), urllib_parse.unquote, None) - self.assertRaises((TypeError, AttributeError), urllib_parse.unquote, ()) -- with support.check_warnings(('', BytesWarning), quiet=True): -- self.assertRaises((TypeError, AttributeError), urllib_parse.unquote, bytes(b'')) - - def test_unquoting_badpercent(self): - # Test unquoting on bad percent-escapes diff --git a/dev-python/future/future-0.18.3.ebuild b/dev-python/future/future-0.18.3.ebuild deleted file mode 100644 index 37ee871979b9..000000000000 --- a/dev-python/future/future-0.18.3.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} pypy3 ) - -inherit distutils-r1 pypi - -DESCRIPTION="Easy, clean, reliable Python 2/3 compatibility" -HOMEPAGE=" - https://python-future.org/ - https://github.com/PythonCharmers/python-future/ - https://pypi.org/project/future/ -" -SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-0.18.3-tests.patch.xz"; - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" - -BDEPEND=" - test? ( - $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_USEDEP}] - ' 'python*') - ) -" - -PATCHES=( - "${WORKDIR}"/${PN}-0.18.3-tests.patch - "${FILESDIR}"/${PN}-0.18.2-py39.patch - "${FILESDIR}"/${PN}-0.18.2-py39-fileurl.patch - "${FILESDIR}"/${PN}-0.18.2-py3.10.patch -) - -EPYTEST_DESELECT=( - # tests requiring network access - tests/test_future/test_requests.py - tests/test_future/test_standard_library.py::TestStandardLibraryReorganization::test_moves_urllib_request_http - tests/test_future/test_standard_library.py::TestStandardLibraryReorganization::test_urllib_request_http -) - -distutils_enable_tests pytest -distutils_enable_sphinx docs dev-python/sphinx-bootstrap-theme diff --git a/dev-python/future/metadata.xml b/dev-python/future/metadata.xml deleted file mode 100644 index 0c1a2698ea45..000000000000 --- a/dev-python/future/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <name>Python</name> - </maintainer> - <stabilize-allarches/> - <upstream> - <remote-id type="pypi">future</remote-id> - <remote-id type="github">PythonCharmers/python-future</remote-id> - </upstream> -</pkgmetadata> diff --git a/profiles/package.deprecated b/profiles/package.deprecated index 63ab997a90b5..ef557ec07d2b 100644 --- a/profiles/package.deprecated +++ b/profiles/package.deprecated @@ -93,13 +93,6 @@ dev-python/python-distutils-extra # details. Please migrate to app-admin/rasdaemon instead. sys-apps/edac-utils -# Michał Górny <[email protected]> (2022-12-24) -# Unmaintained with last release in 2019. We already patched it to work -# with Python 3.9+. The upstream code is also vulnerable -# to CVE-2022-40899. Above all, this library is completely redundant -# to packages not supporting Python 2 anymore. -dev-python/future - # Matt Turner <[email protected]> (2022-10-02) # Dummy packages, now merged into app-accessibility/at-spi2-core. # When possible, replace dependencies on these packages with a dependency on diff --git a/profiles/package.mask b/profiles/package.mask index 09eef8ce32d1..2dc385d1dcf7 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -263,18 +263,6 @@ dev-ruby/atomic # https://github.com/containers/buildah/issues/5320 =app-containers/buildah-1.34.0 -# Eli Schwartz <[email protected]> (2024-03-14) -# Deprecated, doesn't work with python 3.12. Unmaintained with last -# serious release in 2019, and another release in 2024 that claims -# to support python 3.12 but fails tests if you actually do. No -# route to making it work with python 3.13 at all, and upstream -# explicitly states that future "like Python 2, is now done". The -# package is entirely redundant to packages not supporting python -# 2 anymore, and the ones that do support it should be using -# dev-python/six instead, anyways. Bug #888271 -# Removal on 2024-04-13. -dev-python/future - # Eray Aslan <[email protected]> (2024-03-10) # Mask experimental software =mail-mta/postfix-3.10*
