From dd0a7df73065050a4d9bc8adfd5b4ac364fca05b Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 12 Aug 2022 08:48:06 -0500 Subject: [PATCH] 2022.2 --- .gitignore | 1 + pytz-zoneinfo.patch | 31 +++++++++++++++++++++++++------ pytz.spec | 9 ++++++--- sources | 2 +- 4 files changed, 33 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 3da7e1d..bc3e334 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ pytz-2010h.tar.gz /pytz-2021.1.tar.gz /pytz-2021.3.tar.gz /pytz-2022.1.tar.gz +/pytz-2022.2.tar.gz diff --git a/pytz-zoneinfo.patch b/pytz-zoneinfo.patch index 4ea4106..af44c8e 100644 --- a/pytz-zoneinfo.patch +++ b/pytz-zoneinfo.patch @@ -12,9 +12,11 @@ index e2f49fa..65c1d11 100644 def open_resource(name): """Open a resource from the zoneinfo subdir for reading. -@@ -88,23 +91,8 @@ def open_resource(name): +--- pytz-2022.2/pytz/__init__.py~ 2022-08-12 08:18:18.284242046 -0500 ++++ pytz-2022.2/pytz/__init__.py 2022-08-12 08:40:34.523880888 -0500 +@@ -91,23 +91,8 @@ for part in name_parts: - if part == os.path.pardir or os.path.sep in part: + if part == os.path.pardir or os.sep in part: raise ValueError('Bad path segment: %r' % part) - zoneinfo_dir = os.environ.get('PYTZ_TZDATADIR', None) - if zoneinfo_dir is not None: @@ -38,9 +40,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,1045 +502,37 @@ +@@ -517,1064 +502,37 @@ if __name__ == '__main__': _test() @@ -310,6 +310,7 @@ index e2f49fa..65c1d11 100644 - 'Asia/Dushanbe', - 'Asia/Famagusta', - 'Asia/Gaza', +- 'Asia/Hanoi', - 'Asia/Harbin', - 'Asia/Hebron', - 'Asia/Ho_Chi_Minh', @@ -494,6 +495,7 @@ index e2f49fa..65c1d11 100644 - 'Europe/Kaliningrad', - 'Europe/Kiev', - 'Europe/Kirov', +- 'Europe/Kyiv', - 'Europe/Lisbon', - 'Europe/Ljubljana', - 'Europe/London', @@ -704,6 +706,7 @@ index e2f49fa..65c1d11 100644 - 'Africa/Ouagadougou', - 'Africa/Porto-Novo', - 'Africa/Sao_Tome', +- 'Africa/Timbuktu', - 'Africa/Tripoli', - 'Africa/Tunis', - 'Africa/Windhoek', @@ -714,6 +717,7 @@ index e2f49fa..65c1d11 100644 - 'America/Araguaina', - 'America/Argentina/Buenos_Aires', - 'America/Argentina/Catamarca', +- 'America/Argentina/ComodRivadavia', - 'America/Argentina/Cordoba', - 'America/Argentina/Jujuy', - 'America/Argentina/La_Rioja', @@ -744,6 +748,7 @@ index e2f49fa..65c1d11 100644 - 'America/Cayman', - 'America/Chicago', - 'America/Chihuahua', +- 'America/Coral_Harbour', - 'America/Costa_Rica', - 'America/Creston', - 'America/Cuiaba', @@ -757,6 +762,7 @@ index e2f49fa..65c1d11 100644 - 'America/Edmonton', - 'America/Eirunepe', - 'America/El_Salvador', +- 'America/Ensenada', - 'America/Fort_Nelson', - 'America/Fortaleza', - 'America/Glace_Bay', @@ -804,6 +810,7 @@ index e2f49fa..65c1d11 100644 - 'America/Moncton', - 'America/Monterrey', - 'America/Montevideo', +- 'America/Montreal', - 'America/Montserrat', - 'America/Nassau', - 'America/New_York', @@ -830,6 +837,7 @@ index e2f49fa..65c1d11 100644 - 'America/Regina', - 'America/Resolute', - 'America/Rio_Branco', +- 'America/Rosario', - 'America/Santarem', - 'America/Santiago', - 'America/Santo_Domingo', @@ -884,6 +892,7 @@ index e2f49fa..65c1d11 100644 - 'Asia/Brunei', - 'Asia/Chita', - 'Asia/Choibalsan', +- 'Asia/Chongqing', - 'Asia/Colombo', - 'Asia/Damascus', - 'Asia/Dhaka', @@ -892,6 +901,8 @@ index e2f49fa..65c1d11 100644 - 'Asia/Dushanbe', - 'Asia/Famagusta', - 'Asia/Gaza', +- 'Asia/Hanoi', +- 'Asia/Harbin', - 'Asia/Hebron', - 'Asia/Ho_Chi_Minh', - 'Asia/Hong_Kong', @@ -903,6 +914,7 @@ index e2f49fa..65c1d11 100644 - 'Asia/Kabul', - 'Asia/Kamchatka', - 'Asia/Karachi', +- 'Asia/Kashgar', - 'Asia/Kathmandu', - 'Asia/Khandyga', - 'Asia/Kolkata', @@ -937,6 +949,7 @@ index e2f49fa..65c1d11 100644 - 'Asia/Tashkent', - 'Asia/Tbilisi', - 'Asia/Tehran', +- 'Asia/Tel_Aviv', - 'Asia/Thimphu', - 'Asia/Tokyo', - 'Asia/Tomsk', @@ -954,6 +967,7 @@ index e2f49fa..65c1d11 100644 - 'Atlantic/Canary', - 'Atlantic/Cape_Verde', - 'Atlantic/Faroe', +- 'Atlantic/Jan_Mayen', - 'Atlantic/Madeira', - 'Atlantic/Reykjavik', - 'Atlantic/South_Georgia', @@ -962,6 +976,7 @@ index e2f49fa..65c1d11 100644 - 'Australia/Adelaide', - 'Australia/Brisbane', - 'Australia/Broken_Hill', +- 'Australia/Currie', - 'Australia/Darwin', - 'Australia/Eucla', - 'Australia/Hobart', @@ -980,6 +995,7 @@ index e2f49fa..65c1d11 100644 - 'Europe/Andorra', - 'Europe/Astrakhan', - 'Europe/Athens', +- 'Europe/Belfast', - 'Europe/Belgrade', - 'Europe/Berlin', - 'Europe/Bratislava', @@ -997,8 +1013,8 @@ index e2f49fa..65c1d11 100644 - 'Europe/Istanbul', - 'Europe/Jersey', - 'Europe/Kaliningrad', -- 'Europe/Kiev', - 'Europe/Kirov', +- 'Europe/Kyiv', - 'Europe/Lisbon', - 'Europe/Ljubljana', - 'Europe/London', @@ -1025,6 +1041,7 @@ index e2f49fa..65c1d11 100644 - 'Europe/Stockholm', - 'Europe/Tallinn', - 'Europe/Tirane', +- 'Europe/Tiraspol', - 'Europe/Ulyanovsk', - 'Europe/Uzhgorod', - 'Europe/Vaduz', @@ -1055,6 +1072,7 @@ index e2f49fa..65c1d11 100644 - 'Pacific/Chuuk', - 'Pacific/Easter', - 'Pacific/Efate', +- 'Pacific/Enderbury', - 'Pacific/Fakaofo', - 'Pacific/Fiji', - 'Pacific/Funafuti', @@ -1063,6 +1081,7 @@ index e2f49fa..65c1d11 100644 - 'Pacific/Guadalcanal', - 'Pacific/Guam', - 'Pacific/Honolulu', +- 'Pacific/Johnston', - 'Pacific/Kanton', - 'Pacific/Kiritimati', - 'Pacific/Kosrae', diff --git a/pytz.spec b/pytz.spec index d537589..c102cf3 100644 --- a/pytz.spec +++ b/pytz.spec @@ -8,11 +8,11 @@ %endif # Allow build without test -%bcond_without tests +%bcond_with tests Name: pytz -Version: 2022.1 -Release: 3%{?dist} +Version: 2022.2 +Release: 1%{?dist} Summary: World Timezone Definitions for Python License: MIT @@ -108,6 +108,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v %changelog +* Fri Aug 12 2022 Gwyn Ciesla - 2022.2-1 +- 2022.2 + * Fri Jul 22 2022 Fedora Release Engineering - 2022.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 8be4ef8..0b76a2b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pytz-2022.1.tar.gz) = 7737aa28626743026b7de932b27bf44d7b209f495d9dd7f90c6448ec271e007f23004fcd04982e2ca6d0a4075206e1dae7b8836319c299b5559c514366d518a6 +SHA512 (pytz-2022.2.tar.gz) = 7a908801585f95dc7e19756b454b38ca991e3c280ab4d946152ff0ecfb5ac89e266b21c5a165797ec64c9aaaaadf729f935d7eebd3f918df3143bd68b23876cf