diff --git a/pytz-zoneinfo.patch b/backport-pytz-zoneinfo.patch similarity index 98% rename from pytz-zoneinfo.patch rename to backport-pytz-zoneinfo.patch index 173dc5cbaea63013f08864f8d953445160991aea..4ea41067187f331bcf88964ff70cea9e6f901689 100644 --- a/pytz-zoneinfo.patch +++ b/backport-pytz-zoneinfo.patch @@ -1,5 +1,5 @@ diff --git a/pytz/__init__.py b/pytz/__init__.py -index d217c96..2b1ac03 100644 +index e2f49fa..65c1d11 100644 --- a/pytz/__init__.py +++ b/pytz/__init__.py @@ -74,6 +74,9 @@ else: # Python 2.x @@ -38,9 +38,9 @@ index d217c96..2b1ac03 100644 return open(filename, 'rb') ---- pytz-2019.2/pytz/__init__.py~ 2019-07-31 12:32:00.000000000 -0500 -+++ pytz-2019.2/pytz/__init__.py 2019-07-31 12:44:07.995969364 -0500 -@@ -502,1044 +502,37 @@ +--- a/pytz/__init__.py~ 2021-10-04 09:16:08.981477792 -0500 ++++ b/pytz/__init__.py 2021-10-04 11:29:19.283758542 -0500 +@@ -502,1045 +502,37 @@ if __name__ == '__main__': _test() @@ -588,6 +588,7 @@ index d217c96..2b1ac03 100644 - 'Pacific/Guam', - 'Pacific/Honolulu', - 'Pacific/Johnston', +- 'Pacific/Kanton', - 'Pacific/Kiritimati', - 'Pacific/Kosrae', - 'Pacific/Kwajalein', @@ -638,7 +639,6 @@ index d217c96..2b1ac03 100644 - 'W-SU', - 'WET', - 'Zulu'] -+ +all_timezones = [] +for root, dirs, files in os.walk(_tzinfo_dir): + for exclude in 'posix', 'right': @@ -1055,7 +1055,6 @@ index d217c96..2b1ac03 100644 - 'Pacific/Chuuk', - 'Pacific/Easter', - 'Pacific/Efate', -- 'Pacific/Enderbury', - 'Pacific/Fakaofo', - 'Pacific/Fiji', - 'Pacific/Funafuti', @@ -1064,6 +1063,7 @@ index d217c96..2b1ac03 100644 - 'Pacific/Guadalcanal', - 'Pacific/Guam', - 'Pacific/Honolulu', +- 'Pacific/Kanton', - 'Pacific/Kiritimati', - 'Pacific/Kosrae', - 'Pacific/Kwajalein', @@ -1095,9 +1095,10 @@ index d217c96..2b1ac03 100644 - 'US/Pacific', - 'UTC'] + -+common_timezones = [l.split()[2] -+ for l in open(os.path.join(_tzinfo_dir, 'zone.tab')) -+ if l != '' and l[0] != '#'] ++with open(os.path.join(_tzinfo_dir, 'zone.tab')) as zonetab: ++ common_timezones = [l.split()[2] ++ for l in zonetab ++ if l != '' and l[0] != '#'] +common_timezones.extend( + ['GMT', + 'US/Alaska', diff --git a/backport-remove_tzinfo_test.patch b/backport-remove_tzinfo_test.patch new file mode 100644 index 0000000000000000000000000000000000000000..226b97a91b088075d0fef343cd118fff41754a5f --- /dev/null +++ b/backport-remove_tzinfo_test.patch @@ -0,0 +1,12 @@ +diff --git a/pytz/tests/test_tzinfo.py b/pytz/tests/test_tzinfo.py +index b2640a8..4f5322b 100644 +--- a/pytz/tests/test_tzinfo.py ++++ b/pytz/tests/test_tzinfo.py +@@ -155,6 +155,7 @@ class PicklingTest(unittest.TestCase): + self._roundtrip_tzinfo(localized_tz) + self._roundtrip_datetime(dt.replace(tzinfo=localized_tz)) + ++ @unittest.skip('Fails with system-wide timezone database') + def testRoundtrip(self): + for zone in pytz.all_timezones: + tz = pytz.timezone(zone) diff --git a/pytz-2021.1.tar.gz b/pytz-2021.1.tar.gz deleted file mode 100644 index 359e5d599ac3a76715f8a059782baf946ffcb50c..0000000000000000000000000000000000000000 Binary files a/pytz-2021.1.tar.gz and /dev/null differ diff --git a/pytz-2021.3.tar.gz b/pytz-2021.3.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..420026e5af47d27af6ea635c7fb2abf6c3e71578 Binary files /dev/null and b/pytz-2021.3.tar.gz differ diff --git a/pytz.spec b/pytz.spec index ab04349c2a551404bc7b884a68ecb4922fc1abf6..059b100e260beb518ca147086166a7d122386cf4 100644 --- a/pytz.spec +++ b/pytz.spec @@ -1,13 +1,15 @@ +%bcond_with tests + Name: pytz -Version: 2021.1 +Version: 2021.3 Release: 1 Summary: World Timezone Definitions for Python License: MIT URL: http://pytz.sourceforge.net/ -Source0: https://files.pythonhosted.org/packages/b0/61/eddc6eb2c682ea6fd97a7e1018a6294be80dba08fa28e7a3570148b4612d/pytz-2021.1.tar.gz +Source0: https://files.pythonhosted.org/packages/e3/8e/1cde9d002f48a940b9d9d38820aaf444b229450c0854bdf15305ce4a3d1a/pytz-2021.3.tar.gz -Patch0: pytz-zoneinfo.patch -Patch1: remove_tzinfo_test.patch +Patch0: backport-pytz-zoneinfo.patch +Patch1: backport-remove_tzinfo_test.patch Patch2: 0001-modify-timezone-from-Macau-to-Macao.patch BuildArch: noarch @@ -21,7 +23,7 @@ Python Library Reference (datetime.tzinfo). %package -n python3-pytz Summary: python3 for pytz -BuildRequires: python3-devel python3-pytest +BuildRequires: python3-devel tzdata python3-pytest Requires: tzdata %{?python_provide:%python_provide python3-%{name}} @@ -50,6 +52,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v %{python3_sitelib}/* %changelog +* Wed Dec 08 2021 yanglu - 2021.3-1 +- Update version to 2021.3 + * Mon Aug 09 2021 OpenStack_SIG - 2021.1-1 - Update version to 2021.1