[gentoo-commits] repo/gentoo:master commit in: profiles/, dev-python/cached-property/, dev-python/cached-property/files/

[gentoo-commits] repo/gentoo:master commit in: profiles/, dev-python/cached-property/, dev-python/cached-property/files/

[Arthur Zamarin]

commit:     5a4119c5681b96bc6d012b91d3343a7894edc89c
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 16 19:21:41 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 16 19:22:43 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a4119c5

dev-python/cached-property: treeclean

Closes: https://bugs.gentoo.org/932096
Bug: https://bugs.gentoo.org/638250
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-python/cached-property/Manifest                |   1 -
 .../cached-property-1.5.2-r1.ebuild                |  30 -----
 .../files/cached-property-1.5.1-test-failure.patch |  10 --
 .../files/cached-property-1.5.2-python311.patch    | 142 ---------------------
 dev-python/cached-property/metadata.xml            |  13 --
 profiles/package.mask                              |   6 -
 6 files changed, 202 deletions(-)

diff --git a/dev-python/cached-property/Manifest b/dev-python/cached-property/Manifest
deleted file mode 100644
index ca1709aea6bf..000000000000
--- a/dev-python/cached-property/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cached-property-1.5.2.tar.gz 12244 BLAKE2B 26981dcfa51925741962c60ad8659a165af6d7f242f4abd392932aac20e966ad6c1763a25184bbabdeb5bd75f8063a430c41f0241afdee8013ffcb437b3ff7da SHA512 626d98a8891a70d858269859cf4e49416464c836d073c1331c21033a4cd9e0e47dc89b53bf393375439992f4993972517dc3cdcbb2cc6f8286f282d3c973e600

diff --git a/dev-python/cached-property/cached-property-1.5.2-r1.ebuild b/dev-python/cached-property/cached-property-1.5.2-r1.ebuild
deleted file mode 100644
index 130e039c94ed..000000000000
--- a/dev-python/cached-property/cached-property-1.5.2-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A cached-property for decorating methods in classes"
-HOMEPAGE="https://github.com/pydanny/cached-property"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~riscv x86"
-
-BDEPEND="test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-DOCS=( README.rst HISTORY.rst CONTRIBUTING.rst AUTHORS.rst )
-
-PATCHES=(
-	# bug 638250
-	"${FILESDIR}"/${PN}-1.5.1-test-failure.patch
-	# @asyncio.coroutine removed in py3.11
-	"${FILESDIR}"/${PN}-1.5.2-python311.patch
-)

diff --git a/dev-python/cached-property/files/cached-property-1.5.1-test-failure.patch b/dev-python/cached-property/files/cached-property-1.5.1-test-failure.patch
deleted file mode 100644
index 03fabd2900ca..000000000000
--- a/dev-python/cached-property/files/cached-property-1.5.1-test-failure.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/tests/test_cached_property.py
-+++ b/tests/test_cached_property.py
-@@ -191,6 +191,7 @@
-         self.assert_cached(check, 2)
-         self.assert_cached(check, 2)
- 
-+    @unittest.skip("Gentoo Bug #638250")
-     def test_threads_ttl_expiry(self):
-         Check = CheckFactory(self.cached_property_factory(ttl=100000), threadsafe=True)
-         check = Check()

