diff options
| author | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2024-03-01 23:18:17 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2024-03-01 23:18:17 +0000 |
| commit | e821042473257d62ede7eafda1f4ff54bbf648a2 (patch) | |
| tree | 627ab36b071804313959f7a1145a542891781142 /dev-python/python-dateutil/files | |
| parent | 8efc4509aea0f448e657d1bced6f33942c99b025 (diff) | |
| download | baldeagleos-repo-e821042473257d62ede7eafda1f4ff54bbf648a2.tar.gz baldeagleos-repo-e821042473257d62ede7eafda1f4ff54bbf648a2.tar.xz baldeagleos-repo-e821042473257d62ede7eafda1f4ff54bbf648a2.zip | |
Adding metadata
Diffstat (limited to 'dev-python/python-dateutil/files')
| -rw-r--r-- | dev-python/python-dateutil/files/python-dateutil-2.9.0-no-pytest-cov.patch | 18 | ||||
| -rw-r--r-- | dev-python/python-dateutil/files/python-dateutil-2.9.0-system-tzdata.patch | 91 |
2 files changed, 109 insertions, 0 deletions
diff --git a/dev-python/python-dateutil/files/python-dateutil-2.9.0-no-pytest-cov.patch b/dev-python/python-dateutil/files/python-dateutil-2.9.0-no-pytest-cov.patch new file mode 100644 index 000000000000..d483451a0adf --- /dev/null +++ b/dev-python/python-dateutil/files/python-dateutil-2.9.0-no-pytest-cov.patch @@ -0,0 +1,18 @@ +diff --git a/tests/conftest.py b/tests/conftest.py +index 78ed70a..4bb4c0a 100644 +--- a/tests/conftest.py ++++ b/tests/conftest.py +@@ -14,10 +14,11 @@ def pytest_collection_modifyitems(items): + + marker = marker_getter('xfail') + ++ # requires pytest-cov + # Need to query the args because conditional xfail tests still have + # the xfail mark even if they are not expected to fail +- if marker and (not marker.args or marker.args[0]): +- item.add_marker(pytest.mark.no_cover) ++ #if marker and (not marker.args or marker.args[0]): ++ # item.add_marker(pytest.mark.no_cover) + + + def set_tzpath(): diff --git a/dev-python/python-dateutil/files/python-dateutil-2.9.0-system-tzdata.patch b/dev-python/python-dateutil/files/python-dateutil-2.9.0-system-tzdata.patch new file mode 100644 index 000000000000..08a983d9f6a2 --- /dev/null +++ b/dev-python/python-dateutil/files/python-dateutil-2.9.0-system-tzdata.patch @@ -0,0 +1,91 @@ +diff --git a/src/dateutil/zoneinfo/__init__.py b/src/dateutil/zoneinfo/__init__.py +index 34f11ad..e3f0f94 100644 +--- a/src/dateutil/zoneinfo/__init__.py ++++ b/src/dateutil/zoneinfo/__init__.py +@@ -1,6 +1,7 @@ + # -*- coding: utf-8 -*- + import warnings + import json ++import os + + from tarfile import TarFile + from pkgutil import get_data +@@ -10,7 +11,7 @@ from dateutil.tz import tzfile as _tzfile + + __all__ = ["get_zonefile_instance", "gettz", "gettz_db_metadata"] + +-ZONEFILENAME = "dateutil-zoneinfo.tar.gz" ++ZONEDIRECTORY = "/usr/share/zoneinfo" + METADATA_FN = 'METADATA' + + +@@ -19,12 +20,14 @@ class tzfile(_tzfile): + return (gettz, (self._filename,)) + + +-def getzoneinfofile_stream(): +- try: +- return BytesIO(get_data(__name__, ZONEFILENAME)) +- except IOError as e: # TODO switch to FileNotFoundError? +- warnings.warn("I/O error({0}): {1}".format(e.errno, e.strerror)) +- return None ++def iter_zones(topdir): ++ for dirpath, dirnames, filenames in os.walk(topdir): ++ for f in filenames: ++ if f.endswith(('.list', '.tab', '.zi', 'leapseconds')): ++ continue ++ fpath = os.path.join(dirpath, f) ++ relpath = os.path.relpath(fpath, topdir) ++ yield (relpath, tzfile(fpath, filename=relpath)) + + + class ZoneInfoFile(object): +@@ -48,7 +51,7 @@ class ZoneInfoFile(object): + # no metadata in tar file + self.metadata = None + else: +- self.zones = {} ++ self.zones = dict(iter_zones(ZONEDIRECTORY)) + self.metadata = None + + def get(self, name, default=None): +@@ -99,7 +102,7 @@ def get_zonefile_instance(new_instance=False): + zif = getattr(get_zonefile_instance, '_cached_instance', None) + + if zif is None: +- zif = ZoneInfoFile(getzoneinfofile_stream()) ++ zif = ZoneInfoFile() + + get_zonefile_instance._cached_instance = zif + +@@ -140,7 +143,7 @@ def gettz(name): + DeprecationWarning) + + if len(_CLASS_ZONE_INSTANCE) == 0: +- _CLASS_ZONE_INSTANCE.append(ZoneInfoFile(getzoneinfofile_stream())) ++ _CLASS_ZONE_INSTANCE.append(ZoneInfoFile()) + return _CLASS_ZONE_INSTANCE[0].zones.get(name) + + +@@ -163,5 +166,5 @@ def gettz_db_metadata(): + DeprecationWarning) + + if len(_CLASS_ZONE_INSTANCE) == 0: +- _CLASS_ZONE_INSTANCE.append(ZoneInfoFile(getzoneinfofile_stream())) ++ _CLASS_ZONE_INSTANCE.append(ZoneInfoFile()) + return _CLASS_ZONE_INSTANCE[0].metadata +diff --git a/tests/test_imports.py b/tests/test_imports.py +index 7d0749e..4256f45 100644 +--- a/tests/test_imports.py ++++ b/tests/test_imports.py +@@ -232,9 +232,8 @@ def test_import_zone_info_from(): + def test_import_zone_info_star(): + from dateutil.zoneinfo import gettz + from dateutil.zoneinfo import gettz_db_metadata +- from dateutil.zoneinfo import rebuild + +- zi_all = (gettz, gettz_db_metadata, rebuild) ++ zi_all = (gettz, gettz_db_metadata) + + for var in zi_all: + assert var is not None |
