From 526ba25eebc68dc02ca7acd84c2ab2d33b9970b2 Mon Sep 17 00:00:00 2001 From: Anton Bolshakov Date: Sat, 22 Jun 2024 09:56:03 +0800 Subject: [PATCH] pytzdata: fork again --- dev-python/pytzdata/Manifest | 1 + .../pytzdata-2020.1-system-zoneinfo.patch | 115 ++++++++++++++++++ dev-python/pytzdata/metadata.xml | 13 ++ dev-python/pytzdata/pytzdata-2020.1-r2.ebuild | 33 +++++ 4 files changed, 162 insertions(+) create mode 100644 dev-python/pytzdata/Manifest create mode 100644 dev-python/pytzdata/files/pytzdata-2020.1-system-zoneinfo.patch create mode 100644 dev-python/pytzdata/metadata.xml create mode 100644 dev-python/pytzdata/pytzdata-2020.1-r2.ebuild diff --git a/dev-python/pytzdata/Manifest b/dev-python/pytzdata/Manifest new file mode 100644 index 000000000..82953886e --- /dev/null +++ b/dev-python/pytzdata/Manifest @@ -0,0 +1 @@ +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 new file mode 100644 index 000000000..7a4cced9e --- /dev/null +++ b/dev-python/pytzdata/files/pytzdata-2020.1-system-zoneinfo.patch @@ -0,0 +1,115 @@ +From f0d2c5fd28dbe2aa9ecb59e140ab42b11d677a33 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +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 +--- + 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 new file mode 100644 index 000000000..4cea3d0ec --- /dev/null +++ b/dev-python/pytzdata/metadata.xml @@ -0,0 +1,13 @@ + + + + + jsmolic@gentoo.org + Jakov Smolić + + + + sdispater/pytzdata + pytzdata + + diff --git a/dev-python/pytzdata/pytzdata-2020.1-r2.ebuild b/dev-python/pytzdata/pytzdata-2020.1-r2.ebuild new file mode 100644 index 000000000..54007f31b --- /dev/null +++ b/dev-python/pytzdata/pytzdata-2020.1-r2.ebuild @@ -0,0 +1,33 @@ +# 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 +)