commit: c7aa26011194a7735b33d2b31debe374dbae7899 Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> AuthorDate: Fri Jul 26 15:13:39 2024 +0000 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> CommitDate: Fri Jul 26 15:16:23 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7aa2601
dev-python/pytzdata: treeclean Closes: https://bugs.gentoo.org/934681 (pkgremoved) Closes: https://bugs.gentoo.org/834831 (pkgremoved) Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> dev-python/pytzdata/Manifest | 1 - .../files/pytzdata-2020.1-system-zoneinfo.patch | 115 --------------------- dev-python/pytzdata/metadata.xml | 13 --- dev-python/pytzdata/pytzdata-2020.1-r2.ebuild | 33 ------ profiles/package.mask | 5 - 5 files changed, 167 deletions(-) diff --git a/dev-python/pytzdata/Manifest b/dev-python/pytzdata/Manifest deleted file mode 100644 index 82953886e3f5..000000000000 --- a/dev-python/pytzdata/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST pytzdata-2020.1.gh.tar.gz 249045 BLAKE2B 6f07a7577edc87030fd70e720b32146e9044a8c6f74d0bafb9239ad666d0d6fd0ac7c3cca070914701af301b1a3368ace2985f8169b9747937fa6ed066be7302 SHA512 fd154bfbe90ce07a90f769063b772234036d2627c1e6d78a465d9ddbc894e50cb9d821c04ebff1a7cc6a327266f7843fe54e5592d37c41db023329d6e0f668c2 diff --git a/dev-python/pytzdata/files/pytzdata-2020.1-system-zoneinfo.patch b/dev-python/pytzdata/files/pytzdata-2020.1-system-zoneinfo.patch deleted file mode 100644 index 7a4cced9e720..000000000000 --- a/dev-python/pytzdata/files/pytzdata-2020.1-system-zoneinfo.patch +++ /dev/null @@ -1,115 +0,0 @@ -From f0d2c5fd28dbe2aa9ecb59e140ab42b11d677a33 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <[email protected]> -Date: Fri, 9 Jul 2021 10:15:51 +0200 -Subject: [PATCH] Use system zoneinfo database by default -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Michał Górny <[email protected]> ---- - pytzdata/__init__.py | 2 +- - tests/test_set_directory.py | 8 +++----- - tests/test_tz_file.py | 5 ++--- - tests/test_tz_path.py | 5 ++--- - 4 files changed, 8 insertions(+), 12 deletions(-) - -diff --git a/pytzdata/__init__.py b/pytzdata/__init__.py -index 22940da..6c3bcb9 100644 ---- a/pytzdata/__init__.py -+++ b/pytzdata/__init__.py -@@ -8,7 +8,7 @@ from ._compat import FileNotFoundError - - - DEFAULT_DIRECTORY = os.path.join( -- os.path.dirname(__file__), -+ '/usr/share', - 'zoneinfo' - ) - -diff --git a/tests/test_set_directory.py b/tests/test_set_directory.py -index 430d239..6c078e6 100644 ---- a/tests/test_set_directory.py -+++ b/tests/test_set_directory.py -@@ -2,7 +2,7 @@ - - import os - import pytest --from pytzdata import set_directory, tz_path, TimezoneNotFound -+from pytzdata import set_directory, tz_path, TimezoneNotFound, DEFAULT_DIRECTORY - - - fixtures_path = os.path.join(os.path.dirname(__file__), 'fixtures', 'tz') -@@ -30,9 +30,8 @@ def test_set_directory(): - with pytest.raises(TimezoneNotFound): - tz_path('America/New_York') - -- here = os.path.realpath(os.path.dirname(__file__)) - filepath = os.path.realpath( -- os.path.join(here, '..', 'pytzdata', 'zoneinfo', 'America', 'New_York') -+ os.path.join(DEFAULT_DIRECTORY, 'America', 'New_York') - ) - - set_directory() -@@ -51,9 +50,8 @@ def test_env_variable(): - - del os.environ['PYTZDATA_TZDATADIR'] - -- here = os.path.realpath(os.path.dirname(__file__)) - filepath = os.path.realpath( -- os.path.join(here, '..', 'pytzdata', 'zoneinfo', 'America', 'New_York') -+ os.path.join(DEFAULT_DIRECTORY, 'America', 'New_York') - ) - - set_directory() -diff --git a/tests/test_tz_file.py b/tests/test_tz_file.py -index 8b912b5..b20c08b 100644 ---- a/tests/test_tz_file.py -+++ b/tests/test_tz_file.py -@@ -3,7 +3,7 @@ - import os - import pytest - --from pytzdata import tz_file, set_directory -+from pytzdata import tz_file, set_directory, DEFAULT_DIRECTORY - from pytzdata.exceptions import TimezoneNotFound - - -@@ -22,9 +22,8 @@ def teardown_module(module): - - - def test_tz_file(): -- here = os.path.realpath(os.path.dirname(__file__)) - filepath = os.path.realpath( -- os.path.join(here, '..', 'pytzdata', 'zoneinfo', 'Europe', 'Paris') -+ os.path.join(DEFAULT_DIRECTORY, 'Europe', 'Paris') - ) - - with open(filepath) as f1: -diff --git a/tests/test_tz_path.py b/tests/test_tz_path.py -index fd4db48..77c8c74 100644 ---- a/tests/test_tz_path.py -+++ b/tests/test_tz_path.py -@@ -3,7 +3,7 @@ - import os - import pytest - --from pytzdata import tz_path, set_directory -+from pytzdata import tz_path, set_directory, DEFAULT_DIRECTORY - from pytzdata.exceptions import TimezoneNotFound - - -@@ -22,9 +22,8 @@ def teardown_module(module): - - - def test_tz_path(): -- here = os.path.realpath(os.path.dirname(__file__)) - filepath = os.path.realpath( -- os.path.join(here, '..', 'pytzdata', 'zoneinfo', 'Europe', 'Paris') -+ os.path.join(DEFAULT_DIRECTORY, 'Europe', 'Paris') - ) - - assert filepath == tz_path('Europe/Paris') --- -2.32.0 - diff --git a/dev-python/pytzdata/metadata.xml b/dev-python/pytzdata/metadata.xml deleted file mode 100644 index 4cea3d0ec48e..000000000000 --- a/dev-python/pytzdata/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="person"> - <email>[email protected]</email> - <name>Jakov Smolić</name> - </maintainer> - <stabilize-allarches/> - <upstream> - <remote-id type="github">sdispater/pytzdata</remote-id> - <remote-id type="pypi">pytzdata</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-python/pytzdata/pytzdata-2020.1-r2.ebuild b/dev-python/pytzdata/pytzdata-2020.1-r2.ebuild deleted file mode 100644 index 54007f31b6f2..000000000000 --- a/dev-python/pytzdata/pytzdata-2020.1-r2.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=poetry -PYTHON_COMPAT=( pypy3 python3_{10..12} ) - -inherit distutils-r1 - -DESCRIPTION="The Olson timezone database for Python" -HOMEPAGE=" - https://github.com/sdispater/pytzdata/ - https://pypi.org/project/pytzdata/ -" -SRC_URI=" - https://github.com/sdispater/pytzdata/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86" - -RDEPEND=" - dev-python/cleo[${PYTHON_USEDEP}] -" - -distutils_enable_tests pytest - -PATCHES=( - "${FILESDIR}"/pytzdata-2020.1-system-zoneinfo.patch -) diff --git a/profiles/package.mask b/profiles/package.mask index b5f9ef58bc6d..1a01dbcf2085 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -217,11 +217,6 @@ games-puzzle/seatris # Removal on 2024-07-22. Bugs #934687, #928028, #862687, #836104, #741430, #811561, #526442. sci-libs/coinor-os -# Michał Górny <[email protected]> (2024-06-21) -# An obsolete timezone distribution for Python. No revdeps left. -# Removal on 2024-07-21. Bug #934681. -dev-python/pytzdata - # Arthur Zamarin <[email protected]> (2024-06-21) # Last dev-php/* EAPI=6 packages, and reverse dependencies of them. # composer has active security vulnerabilities. Others are waiting
