From 540cd994f08bc55079313b3a01a2140095ad1ce1ee82dfc47e35b3c3c27a7060 Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Mon, 3 Apr 2017 09:01:31 +0000 Subject: [PATCH] Accepting request 484808 from home:AndreasStieger:branches:devel:languages:python 2017.2 OBS-URL: https://build.opensuse.org/request/show/484808 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pytz?expand=0&rev=59 --- python-pytz.changes | 7 +++ python-pytz.spec | 12 ++-- pytz-2016.10-fix-tests-with-2017a.patch | 75 ------------------------- pytz-2016.10.tar.bz2 | 3 - pytz-2016.10.tar.bz2.asc | 7 --- pytz-2017.2.zip | 3 + pytz-2017.2.zip.asc | 7 +++ 7 files changed, 21 insertions(+), 93 deletions(-) delete mode 100644 pytz-2016.10-fix-tests-with-2017a.patch delete mode 100644 pytz-2016.10.tar.bz2 delete mode 100644 pytz-2016.10.tar.bz2.asc create mode 100644 pytz-2017.2.zip create mode 100644 pytz-2017.2.zip.asc diff --git a/python-pytz.changes b/python-pytz.changes index 6f87075..3c97358 100644 --- a/python-pytz.changes +++ b/python-pytz.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Apr 3 08:59:23 UTC 2017 - astieger@suse.com + +- update to 2017.2: + * include IANA 2017b, tests assume >= 2017a is used + * drop pytz-2016.10-fix-tests-with-2017a.patch, upstream + ------------------------------------------------------------------- Mon Mar 20 19:55:27 UTC 2017 - dimstar@opensuse.org diff --git a/python-pytz.spec b/python-pytz.spec index d5918b4..5b797fe 100644 --- a/python-pytz.spec +++ b/python-pytz.spec @@ -18,23 +18,23 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-pytz -Version: 2016.10 +Version: 2017.2 Release: 0 Summary: World timezone definitions, modern and historical License: MIT Group: Development/Languages/Python Url: http://pytz.sourceforge.net -Source: https://files.pythonhosted.org/packages/source/p/pytz/pytz-%{version}.tar.bz2 -Source2: https://files.pythonhosted.org/packages/source/p/pytz/pytz-%{version}.tar.bz2.asc +Source: https://pypi.python.org/packages/a4/09/c47e57fc9c7062b4e83b075d418800d322caa87ec0ac21e6308bd3a2d519/pytz-%{version}.zip +Source2: https://pypi.python.org/packages/a4/09/c47e57fc9c7062b4e83b075d418800d322caa87ec0ac21e6308bd3a2d519/pytz-%{version}.zip.asc Source90: pytz.keyring # PATCH-FIX-UPSTREAM fix-tests.patch -- Remote tests which are known to be broken Patch0: fix-tests.patch # PATCH-FEATURE-OPENSUSE -- Use system tz database (Olson database) Patch1: system_zoneinfo.patch -Patch2: pytz-2016.10-fix-tests-with-2017a.patch BuildRequires: %{python_module devel} BuildRequires: fdupes BuildRequires: python-rpm-macros +BuildRequires: unzip # Test requirements BuildRequires: %{python_module nose} BuildRequires: timezone @@ -62,10 +62,6 @@ Amost all of the Olson timezones are supported. %patch0 -p1 # Use system tz database %patch1 -p1 -# timezone 2017 a is currently only available in Leap 42.1 and Tumbleweed -%if 0%{?sle_version} == 120100 && 0%{?is_opensuse} || 0%{?suse_version} > 1320 -%patch2 -p2 -%endif # For rpmlint warning: remove shebang from python library: sed -i '/^#!/d' ./pytz/tzfile.py diff --git a/pytz-2016.10-fix-tests-with-2017a.patch b/pytz-2016.10-fix-tests-with-2017a.patch deleted file mode 100644 index d31277d..0000000 --- a/pytz-2016.10-fix-tests-with-2017a.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 838d7f06908c14352b0d4f3c5b656d0d95abaf9e Mon Sep 17 00:00:00 2001 -From: Andreas Stieger -Date: Wed, 15 Mar 2017 22:23:14 +0100 -Subject: [PATCH] test fixes for 2017a numeric zone name changes -References: boo#1027705 https://github.com/stub42/pytz/pull/1 - https://github.com/stub42/pytz/pull/1/commits/838d7f06908c14352b0d4f3c5b656d0d95abaf9e - ---- - src/pytz/tests/test_tzinfo.py | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/src/pytz/tests/test_tzinfo.py b/src/pytz/tests/test_tzinfo.py -index 4d26d9ff..21812f6b 100644 ---- a/src/pytz/tests/test_tzinfo.py -+++ b/src/pytz/tests/test_tzinfo.py -@@ -501,7 +501,7 @@ class NoumeaHistoryStartTestCase(USEasternDSTStartTestCase): - 'dst': timedelta(0), - } - after = { -- 'tzname': 'NCT', -+ 'tzname': '+11', - 'utcoffset': timedelta(hours=11), - 'dst': timedelta(0), - } -@@ -512,12 +512,12 @@ class NoumeaDSTEndTestCase(USEasternDSTStartTestCase): - tzinfo = pytz.timezone('Pacific/Noumea') - transition_time = datetime(1997, 3, 1, 15, 00, 00, tzinfo=UTC) - before = { -- 'tzname': 'NCST', -+ 'tzname': '+12', - 'utcoffset': timedelta(hours=12), - 'dst': timedelta(hours=1), - } - after = { -- 'tzname': 'NCT', -+ 'tzname': '+11', - 'utcoffset': timedelta(hours=11), - 'dst': timedelta(0), - } -@@ -541,7 +541,7 @@ class TahitiTestCase(USEasternDSTStartTestCase): - 'dst': timedelta(0), - } - after = { -- 'tzname': 'TAHT', -+ 'tzname': '-10', - 'utcoffset': timedelta(hours=-10), - 'dst': timedelta(0), - } -@@ -554,12 +554,12 @@ class SamoaInternationalDateLineChange(USEasternDSTStartTestCase): - tzinfo = pytz.timezone('Pacific/Apia') - transition_time = datetime(2011, 12, 30, 10, 0, 0, tzinfo=UTC) - before = { -- 'tzname': 'SDT', -+ 'tzname': '-10', - 'utcoffset': timedelta(hours=-10), - 'dst': timedelta(hours=1), - } - after = { -- 'tzname': 'WSDT', -+ 'tzname': '+14', - 'utcoffset': timedelta(hours=14), - 'dst': timedelta(hours=1), - } -@@ -611,7 +611,7 @@ class LocalTestCase(unittest.TestCase): - self.assertEqual(loc_time.strftime('%Z%z'), 'NST+0120') - - loc_time = loc_tz.localize(datetime(1940, 5, 10, 0, 0, 0)) -- self.assertEqual(loc_time.strftime('%Z%z'), 'NET+0020') -+ self.assertEqual(loc_time.strftime('%Z%z'), '+0020+0020') - - loc_time = loc_tz.localize(datetime(1940, 5, 20, 0, 0, 0)) - self.assertEqual(loc_time.strftime('%Z%z'), 'CEST+0200') --- -2.12.0 - diff --git a/pytz-2016.10.tar.bz2 b/pytz-2016.10.tar.bz2 deleted file mode 100644 index e291a5f..0000000 --- a/pytz-2016.10.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7016b2c4fa075c564b81c37a252a5fccf60d8964aa31b7f5eae59aeb594ae02b -size 172920 diff --git a/pytz-2016.10.tar.bz2.asc b/pytz-2016.10.tar.bz2.asc deleted file mode 100644 index 6dda017..0000000 --- a/pytz-2016.10.tar.bz2.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iEYEABECAAYFAlhGjDcACgkQAfqZj7rGN0qkzACdHUgHv+qfjc6+vHuInFZQD5od -DVwAniNLVslM9oeAXOWa9oQge2gbJuws -=4xm3 ------END PGP SIGNATURE----- diff --git a/pytz-2017.2.zip b/pytz-2017.2.zip new file mode 100644 index 0000000..5aa6f13 --- /dev/null +++ b/pytz-2017.2.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f5c056e8f62d45ba8215e5cb8f50dfccb198b4b9fbea8500674f3443e4689589 +size 502168 diff --git a/pytz-2017.2.zip.asc b/pytz-2017.2.zip.asc new file mode 100644 index 0000000..5d059c3 --- /dev/null +++ b/pytz-2017.2.zip.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iEYEABECAAYFAljcw1wACgkQAfqZj7rGN0r+EgCcCm8zIZ/sk27xLRMFWsPCN+cI +8o4AniaRsoJ4gVx31u9dJvU14K4pqalE +=Q5A8 +-----END PGP SIGNATURE-----