[gentoo-commits] repo/gentoo:master commit in: dev-python/colorlog/files/, dev-python/colorlog/

[gentoo-commits] repo/gentoo:master commit in: dev-python/colorlog/files/, dev-python/colorlog/

[Michał Górny]

commit:     f907e60af5314eaf14d9166217eeab60da9c90e9
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 20 16:15:27 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Dec 20 16:25:59 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f907e60a

dev-python/colorlog: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/colorlog/Manifest                       |  1 -
 dev-python/colorlog/colorlog-6.7.0.ebuild          | 25 -----------------
 .../colorlog/files/colorlog-6.7.0-nocolor.patch    | 31 ----------------------
 3 files changed, 57 deletions(-)

diff --git a/dev-python/colorlog/Manifest b/dev-python/colorlog/Manifest
index acff1ab09cbb..134a7e97a81f 100644
--- a/dev-python/colorlog/Manifest
+++ b/dev-python/colorlog/Manifest
@@ -1,2 +1 @@
-DIST colorlog-6.7.0.tar.gz 29920 BLAKE2B b4240f3fd17b17ead968293e54d5f4e589515d333a6cdf157a6d913c7457deff67d320ee87270ce05b853616134901c8ac47c4a542ef74158e1174d92de00b3c SHA512 19b3c04beb8ac26d3db69f78bc1e7db40288c95ba7edc7c1d2495d592262dea9a1bf91e42dce0e575341eb2a572f0050866970f23d3be8c5adae518c4115787d
 DIST colorlog-6.8.0.tar.gz 29939 BLAKE2B fd260f0c4149283a008d0902962848c579500f24937c2ae7a0ef75f6f10552f9739c5c1dce9553e264617f6662a9d3c8c31943d6690a4769abfa550dc4862f76 SHA512 a16752be362ed1ed5104e54d872d847873b9bc9138d59a8e525e32b386c8824c7a21689c354517392de6f16035601ce0f30daebc32d08b911c18ca4004292e02

diff --git a/dev-python/colorlog/colorlog-6.7.0.ebuild b/dev-python/colorlog/colorlog-6.7.0.ebuild
deleted file mode 100644
index fd1f5d028ae7..000000000000
--- a/dev-python/colorlog/colorlog-6.7.0.ebuild
+++ /dev/null
@@ -1,25 +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=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Log formatting with colors"
-HOMEPAGE="
-	https://pypi.org/project/colorlog/
-	https://github.com/borntyping/python-colorlog/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/${P}-nocolor.patch"
-)

diff --git a/dev-python/colorlog/files/colorlog-6.7.0-nocolor.patch b/dev-python/colorlog/files/colorlog-6.7.0-nocolor.patch
deleted file mode 100644
index cbd799a2f0d7..000000000000
--- a/dev-python/colorlog/files/colorlog-6.7.0-nocolor.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 4babdb5f18bd4799c25d61f0f7937b5e164770cc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 24 Nov 2023 16:45:42 +0100
-Subject: [PATCH] Fix running tests in environment with NO_COLOR=1
-
-Fix running the test suite when pytest is run with NO_COLOR=1 set
-in the environment.  An fixture is autoused to ensure that the variables
-are removed for the scope of the test, while they are respected
-e.g. by pytest itself.
----
- colorlog/tests/conftest.py | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/colorlog/tests/conftest.py b/colorlog/tests/conftest.py
-index 65fd6d4..33e23e6 100644
---- a/colorlog/tests/conftest.py
-+++ b/colorlog/tests/conftest.py
-@@ -28,6 +28,13 @@ def assert_log_message(capsys, log_function, message, *args):
-     return err
- 
- 
-+@pytest.fixture(autouse=True)
-+def clean_env(monkeypatch):
-+    monkeypatch.delenv("FORCE_COLOR", raising=False)
-+    monkeypatch.delenv("NO_COLOR", raising=False)
-+    yield
-+
-+
- @pytest.fixture()
- def reset_loggers():
-     logging.root.handlers = list()

[gentoo-commits] repo/gentoo:master commit in: dev-python/colorlog/files/, dev-python/colorlog/

[Michał Górny]

commit:     de0f2cfb247ef80cf6ba2e7c7084ca0a57a28682
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 16 08:14:05 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Nov 16 08:18:46 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de0f2cfb

