From df6001e24285012680fa59bef559e7e942b6a22a Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 6 Dec 2016 09:59:21 -0700 Subject: [PATCH] Update to 2016.10 --- .gitignore | 1 + pytz-zoneinfo.patch | 15 ++++++++++----- pytz.spec | 5 ++++- sources | 2 +- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 24a367d..3b409d4 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ pytz-2010h.tar.gz /pytz-2016.4.tar.gz /pytz-2016.6.1.tar.gz /pytz-2016.7.tar.gz +/pytz-2016.10.tar.gz diff --git a/pytz-zoneinfo.patch b/pytz-zoneinfo.patch index 28deac5..4fcfd76 100644 --- a/pytz-zoneinfo.patch +++ b/pytz-zoneinfo.patch @@ -1,6 +1,6 @@ -diff -up pytz-2016.7/pytz/__init__.py.zoneinfo pytz-2016.7/pytz/__init__.py ---- pytz-2016.7/pytz/__init__.py.zoneinfo 2016-10-03 02:20:24.000000000 -0600 -+++ pytz-2016.7/pytz/__init__.py 2016-11-08 09:26:25.798196085 -0700 +diff -up pytz-2016.10/pytz/__init__.py.zoneinfo pytz-2016.10/pytz/__init__.py +--- pytz-2016.10/pytz/__init__.py.zoneinfo 2016-12-06 02:55:39.000000000 -0700 ++++ pytz-2016.10/pytz/__init__.py 2016-12-06 09:58:49.983107114 -0700 @@ -70,6 +70,10 @@ else: # Python 2.x """ return s.encode('ASCII') @@ -33,7 +33,7 @@ diff -up pytz-2016.7/pytz/__init__.py.zoneinfo pytz-2016.7/pytz/__init__.py return open(filename, 'rb') -@@ -490,1038 +483,35 @@ def _test(): +@@ -490,1044 +483,34 @@ def _test(): if __name__ == '__main__': _test() @@ -278,6 +278,7 @@ diff -up pytz-2016.7/pytz/__init__.py.zoneinfo pytz-2016.7/pytz/__init__.py - 'Asia/Aqtobe', - 'Asia/Ashgabat', - 'Asia/Ashkhabad', +- 'Asia/Atyrau', - 'Asia/Baghdad', - 'Asia/Bahrain', - 'Asia/Baku', @@ -298,6 +299,7 @@ diff -up pytz-2016.7/pytz/__init__.py.zoneinfo pytz-2016.7/pytz/__init__.py - 'Asia/Dili', - 'Asia/Dubai', - 'Asia/Dushanbe', +- 'Asia/Famagusta', - 'Asia/Gaza', - 'Asia/Harbin', - 'Asia/Hebron', @@ -503,6 +505,7 @@ diff -up pytz-2016.7/pytz/__init__.py.zoneinfo pytz-2016.7/pytz/__init__.py - 'Europe/Samara', - 'Europe/San_Marino', - 'Europe/Sarajevo', +- 'Europe/Saratov', - 'Europe/Simferopol', - 'Europe/Skopje', - 'Europe/Sofia', @@ -860,6 +863,7 @@ diff -up pytz-2016.7/pytz/__init__.py.zoneinfo pytz-2016.7/pytz/__init__.py - 'Asia/Aqtau', - 'Asia/Aqtobe', - 'Asia/Ashgabat', +- 'Asia/Atyrau', - 'Asia/Baghdad', - 'Asia/Bahrain', - 'Asia/Baku', @@ -876,6 +880,7 @@ diff -up pytz-2016.7/pytz/__init__.py.zoneinfo pytz-2016.7/pytz/__init__.py - 'Asia/Dili', - 'Asia/Dubai', - 'Asia/Dushanbe', +- 'Asia/Famagusta', - 'Asia/Gaza', - 'Asia/Hebron', - 'Asia/Ho_Chi_Minh', @@ -1003,6 +1008,7 @@ diff -up pytz-2016.7/pytz/__init__.py.zoneinfo pytz-2016.7/pytz/__init__.py - 'Europe/Samara', - 'Europe/San_Marino', - 'Europe/Sarajevo', +- 'Europe/Saratov', - 'Europe/Simferopol', - 'Europe/Skopje', - 'Europe/Sofia', @@ -1079,7 +1085,6 @@ diff -up pytz-2016.7/pytz/__init__.py.zoneinfo pytz-2016.7/pytz/__init__.py - 'US/Mountain', - 'US/Pacific', - 'UTC'] -+ +common_timezones = [l.split()[2] + for l in open(os.path.join(_tzinfo_dir, 'zone.tab')) + if l != '' and l[0] != '#'] diff --git a/pytz.spec b/pytz.spec index 7c710a6..0fdf975 100644 --- a/pytz.spec +++ b/pytz.spec @@ -5,7 +5,7 @@ %endif Name: pytz -Version: 2016.7 +Version: 2016.10 Release: 1%{?dist} Summary: World Timezone Definitions for Python @@ -96,6 +96,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-%{python3_version} -v %changelog +* Tue Dec 6 2016 Orion Poplawski - 2016.10-1 +- Update to 2016.10 + * Tue Nov 8 2016 Orion Poplawski - 2016.7-1 - Update to 2016.7 diff --git a/sources b/sources index 1174e4b..ced041b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8660ba7c3c0abd23e6e4efa493b02966 pytz-2016.7.tar.gz +cc9f16ba436efabdcef3c4d32ae4919c pytz-2016.10.tar.gz