Hello community, here is the log from the commit of package python-pytz for openSUSE:Factory checked in at 2017-07-08 12:27:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pytz (Old) and /work/SRC/openSUSE:Factory/.python-pytz.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pytz" Sat Jul 8 12:27:23 2017 rev:25 rq:508441 version:2017.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python-pytz/python-pytz.changes 2017-04-19 18:07:49.255344814 +0200 +++ /work/SRC/openSUSE:Factory/.python-pytz.new/python-pytz.changes 2017-07-08 12:27:24.505620048 +0200 @@ -1,0 +2,6 @@ +Wed Jun 28 12:07:24 UTC 2017 - [email protected] + +- add 0001-Fix-tests-for-older-timezone-versions.patch . This fixes + the tests on SLE12SP2 and SLE12SP3 + +------------------------------------------------------------------- New: ---- 0001-Fix-tests-for-older-timezone-versions.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pytz.spec ++++++ --- /var/tmp/diff_new_pack.jsKOEV/_old 2017-07-08 12:27:25.345501579 +0200 +++ /var/tmp/diff_new_pack.jsKOEV/_new 2017-07-08 12:27:25.349501014 +0200 @@ -32,6 +32,8 @@ Patch0: fix-tests.patch # PATCH-FEATURE-OPENSUSE -- Use system tz database (Olson database) Patch1: system_zoneinfo.patch +# PATCH-FIX-UPSTREAM 0001-Fix-tests-for-older-timezone-versions.patch -- https://code.launchpad.net/~toabctl/pytz/+git/pytz/+merge/326419 +Patch2: 0001-Fix-tests-for-older-timezone-versions.patch BuildRequires: %{python_module devel} BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -65,6 +67,7 @@ %patch0 -p1 # Use system tz database %patch1 -p1 +%patch2 -p2 # For rpmlint warning: remove shebang from python library: sed -i '/^#!/d' ./pytz/tzfile.py ++++++ 0001-Fix-tests-for-older-timezone-versions.patch ++++++ >From ba0f4aa2cb32d3e0338c389a0ee32ae8ceb1f367 Mon Sep 17 00:00:00 2001 From: Thomas Bechtold <[email protected]> Date: Wed, 28 Jun 2017 12:28:31 +0200 Subject: [PATCH] Fix tests for older timezone versions This improves the fix from commit c00dbe290b . --- src/pytz/tests/test_tzinfo.py | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/pytz/tests/test_tzinfo.py b/src/pytz/tests/test_tzinfo.py index 3166322..0ecb8c0 100644 --- a/src/pytz/tests/test_tzinfo.py +++ b/src/pytz/tests/test_tzinfo.py @@ -235,12 +235,14 @@ class USEasternDSTStartTestCase(unittest.TestCase): def _test_tzname(self, utc_dt, wanted): tzname = wanted['tzname'] + if not isinstance(tzname, list): + tzname = [tzname] dt = utc_dt.astimezone(self.tzinfo) - self.assertEqual(dt.tzname(), tzname, - 'Expected %s as tzname for %s. Got %s' % ( - tzname, str(utc_dt), dt.tzname() - ) - ) + self.assertIn(dt.tzname(), tzname, + 'Expected %s as tzname for %s. Got %s' % ( + tzname, str(utc_dt), dt.tzname() + ) + ) def _test_utcoffset(self, utc_dt, wanted): utcoffset = wanted['utcoffset'] @@ -501,7 +503,7 @@ class NoumeaHistoryStartTestCase(USEasternDSTStartTestCase): 'dst': timedelta(0), } after = { - 'tzname': '+11', # pre-2017a, NCT + 'tzname': ['+11', 'NCT'], # pre-2017a, NCT 'utcoffset': timedelta(hours=11), 'dst': timedelta(0), } @@ -512,12 +514,12 @@ class NoumeaDSTEndTestCase(USEasternDSTStartTestCase): tzinfo = pytz.timezone('Pacific/Noumea') transition_time = datetime(1997, 3, 1, 15, 00, 00, tzinfo=UTC) before = { - 'tzname': '+12', # pre-2017a, NCST + 'tzname': ['+12', 'NCST'], # pre-2017a, NCST 'utcoffset': timedelta(hours=12), 'dst': timedelta(hours=1), } after = { - 'tzname': '+11', # pre-2017a, NCT + 'tzname': ['+11', 'NCT'], # pre-2017a, NCT 'utcoffset': timedelta(hours=11), 'dst': timedelta(0), } @@ -541,7 +543,7 @@ class TahitiTestCase(USEasternDSTStartTestCase): 'dst': timedelta(0), } after = { - 'tzname': '-10', # pre-2017a, TAHT + 'tzname': ['-10', 'TAHT'], # pre-2017a, TAHT 'utcoffset': timedelta(hours=-10), 'dst': timedelta(0), } @@ -554,12 +556,12 @@ class SamoaInternationalDateLineChange(USEasternDSTStartTestCase): tzinfo = pytz.timezone('Pacific/Apia') transition_time = datetime(2011, 12, 30, 10, 0, 0, tzinfo=UTC) before = { - 'tzname': '-10', # pre-2017a, SDT + 'tzname': ['-10', 'SDT'], # pre-2017a, SDT 'utcoffset': timedelta(hours=-10), 'dst': timedelta(hours=1), } after = { - 'tzname': '+14', # pre-2017a, WSDT + 'tzname': ['+14', 'WSDT'], # pre-2017a, WSDT 'utcoffset': timedelta(hours=14), 'dst': timedelta(hours=1), } @@ -612,7 +614,7 @@ class LocalTestCase(unittest.TestCase): loc_time = loc_tz.localize(datetime(1940, 5, 10, 0, 0, 0)) # pre-2017a, abbreviation was NCT - self.assertEqual(loc_time.strftime('%Z%z'), '+0020+0020') + self.assertIn(loc_time.strftime('%Z%z'), ['NET+0020', '+0020+0020']) loc_time = loc_tz.localize(datetime(1940, 5, 20, 0, 0, 0)) self.assertEqual(loc_time.strftime('%Z%z'), 'CEST+0200') -- 2.13.1