dev-python/colorlog: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/colorlog/Manifest                       |  1 -
 dev-python/colorlog/colorlog-6.8.2.ebuild          | 26 -----------
 .../colorlog/files/colorlog-6.8.2-py313.patch      | 51 ----------------------
 3 files changed, 78 deletions(-)

diff --git a/dev-python/colorlog/Manifest b/dev-python/colorlog/Manifest
index f8cd1c2e0581..0b49be5cddb9 100644
--- a/dev-python/colorlog/Manifest
+++ b/dev-python/colorlog/Manifest
@@ -1,2 +1 @@
-DIST colorlog-6.8.2.tar.gz 16529 BLAKE2B c745e9deae4f0a96e5b3481268b7ae402f0c7f05a3997753cbc6e117c1f0630338748ca557f5f3ae261694f0ce6c65f486d06d35778b3ee331160d2c0596465f SHA512 cffd4541837e15ed7cfa0e48d8424d6bb10d0de6e227fe16145cfba51ebc2f90e2a4c750db57d37ee2708ec0272de97ad74e946283b7b3cd3628e1bd24a60b6f
 DIST colorlog-6.9.0.tar.gz 16624 BLAKE2B 6c4e6db3592bafa0c4ee799681076f9c775200d495e19532b63c11e3cd165eeb1c1dfd1b3b0763be6b033d098afec2a467103f2d73e73a6d0592a4d04e1cc2af SHA512 a1f0fa3858314a770050172c287fca3bbd060ea00ce8d042429edf38f363ac21b689204c2f97140bc58c27f708bb15836de699a4692873118471e4e966a8320f

diff --git a/dev-python/colorlog/colorlog-6.8.2.ebuild b/dev-python/colorlog/colorlog-6.8.2.ebuild
deleted file mode 100644
index d75db15a6ab3..000000000000
--- a/dev-python/colorlog/colorlog-6.8.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Log formatting with colors"
-HOMEPAGE="
-	https://pypi.org/project/colorlog/
-	https://github.com/borntyping/python-colorlog/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~loong ~riscv x86"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	# https://github.com/borntyping/python-colorlog/commit/607485def2d60b60c40c0d682574324b47fc30ba
-	"${FILESDIR}/${P}-py313.patch"
-)

diff --git a/dev-python/colorlog/files/colorlog-6.8.2-py313.patch b/dev-python/colorlog/files/colorlog-6.8.2-py313.patch
deleted file mode 100644
index dc47fe2ee534..000000000000
--- a/dev-python/colorlog/files/colorlog-6.8.2-py313.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 607485def2d60b60c40c0d682574324b47fc30ba Mon Sep 17 00:00:00 2001
-From: Sam Clements <sam@borntyping.co.uk>
-Date: Fri, 26 Jan 2024 14:06:47 +0000
-Subject: [PATCH] Support Python 3.13
-
----
- colorlog/wrappers.py     | 17 +++++++++++++----
- 4 files changed, 17 insertions(+), 6 deletions(-)
-
-diff --git a/colorlog/wrappers.py b/colorlog/wrappers.py
-index 20e3042..63b201a 100644
---- a/colorlog/wrappers.py
-+++ b/colorlog/wrappers.py
-@@ -2,6 +2,7 @@
- 
- import functools
- import logging
-+import sys
- import typing
- from logging import (
-     CRITICAL,
-@@ -53,8 +54,8 @@ def basicConfig(
- ) -> None:
-     """Call ``logging.basicConfig`` and override the formatter it creates."""
-     logging.basicConfig(**kwargs)
--    logging._acquireLock()  # type: ignore
--    try:
-+
-+    def _basicConfig():
-         handler = logging.root.handlers[0]
-         handler.setFormatter(
-             colorlog.formatter.ColoredFormatter(
-@@ -67,8 +68,16 @@ def basicConfig(
-                 stream=kwargs.get("stream", None),
-             )
-         )
--    finally:
--        logging._releaseLock()  # type: ignore
-+
-+    if sys.version_info >= (3, 13):
-+        with logging._lock:
-+            _basicConfig()
-+    else:
-+        logging._acquireLock()  # type: ignore
-+        try:
-+            _basicConfig()
-+        finally:
-+            logging._releaseLock()  # type: ignore
- 
- 
- def ensure_configured(func):