Accepting request 485856 from devel:languages:python
- create correct backwards-compatible Obsoletes/Provides - revert to semantic PyPI URLs - update to 2017.2: * include IANA 2017b, tests assume >= 2017a is used * drop pytz-2016.10-fix-tests-with-2017a.patch, upstream OBS-URL: https://build.opensuse.org/request/show/485856 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-pytz?expand=0&rev=24
This commit is contained in:
commit
79c810cc0e
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 5 15:17:50 UTC 2017 - jmatejek@suse.com
|
||||
|
||||
- create correct backwards-compatible Obsoletes/Provides
|
||||
- revert to semantic PyPI URLs
|
||||
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
|
@ -16,31 +16,34 @@
|
||||
#
|
||||
|
||||
|
||||
%define oldpython python
|
||||
%{?!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://files.pythonhosted.org/packages/source/p/pytz/pytz-%{version}.zip
|
||||
Source2: https://files.pythonhosted.org/packages/source/p/pytz/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
|
||||
Requires: timezone
|
||||
Provides: python-tz = 2014b
|
||||
Obsoletes: python-tz < 2014b
|
||||
%ifpython2
|
||||
Provides: %{oldpython}-tz = %{version}
|
||||
Obsoletes: %{oldpython}-tz < %{version}
|
||||
%endif
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildArch: noarch
|
||||
|
||||
@ -62,10 +65,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
|
||||
|
@ -1,75 +0,0 @@
|
||||
From 838d7f06908c14352b0d4f3c5b656d0d95abaf9e Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Stieger <astieger@suse.com>
|
||||
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
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7016b2c4fa075c564b81c37a252a5fccf60d8964aa31b7f5eae59aeb594ae02b
|
||||
size 172920
|
@ -1,7 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2
|
||||
|
||||
iEYEABECAAYFAlhGjDcACgkQAfqZj7rGN0qkzACdHUgHv+qfjc6+vHuInFZQD5od
|
||||
DVwAniNLVslM9oeAXOWa9oQge2gbJuws
|
||||
=4xm3
|
||||
-----END PGP SIGNATURE-----
|
3
pytz-2017.2.zip
Normal file
3
pytz-2017.2.zip
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f5c056e8f62d45ba8215e5cb8f50dfccb198b4b9fbea8500674f3443e4689589
|
||||
size 502168
|
7
pytz-2017.2.zip.asc
Normal file
7
pytz-2017.2.zip.asc
Normal file
@ -0,0 +1,7 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2
|
||||
|
||||
iEYEABECAAYFAljcw1wACgkQAfqZj7rGN0r+EgCcCm8zIZ/sk27xLRMFWsPCN+cI
|
||||
8o4AniaRsoJ4gVx31u9dJvU14K4pqalE
|
||||
=Q5A8
|
||||
-----END PGP SIGNATURE-----
|
Loading…
Reference in New Issue
Block a user