diff --git a/dev-python/cached-property/files/cached-property-1.5.2-python311.patch b/dev-python/cached-property/files/cached-property-1.5.2-python311.patch
deleted file mode 100644
index 989033f20036..000000000000
--- a/dev-python/cached-property/files/cached-property-1.5.2-python311.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From 297031687679762849dedeaf24aa3a19116f095b Mon Sep 17 00:00:00 2001
-From: Petr Viktorin <encukou@gmail.com>
-Date: Thu, 2 Dec 2021 11:26:20 +0100
-Subject: [PATCH 1/2] Don't use asyncio.coroutinefunction if it's not available
-
-Python 3.11 drops the deprecated @asyncio.coroutine and
-asyncio.iscoroutinefunction.
-
-Using a wrapper with @asyncio.coroutine in __get__ wasn't
-necessary (the future from asyncio.ensure_future is awaitable,
-and the wrapper doesn't do anything asynchronous), so the
-logic can be simplified to just call asyncio.ensure_future
-(to schedule the task and store the result when it's
-available).
-
-Tests for @asyncio.coroutine are skipped on 3.11+.
-
-An unnecessary call to asyncio.coroutine in tests is
-removed: it's not necessary to call this for `async def`
-functions.
----
- cached_property.py                  | 24 +++++++++++-------------
- conftest.py                         |  6 +++++-
- tests/test_async_cached_property.py |  3 +--
- 3 files changed, 17 insertions(+), 16 deletions(-)
-
-diff --git a/cached_property.py b/cached_property.py
-index 3135871..254739c 100644
---- a/cached_property.py
-+++ b/cached_property.py
-@@ -13,6 +13,12 @@
-     import asyncio
- except (ImportError, SyntaxError):
-     asyncio = None
-+try:
-+    iscoroutinefunction = asyncio.iscoroutinefunction
-+except AttributeError:
-+    # Python 3.11: @asyncio.coroutine was removed
-+    from inspect import iscoroutinefunction
-+
- 
- 
- class cached_property(object):
-@@ -30,22 +36,14 @@ def __get__(self, obj, cls):
-         if obj is None:
-             return self
- 
--        if asyncio and asyncio.iscoroutinefunction(self.func):
--            return self._wrap_in_coroutine(obj)
-+        if asyncio and iscoroutinefunction(self.func):
-+            value = asyncio.ensure_future(self.func(obj))
-+        else:
-+            value = self.func(obj)
- 
--        value = obj.__dict__[self.func.__name__] = self.func(obj)
-+        obj.__dict__[self.func.__name__] = value
-         return value
- 
--    def _wrap_in_coroutine(self, obj):
--        @wraps(obj)
--        @asyncio.coroutine
--        def wrapper():
--            future = asyncio.ensure_future(self.func(obj))
--            obj.__dict__[self.func.__name__] = future
--            return future
--
--        return wrapper()
--
- 
- class threaded_cached_property(object):
-     """
-diff --git a/conftest.py b/conftest.py
-index 0563f64..1c4b618 100644
---- a/conftest.py
-+++ b/conftest.py
-@@ -7,13 +7,17 @@
- # Whether the async and await keywords work
- has_async_await = sys.version_info[0] == 3 and sys.version_info[1] >= 5
- 
-+# Whether "from asyncio import coroutine" *fails*
-+version_info = sys.version_info
-+dropped_asyncio_coroutine = version_info[0] == 3 and version_info[1] >= 11
-+
- 
- print("conftest.py", has_asyncio, has_async_await)
- 
- 
- collect_ignore = []
- 
--if not has_asyncio:
-+if not has_asyncio or dropped_asyncio_coroutine:
-     collect_ignore.append("tests/test_coroutine_cached_property.py")
- 
- if not has_async_await:
-diff --git a/tests/test_async_cached_property.py b/tests/test_async_cached_property.py
-index 4ba84f3..d61cc28 100644
---- a/tests/test_async_cached_property.py
-+++ b/tests/test_async_cached_property.py
-@@ -9,8 +9,7 @@
- 
- def unittest_run_loop(f):
-     def wrapper(*args, **kwargs):
--        coro = asyncio.coroutine(f)
--        future = coro(*args, **kwargs)
-+        future = f(*args, **kwargs)
-         loop = asyncio.get_event_loop()
-         loop.run_until_complete(future)
- 
-
-From 9b210d12fa73c91743378ba4a966417846e7ea9a Mon Sep 17 00:00:00 2001
-From: Petr Viktorin <encukou@gmail.com>
-Date: Thu, 2 Dec 2021 11:44:18 +0100
-Subject: [PATCH 2/2] Restore	compatibility with python 2.7
-
-This is	still necessary	according to the Contributing Guidelines.
----
- cached_property.py | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/cached_property.py b/cached_property.py
-index 254739c..944e2f5 100644
---- a/cached_property.py
-+++ b/cached_property.py
-@@ -13,12 +13,12 @@
-     import asyncio
- except (ImportError, SyntaxError):
-     asyncio = None
--try:
--    iscoroutinefunction = asyncio.iscoroutinefunction
--except AttributeError:
--    # Python 3.11: @asyncio.coroutine was removed
--    from inspect import iscoroutinefunction
--
-+if asyncio:
-+    try:
-+        iscoroutinefunction = asyncio.iscoroutinefunction
-+    except AttributeError:
-+        # Python 3.11: @asyncio.coroutine was removed
-+        from inspect import iscoroutinefunction
- 
- 
- class cached_property(object):

diff --git a/dev-python/cached-property/metadata.xml b/dev-python/cached-property/metadata.xml
deleted file mode 100644
index 6a6c67c67b58..000000000000
--- a/dev-python/cached-property/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>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="pypi">cached-property</remote-id>
-		<remote-id type="github">pydanny/cached-property</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/profiles/package.mask b/profiles/package.mask
index c11e807fdb74..767bb221baee 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -506,12 +506,6 @@ dev-python/pdm-pep517
 # Removal on 2024-06-16.  Bug #932103.
 dev-python/dictpath
 
-# Michał Górny <mgorny@gentoo.org> (2024-05-17)
-# Unmaintained.  Last activity in 2020.  Redundant to stdlib.
-# No revdeps.
-# Removal on 2024-06-16.  Bug #932096.
-dev-python/cached-property
-
 # Sam James <sam@gentoo.org> (2024-04-28)
 # Masked for testing. Tracker bug: bug #930805.
 >=sys-libs/ncurses-6.5