diff --git a/backport-remove_tzinfo_test.patch b/0001-backport-remove_zinfo_test.patch similarity index 48% rename from backport-remove_tzinfo_test.patch rename to 0001-backport-remove_zinfo_test.patch index 226b97a91b088075d0fef343cd118fff41754a5f..5772dcda286bacc9fc39f37f583d1300a3d74f3f 100644 --- a/backport-remove_tzinfo_test.patch +++ b/0001-backport-remove_zinfo_test.patch @@ -1,12 +1,26 @@ +From 89ed5d31634a359b0217f73e99fd54006a99e2e7 Mon Sep 17 00:00:00 2001 +From: Han +Date: Thu, 13 Jul 2023 10:44:04 +0800 +Subject: [PATCH] backport remove_zinfo_test + +--- + pytz/tests/test_tzinfo.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + diff --git a/pytz/tests/test_tzinfo.py b/pytz/tests/test_tzinfo.py -index b2640a8..4f5322b 100644 +index 7d6d788..01fdd48 100644 --- a/pytz/tests/test_tzinfo.py +++ b/pytz/tests/test_tzinfo.py -@@ -155,6 +155,7 @@ class PicklingTest(unittest.TestCase): +@@ -154,7 +154,8 @@ class PicklingTest(unittest.TestCase): + for localized_tz in tz._tzinfos.values(): 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) +-- +2.38.0.windows.1 + diff --git a/0001-modify-timezone-from-Macau-to-Macao.patch b/0002-modify-timezone-from-Macau-to-Macao.patch similarity index 69% rename from 0001-modify-timezone-from-Macau-to-Macao.patch rename to 0002-modify-timezone-from-Macau-to-Macao.patch index f17473e6da1645da95da63295866465189db6981..2da7af261ae0e9a761ad5271c195f816adbcfb10 100644 --- a/0001-modify-timezone-from-Macau-to-Macao.patch +++ b/0002-modify-timezone-from-Macau-to-Macao.patch @@ -1,20 +1,24 @@ -From 3d06fb69e66a519b11e4d4750c622210e6e7f0b5 Mon Sep 17 00:00:00 2001 -Date: Tue, 21 Jan 2020 15:14:50 +0800 -Subject: [PATCH] modify timezone from Macau to Macao +From 6ddb778a3881c162d12cd682da68043163b664e0 Mon Sep 17 00:00:00 2001 +From: Han +Date: Thu, 13 Jul 2023 11:02:16 +0800 +Subject: [PATCH] =?UTF-8?q?patch=E6=8F=8F=E8=BF=B0?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit --- - pytz.egg-info/SOURCES.txt | 3 +-- + pytz.egg-info/SOURCES.txt | 1 - pytz/zoneinfo/iso3166.tab | 2 +- pytz/zoneinfo/tzdata.zi | 4 ++-- pytz/zoneinfo/zone.tab | 2 +- pytz/zoneinfo/zone1970.tab | 2 +- - 5 files changed, 6 insertions(+), 7 deletions(-) + 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pytz.egg-info/SOURCES.txt b/pytz.egg-info/SOURCES.txt -index ecc09e9..a61115b 100644 +index fc1fc92..bec2577 100644 --- a/pytz.egg-info/SOURCES.txt +++ b/pytz.egg-info/SOURCES.txt -@@ -355,7 +355,6 @@ pytz/zoneinfo/Asia/Kuala_Lumpur +@@ -356,7 +356,6 @@ pytz/zoneinfo/Asia/Kuala_Lumpur pytz/zoneinfo/Asia/Kuching pytz/zoneinfo/Asia/Kuwait pytz/zoneinfo/Asia/Macao @@ -22,15 +26,8 @@ index ecc09e9..a61115b 100644 pytz/zoneinfo/Asia/Magadan pytz/zoneinfo/Asia/Makassar pytz/zoneinfo/Asia/Manila -@@ -615,4 +614,4 @@ pytz/zoneinfo/US/Indiana-Starke - pytz/zoneinfo/US/Michigan - pytz/zoneinfo/US/Mountain - pytz/zoneinfo/US/Pacific --pytz/zoneinfo/US/Samoa -\ No newline at end of file -+pytz/zoneinfo/US/Samoa diff --git a/pytz/zoneinfo/iso3166.tab b/pytz/zoneinfo/iso3166.tab -index a4ff61a..1c53cc0 100644 +index be3348d..96fb340 100644 --- a/pytz/zoneinfo/iso3166.tab +++ b/pytz/zoneinfo/iso3166.tab @@ -170,7 +170,7 @@ MK North Macedonia @@ -43,10 +40,10 @@ index a4ff61a..1c53cc0 100644 MQ Martinique MR Mauritania diff --git a/pytz/zoneinfo/tzdata.zi b/pytz/zoneinfo/tzdata.zi -index c720561..cf0c701 100644 +index 23d99be..5bc475e 100644 --- a/pytz/zoneinfo/tzdata.zi +++ b/pytz/zoneinfo/tzdata.zi -@@ -584,7 +584,7 @@ R _ 1973 o - D 30 3:30 1 D +@@ -541,7 +541,7 @@ R _ 1973 o - D 30 3:30 1 D R _ 1975 1976 - Ap Su>=16 3:30 1 D R _ 1979 o - May 13 3:30 1 D R _ 1979 o - O Su>=16 3:30 0 S @@ -55,7 +52,7 @@ index c720561..cf0c701 100644 8 - CST 1941 D 21 23 9 _ +09/+10 1945 S 30 24 8 _ C%sT -@@ -4324,7 +4324,7 @@ L Asia/Dhaka Asia/Dacca +@@ -4272,7 +4272,7 @@ L Asia/Shanghai Asia/Chungking L Asia/Dhaka Asia/Dacca L Europe/Istanbul Asia/Istanbul L Asia/Kathmandu Asia/Katmandu @@ -65,11 +62,11 @@ index c720561..cf0c701 100644 L Asia/Ho_Chi_Minh Asia/Saigon L Asia/Thimphu Asia/Thimbu diff --git a/pytz/zoneinfo/zone.tab b/pytz/zoneinfo/zone.tab -index 408fcb2..ee58572 100644 +index dbcb617..98e3d78 100644 --- a/pytz/zoneinfo/zone.tab +++ b/pytz/zoneinfo/zone.tab -@@ -269,7 +269,7 @@ MM +1647+09610 Asia/Yangon - MN +4755+10653 Asia/Ulaanbaatar Mongolia (most areas) +@@ -266,7 +266,7 @@ MM +1647+09610 Asia/Yangon + MN +4755+10653 Asia/Ulaanbaatar most of Mongolia MN +4801+09139 Asia/Hovd Bayan-Olgiy, Govi-Altai, Hovd, Uvs, Zavkhan MN +4804+11430 Asia/Choibalsan Dornod, Sukhbaatar -MO +221150+1133230 Asia/Macau @@ -78,11 +75,11 @@ index 408fcb2..ee58572 100644 MQ +1436-06105 America/Martinique MR +1806-01557 Africa/Nouakchott diff --git a/pytz/zoneinfo/zone1970.tab b/pytz/zoneinfo/zone1970.tab -index 822ffa1..03ec66b 100644 +index 1f1cecb..09a4589 100644 --- a/pytz/zoneinfo/zone1970.tab +++ b/pytz/zoneinfo/zone1970.tab -@@ -232,7 +232,7 @@ MM +1647+09610 Asia/Yangon - MN +4755+10653 Asia/Ulaanbaatar Mongolia (most areas) +@@ -210,7 +210,7 @@ MM,CC +1647+09610 Asia/Yangon + MN +4755+10653 Asia/Ulaanbaatar most of Mongolia MN +4801+09139 Asia/Hovd Bayan-Ölgii, Govi-Altai, Hovd, Uvs, Zavkhan MN +4804+11430 Asia/Choibalsan Dornod, Sükhbaatar -MO +221150+1133230 Asia/Macau @@ -91,5 +88,5 @@ index 822ffa1..03ec66b 100644 MT +3554+01431 Europe/Malta MU -2010+05730 Indian/Mauritius -- -1.8.3.1 +2.38.0.windows.1 diff --git a/backport-pytz-zoneinfo.patch b/0003-backport-pytz-zoneinfo.patch similarity index 97% rename from backport-pytz-zoneinfo.patch rename to 0003-backport-pytz-zoneinfo.patch index 4daa6619ec94f5425cb394b60f7d804b1c690d86..ca52194f8ea0407af9ea6704bf1652d2d2d78e57 100644 --- a/backport-pytz-zoneinfo.patch +++ b/0003-backport-pytz-zoneinfo.patch @@ -1,18 +1,28 @@ +From ca4c5a25c184765f4d7bb2f093d88a4f215e4111 Mon Sep 17 00:00:00 2001 +From: Han +Date: Thu, 13 Jul 2023 11:18:25 +0800 +Subject: [PATCH] backport-pytz-zoneinfo + +--- + pytz/__init__.py | 1081 ++-------------------------------------------- + 1 file changed, 33 insertions(+), 1048 deletions(-) + diff --git a/pytz/__init__.py b/pytz/__init__.py -index e2f49fa..65c1d11 100644 +index 98b6655..6865d99 100644 --- a/pytz/__init__.py +++ b/pytz/__init__.py -@@ -74,6 +74,9 @@ else: # Python 2.x +@@ -73,6 +73,10 @@ else: # Python 2.x + UnicodeEncodeError: ... """ return s.encode('ASCII') - ++ +_tzinfo_dir = os.getenv('PYTZ_TZDATADIR') or '/usr/share/zoneinfo' +if _tzinfo_dir.endswith(os.sep): + _tzinfo_dir = _tzinfo_dir[:-1] + def open_resource(name): - """Open a resource from the zoneinfo subdir for reading. -@@ -88,23 +91,8 @@ def open_resource(name): +@@ -88,23 +92,8 @@ def open_resource(name): for part in name_parts: if part == os.path.pardir or os.sep in part: raise ValueError('Bad path segment: %r' % part) @@ -38,9 +48,7 @@ index e2f49fa..65c1d11 100644 return open(filename, 'rb') ---- 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,1042 +502,37 @@ +@@ -514,1041 +503,37 @@ def _test(): if __name__ == '__main__': _test() @@ -852,7 +860,6 @@ index e2f49fa..65c1d11 100644 - 'America/Whitehorse', - 'America/Winnipeg', - 'America/Yakutat', -- 'America/Yellowknife', - 'Antarctica/Casey', - 'Antarctica/Davis', - 'Antarctica/DumontDUrville', @@ -1110,3 +1117,6 @@ index e2f49fa..65c1d11 100644 common_timezones = LazyList( tz for tz in common_timezones if tz in all_timezones) +-- +2.38.0.windows.1 + diff --git a/pytz-2022.7.1.tar.gz b/pytz-2022.7.1.tar.gz deleted file mode 100644 index 5557104436a5fa6b831d8dbd00e9311bd7c41a8b..0000000000000000000000000000000000000000 Binary files a/pytz-2022.7.1.tar.gz and /dev/null differ diff --git a/pytz-2023.3.tar.gz b/pytz-2023.3.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..cbe9481b12be0d709cd8ecc72029b2e99fa9c689 Binary files /dev/null and b/pytz-2023.3.tar.gz differ diff --git a/pytz.spec b/pytz.spec index 50689bc0e5b4c64bea91368c8d39b4df1d968e6b..140564a3633fa6dab1cc7f83fe3a95c948b6f23f 100644 --- a/pytz.spec +++ b/pytz.spec @@ -1,16 +1,16 @@ %bcond_without tests Name: pytz -Version: 2022.7.1 +Version: 2023.3 Release: 1 Summary: World Timezone Definitions for Python License: MIT -URL: http://pytz.sourceforge.net/ -Source0: https://files.pythonhosted.org/packages/03/3e/dc5c793b62c60d0ca0b7e58f1fdd84d5aaa9f8df23e7589b39cc9ce20a03/pytz-2022.7.1.tar.gz +URL: https://pypi.org/project/pytz/ +Source0: %{url}/archive/%{version}/pytz-%{version}.tar.gz -Patch0: backport-pytz-zoneinfo.patch -Patch1: backport-remove_tzinfo_test.patch -Patch2: 0001-modify-timezone-from-Macau-to-Macao.patch +Patch0: 0001-backport-remove_zinfo_test.patch +Patch1: 0002-modify-timezone-from-Macau-to-Macao.patch +Patch2: 0003-backport-pytz-zoneinfo.patch BuildArch: noarch @@ -43,7 +43,7 @@ python3 for pytz %py3_install rm -r %{buildroot}%{python3_sitelib}/pytz/zoneinfo pathfix.py -pn -i %{__python3} %{buildroot}%{python3_sitelib} -sed -i '/pytz\/zoneinfo\/Asia\/Macau/d' %{buildroot}%{python3_sitelib}/*.egg-info/SOURCES.txt + %check %if %{with tests} @@ -57,6 +57,12 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v %{python3_sitelib}/* %changelog +* Thu Jul 13 2023 xlhans - 2023.3-1 +- Type:requirement +- ID:NA +- SUG:NA +- DESC:update pytz to 2023.3 + * Thu Mar 09 2023 zhouyihang - 2022.7.1-1 - Type:requirement - ID:NA diff --git a/pytz.yaml b/pytz.yaml deleted file mode 100644 index 7b8b84b4a53930768da0eec942b6a6c8cf789f01..0000000000000000000000000000000000000000 --- a/pytz.yaml +++ /dev/null @@ -1,5 +0,0 @@ -git_url: https://git.launchpad.net/pytz -version_control: git -src_repo: https://git.launchpad.net/pytz -tag_prefix: "^release_" -seperator: "."