diff options
| author | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2021-07-10 07:45:12 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2021-07-10 07:45:12 +0000 |
| commit | 1d883fd0dd9a0f3e3197da63ab6dfb071f01a3e1 (patch) | |
| tree | 59159d353759f3ca4d9d83c9bf1aeb2e9dc42e8c /dev-python | |
| parent | 750ea8650de3d912f6ce0d6b5182d72630773fe9 (diff) | |
| download | baldeagleos-repo-1d883fd0dd9a0f3e3197da63ab6dfb071f01a3e1.tar.gz baldeagleos-repo-1d883fd0dd9a0f3e3197da63ab6dfb071f01a3e1.tar.xz baldeagleos-repo-1d883fd0dd9a0f3e3197da63ab6dfb071f01a3e1.zip | |
Adding metadata
Diffstat (limited to 'dev-python')
| -rw-r--r-- | dev-python/clang-python/Manifest | 2 | ||||
| -rw-r--r-- | dev-python/clang-python/clang-python-12.0.1.ebuild (renamed from dev-python/clang-python/clang-python-12.0.1_rc4.ebuild) | 2 | ||||
| -rw-r--r-- | dev-python/cryptography/Manifest | 4 | ||||
| -rw-r--r-- | dev-python/cryptography/cryptography-3.4.7-r1.ebuild (renamed from dev-python/cryptography/cryptography-3.4.7.ebuild) | 7 | ||||
| -rw-r--r-- | dev-python/cryptography/files/cryptography-3.4.7-py310.patch | 301 | ||||
| -rw-r--r-- | dev-python/lit/Manifest | 2 | ||||
| -rw-r--r-- | dev-python/lit/lit-12.0.1.ebuild (renamed from dev-python/lit/lit-12.0.1_rc4.ebuild) | 2 | ||||
| -rw-r--r-- | dev-python/pytzdata/files/pytzdata-2020.1-system-zoneinfo.patch | 115 | ||||
| -rw-r--r-- | dev-python/pytzdata/pytzdata-2020.1-r1.ebuild (renamed from dev-python/pytzdata/pytzdata-2020.1.ebuild) | 7 |
9 files changed, 430 insertions, 12 deletions
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest index c5254d02f1d1..104b03477e7a 100644 --- a/dev-python/clang-python/Manifest +++ b/dev-python/clang-python/Manifest @@ -1,4 +1,4 @@ DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26 -DIST llvmorg-12.0.1-rc4.tar.gz 134278617 BLAKE2B d407421c7244bb125151e69e2a341f1af0a0cf8c1fda3b8ae3d4114c3a285d6307620bbf82b22d96d2c7782b37b0975e87be80c24e3ce1fdc71152734be1e8f8 SHA512 1a2c18435a970491eb9fc9381ba66af726e17dcbd5bf6774f9341b1e82fd35f2e5686844743f5317ebd2106b902c39e09aa98102e58a86e290b29102241c949f +DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1 diff --git a/dev-python/clang-python/clang-python-12.0.1_rc4.ebuild b/dev-python/clang-python/clang-python-12.0.1.ebuild index 2f2f8087f297..f81a1782012e 100644 --- a/dev-python/clang-python/clang-python-12.0.1_rc4.ebuild +++ b/dev-python/clang-python/clang-python-12.0.1.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0" -KEYWORDS="" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" IUSE="test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RESTRICT="!test? ( test )" diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest index 9e56a14d833a..46e9995bac7e 100644 --- a/dev-python/cryptography/Manifest +++ b/dev-python/cryptography/Manifest @@ -1,8 +1,4 @@ -DIST cryptography-3.2.1.tar.gz 540994 BLAKE2B 667f09ac81423ecdc84c8646f0d02ee3a2955f55d35623e59c07696810a93c47332f7f8d877918eeeb6581d8e02bde3b70aae8e9d32be7ffbc8011e5e7e382a9 SHA512 e3f1806693c24aadc3ef0df374ce1845760e87ad7c243226b75e80820b50bdc0760e4bb5f6ce26d62a6d23736b3109f72cd30b52ae2a36b26ec5656ec96c6175 -DIST cryptography-3.3.1.tar.gz 539756 BLAKE2B a3eb52d756565ae83d9f2e06045be1d3439a2464b633a9a168101796a448d7c7531e8247862f7996d04500347d32dcebf6b1352e9c9f2e4f0d8008d4bbd000dc SHA512 62192fe0fd3bb8844ccc0056ab72a42b038db2a4ecb0928543c520b85e1de93066dab0d604acf23d37395d68172b9618f81c6022a59ec49725bc1862096d15d1 DIST cryptography-3.3.2.tar.gz 539883 BLAKE2B e35de90362b24170c4025f67914e60c16fbf37fce6bcd5d6f3fe32e5a9bb60de8edbebcb1ff0450fabc9c244d4b1a4618c720b630f28c747fea17e9bf008f01f SHA512 55f6ee13342b3209b1fcb310f4c4d33d22856ee785cb2347e6ad36c34e9b42f6e0d5bece8e458b09663a5b78e34c4567fe7a211b51ca71f55ccc93e3f62dc5e4 DIST cryptography-3.4.7.tar.gz 546893 BLAKE2B 49bc1e098ed1ba0181059b645f6668cda6332d196eaca55270ebce6e07e5bb6ab6724c5050fde20e89b7025773960d74ec782bb875badbbd5dc9a04db0a536f1 SHA512 3c4cf64bc0b067ccdbb71efe04c32ac9d673faea6cc4ccd13d6b1b61920be4785806d19359b7657d032a2ff1c011a8b4f16ec4924d9df8a59d1a875a7f844473 -DIST cryptography_vectors-3.2.1.tar.gz 35168164 BLAKE2B 77af3be0dbd7393da7cd59600086041b78fe20339018a637fc1cf3600c7cd08cf2e565c79ccb47f4719a4b0f01cf2ab2db00c025805443b333dd7fdf3aa835a7 SHA512 44ff756a6ece9700f7657f8ba92417e95bf273cf500f1dab2141de5b2af6e61840d65c37b766abd752c76025ead1550bfc7b7340ce5774c75fd0bb8ac768cdd8 -DIST cryptography_vectors-3.3.1.tar.gz 35168171 BLAKE2B 72cf5d79773a728c16847e3e62f8ce444526c051d7562467446d3e59c66064568fdfcbfb1fd35419fd79079ff9a02a2f3a97f870f7adef6cc9a0fd23b4edf514 SHA512 a102535bd3cf72118106ca7268d5a9921738d41f81247940c550961d61cb0d1869095b7891c39e8dc15816f7d38230622846747b4b7a3f226f09306cf86220bd DIST cryptography_vectors-3.3.2.tar.gz 35168168 BLAKE2B 3991a16556ae5be0d153cfe302dd9a860918a80bd0bdef7104f3c170ba63941c4b1ff74750bc12329422a6061161cb6452bea60e191d85c0d79e0852566c6c0b SHA512 18590adb96a6f04b8a41d4346b126b8adfc854cbcec85f8c1c0a23b1b363f215b37da60ea94a481b8fd7752f07fba515b08fc18faf2e29fb858e133129971f7c DIST cryptography_vectors-3.4.7.tar.gz 35168102 BLAKE2B fbefd3ff96548dde012fd290aba1c99d57db376023d486910e486cc9c143461ef1ae9b77824cc03307723d35142f0360bc961b548a4edc02357d3f1a0e7e4e9f SHA512 269b50fa4c5300da6758006d12be42f998630d23053ef9af0eb588fc9e6994b044d8822cff105e338f4d0d746ed0e204a4a9c42f54667e355e1ce86e6754bbe9 diff --git a/dev-python/cryptography/cryptography-3.4.7.ebuild b/dev-python/cryptography/cryptography-3.4.7-r1.ebuild index 098fe4c2459c..b6732a0390cc 100644 --- a/dev-python/cryptography/cryptography-3.4.7.ebuild +++ b/dev-python/cryptography/cryptography-3.4.7-r1.ebuild @@ -1,6 +1,5 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 2021 Liguros Authors # Distributed under the terms of the GNU General Public License v2 - EAPI=7 PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 ) @@ -43,6 +42,10 @@ DEPEND=" " RDEPEND+=${DEPEND} +PATCHES=( + "${FILESDIR}/${P}-py310.patch" +) + src_prepare() { default diff --git a/dev-python/cryptography/files/cryptography-3.4.7-py310.patch b/dev-python/cryptography/files/cryptography-3.4.7-py310.patch new file mode 100644 index 000000000000..d961af82b774 --- /dev/null +++ b/dev-python/cryptography/files/cryptography-3.4.7-py310.patch @@ -0,0 +1,301 @@ +diff --git a/src/cryptography/exceptions.py b/src/cryptography/exceptions.py +index f5860590..3bd98d82 100644 +--- a/src/cryptography/exceptions.py ++++ b/src/cryptography/exceptions.py +@@ -3,10 +3,10 @@ + # for complete details. + + +-from enum import Enum ++from cryptography import utils + + +-class _Reasons(Enum): ++class _Reasons(utils.Enum): + BACKEND_MISSING_INTERFACE = 0 + UNSUPPORTED_HASH = 1 + UNSUPPORTED_CIPHER = 2 +diff --git a/src/cryptography/hazmat/primitives/_serialization.py b/src/cryptography/hazmat/primitives/_serialization.py +index 96a5ed9b..160a6b89 100644 +--- a/src/cryptography/hazmat/primitives/_serialization.py ++++ b/src/cryptography/hazmat/primitives/_serialization.py +@@ -3,13 +3,14 @@ + # for complete details. + + import abc +-from enum import Enum ++ ++from cryptography import utils + + # This exists to break an import cycle. These classes are normally accessible + # from the serialization module. + + +-class Encoding(Enum): ++class Encoding(utils.Enum): + PEM = "PEM" + DER = "DER" + OpenSSH = "OpenSSH" +@@ -18,14 +19,14 @@ class Encoding(Enum): + SMIME = "S/MIME" + + +-class PrivateFormat(Enum): ++class PrivateFormat(utils.Enum): + PKCS8 = "PKCS8" + TraditionalOpenSSL = "TraditionalOpenSSL" + Raw = "Raw" + OpenSSH = "OpenSSH" + + +-class PublicFormat(Enum): ++class PublicFormat(utils.Enum): + SubjectPublicKeyInfo = "X.509 subjectPublicKeyInfo with PKCS#1" + PKCS1 = "Raw PKCS#1" + OpenSSH = "OpenSSH" +@@ -34,7 +35,7 @@ class PublicFormat(Enum): + UncompressedPoint = "X9.62 Uncompressed Point" + + +-class ParameterFormat(Enum): ++class ParameterFormat(utils.Enum): + PKCS3 = "PKCS3" + + +diff --git a/src/cryptography/hazmat/primitives/kdf/kbkdf.py b/src/cryptography/hazmat/primitives/kdf/kbkdf.py +index ac36474f..75fe7d51 100644 +--- a/src/cryptography/hazmat/primitives/kdf/kbkdf.py ++++ b/src/cryptography/hazmat/primitives/kdf/kbkdf.py +@@ -4,7 +4,6 @@ + + + import typing +-from enum import Enum + + from cryptography import utils + from cryptography.exceptions import ( +@@ -19,11 +18,11 @@ from cryptography.hazmat.primitives import constant_time, hashes, hmac + from cryptography.hazmat.primitives.kdf import KeyDerivationFunction + + +-class Mode(Enum): ++class Mode(utils.Enum): + CounterMode = "ctr" + + +-class CounterLocation(Enum): ++class CounterLocation(utils.Enum): + BeforeFixed = "before_fixed" + AfterFixed = "after_fixed" + +diff --git a/src/cryptography/hazmat/primitives/serialization/pkcs7.py b/src/cryptography/hazmat/primitives/serialization/pkcs7.py +index bcd9e330..57aac7e3 100644 +--- a/src/cryptography/hazmat/primitives/serialization/pkcs7.py ++++ b/src/cryptography/hazmat/primitives/serialization/pkcs7.py +@@ -3,8 +3,8 @@ + # for complete details. + + import typing +-from enum import Enum + ++from cryptography import utils + from cryptography import x509 + from cryptography.hazmat.backends import _get_backend + from cryptography.hazmat.primitives import hashes, serialization +@@ -35,7 +35,7 @@ _ALLOWED_PRIVATE_KEY_TYPES = typing.Union[ + ] + + +-class PKCS7Options(Enum): ++class PKCS7Options(utils.Enum): + Text = "Add text/plain MIME type" + Binary = "Don't translate input data into canonical MIME format" + DetachedSignature = "Don't embed data in the PKCS7 structure" +diff --git a/src/cryptography/utils.py b/src/cryptography/utils.py +index ef0fc443..9e571cfd 100644 +--- a/src/cryptography/utils.py ++++ b/src/cryptography/utils.py +@@ -4,6 +4,7 @@ + + + import abc ++import enum + import inspect + import sys + import typing +@@ -162,3 +163,13 @@ int_from_bytes = deprecated( + "int_from_bytes is deprecated, use int.from_bytes instead", + DeprecatedIn34, + ) ++ ++ ++# Python 3.10 changed representation of enums. We use well-defined object ++# representation and string representation from Python 3.9. ++class Enum(enum.Enum): ++ def __repr__(self): ++ return f"<{self.__class__.__name__}.{self._name_}: {self._value_!r}>" ++ ++ def __str__(self): ++ return f"{self.__class__.__name__}.{self._name_}" +diff --git a/src/cryptography/x509/base.py b/src/cryptography/x509/base.py +index 5505fa3b..e3846c33 100644 +--- a/src/cryptography/x509/base.py ++++ b/src/cryptography/x509/base.py +@@ -7,9 +7,9 @@ import abc + import datetime + import os + import typing +-from enum import Enum + + from cryptography.hazmat._types import _PRIVATE_KEY_TYPES, _PUBLIC_KEY_TYPES ++from cryptography import utils + from cryptography.hazmat.backends import _get_backend + from cryptography.hazmat.primitives import hashes, serialization + from cryptography.hazmat.primitives.asymmetric import ( +@@ -66,7 +66,7 @@ def _convert_to_naive_utc_time(time: datetime.datetime) -> datetime.datetime: + return time + + +-class Version(Enum): ++class Version(utils.Enum): + v1 = 0 + v3 = 2 + +diff --git a/src/cryptography/x509/certificate_transparency.py b/src/cryptography/x509/certificate_transparency.py +index d51bee92..d80f051a 100644 +--- a/src/cryptography/x509/certificate_transparency.py ++++ b/src/cryptography/x509/certificate_transparency.py +@@ -5,15 +5,16 @@ + + import abc + import datetime +-from enum import Enum + ++from cryptography import utils + +-class LogEntryType(Enum): ++ ++class LogEntryType(utils.Enum): + X509_CERTIFICATE = 0 + PRE_CERTIFICATE = 1 + + +-class Version(Enum): ++class Version(utils.Enum): + v1 = 0 + + +diff --git a/src/cryptography/x509/extensions.py b/src/cryptography/x509/extensions.py +index 6cae016a..742f1fa2 100644 +--- a/src/cryptography/x509/extensions.py ++++ b/src/cryptography/x509/extensions.py +@@ -8,7 +8,6 @@ import datetime + import hashlib + import ipaddress + import typing +-from enum import Enum + + from cryptography import utils + from cryptography.hazmat._der import ( +@@ -634,7 +633,7 @@ class DistributionPoint(object): + crl_issuer = utils.read_only_property("_crl_issuer") + + +-class ReasonFlags(Enum): ++class ReasonFlags(utils.Enum): + unspecified = "unspecified" + key_compromise = "keyCompromise" + ca_compromise = "cACompromise" +@@ -978,7 +977,7 @@ class TLSFeature(ExtensionType): + return hash(tuple(self._features)) + + +-class TLSFeatureType(Enum): ++class TLSFeatureType(utils.Enum): + # status_request is defined in RFC 6066 and is used for what is commonly + # called OCSP Must-Staple when present in the TLS Feature extension in an + # X.509 certificate. +diff --git a/src/cryptography/x509/name.py b/src/cryptography/x509/name.py +index a579aa21..9069a9f4 100644 +--- a/src/cryptography/x509/name.py ++++ b/src/cryptography/x509/name.py +@@ -3,14 +3,13 @@ + # for complete details. + + import typing +-from enum import Enum + + from cryptography import utils + from cryptography.hazmat.backends import _get_backend + from cryptography.x509.oid import NameOID, ObjectIdentifier + + +-class _ASN1Type(Enum): ++class _ASN1Type(utils.Enum): + UTF8String = 12 + NumericString = 18 + PrintableString = 19 +diff --git a/src/cryptography/x509/ocsp.py b/src/cryptography/x509/ocsp.py +index 1c5de73e..bcf210c1 100644 +--- a/src/cryptography/x509/ocsp.py ++++ b/src/cryptography/x509/ocsp.py +@@ -6,8 +6,8 @@ + import abc + import datetime + import typing +-from enum import Enum + ++from cryptography import utils + from cryptography import x509 + from cryptography.hazmat.primitives import hashes, serialization + from cryptography.x509.base import ( +@@ -27,12 +27,12 @@ _OIDS_TO_HASH = { + } + + +-class OCSPResponderEncoding(Enum): ++class OCSPResponderEncoding(utils.Enum): + HASH = "By Hash" + NAME = "By Name" + + +-class OCSPResponseStatus(Enum): ++class OCSPResponseStatus(utils.Enum): + SUCCESSFUL = 0 + MALFORMED_REQUEST = 1 + INTERNAL_ERROR = 2 +@@ -58,7 +58,7 @@ def _verify_algorithm(algorithm): + ) + + +-class OCSPCertStatus(Enum): ++class OCSPCertStatus(utils.Enum): + GOOD = 0 + REVOKED = 1 + UNKNOWN = 2 +diff --git a/tests/test_cryptography_utils.py b/tests/test_cryptography_utils.py +index 6b795e0c..803997ac 100644 +--- a/tests/test_cryptography_utils.py ++++ b/tests/test_cryptography_utils.py +@@ -2,6 +2,7 @@ + # 2.0, and the BSD License. See the LICENSE file in the root of this repository + # for complete details. + ++import enum + import typing + + import pytest +@@ -51,3 +52,13 @@ class TestCachedProperty(object): + assert len(accesses) == 1 + assert t.t == 14 + assert len(accesses) == 1 ++ ++ ++def test_enum(): ++ class TestEnum(utils.Enum): ++ value = "something" ++ ++ assert issubclass(TestEnum, enum.Enum) ++ assert isinstance(TestEnum.value, enum.Enum) ++ assert repr(TestEnum.value) == "<TestEnum.value: 'something'>" ++ assert str(TestEnum.value) == "TestEnum.value" diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest index c5254d02f1d1..104b03477e7a 100644 --- a/dev-python/lit/Manifest +++ b/dev-python/lit/Manifest @@ -1,4 +1,4 @@ DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26 -DIST llvmorg-12.0.1-rc4.tar.gz 134278617 BLAKE2B d407421c7244bb125151e69e2a341f1af0a0cf8c1fda3b8ae3d4114c3a285d6307620bbf82b22d96d2c7782b37b0975e87be80c24e3ce1fdc71152734be1e8f8 SHA512 1a2c18435a970491eb9fc9381ba66af726e17dcbd5bf6774f9341b1e82fd35f2e5686844743f5317ebd2106b902c39e09aa98102e58a86e290b29102241c949f +DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1 diff --git a/dev-python/lit/lit-12.0.1_rc4.ebuild b/dev-python/lit/lit-12.0.1.ebuild index f538abb22ff5..fc2f9dd5b4f5 100644 --- a/dev-python/lit/lit-12.0.1_rc4.ebuild +++ b/dev-python/lit/lit-12.0.1.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0" -KEYWORDS="" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" IUSE="test" RESTRICT="!test? ( test )" 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 000000000000..7a4cced9e720 --- /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?= <mgorny@gentoo.org> +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 <mgorny@gentoo.org> +--- + 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/pytzdata-2020.1.ebuild b/dev-python/pytzdata/pytzdata-2020.1-r1.ebuild index 95f1365739c7..7dd9b249211b 100644 --- a/dev-python/pytzdata/pytzdata-2020.1.ebuild +++ b/dev-python/pytzdata/pytzdata-2020.1-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DISTUTILS_USE_SETUPTOOLS=pyproject.toml PYTHON_COMPAT=( python3_{6,7,8,9,10} ) @@ -16,6 +16,9 @@ SLOT="0" KEYWORDS="amd64 x86" RDEPEND="dev-python/cleo[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND}" distutils_enable_tests pytest + +PATCHES=( + "${FILESDIR}"/pytzdata-2020.1-system-zoneinfo.patch +) |
