From 19bffb779e2e4108c2a4c2b8222ec99a75e52ca8a4101066f2dd579f880b854e Mon Sep 17 00:00:00 2001 From: Jan Matejek Date: Thu, 2 Nov 2017 15:25:27 +0000 Subject: [PATCH] Accepting request 538228 from home:apersaud:branches:devel:languages:python update to latest version OBS-URL: https://build.opensuse.org/request/show/538228 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pytz?expand=0&rev=65 --- python-pytz.changes | 15 +++++++++++++++ python-pytz.spec | 2 +- pytz-2017.2.zip | 3 --- pytz-2017.2.zip.asc | 7 ------- pytz-2017.3.zip | 3 +++ pytz-2017.3.zip.asc | 7 +++++++ system_zoneinfo.patch | 30 +++++++++++++++++------------- 7 files changed, 43 insertions(+), 24 deletions(-) delete mode 100644 pytz-2017.2.zip delete mode 100644 pytz-2017.2.zip.asc create mode 100644 pytz-2017.3.zip create mode 100644 pytz-2017.3.zip.asc diff --git a/python-pytz.changes b/python-pytz.changes index ffe24eb..4f6c7cb 100644 --- a/python-pytz.changes +++ b/python-pytz.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Thu Nov 2 03:10:52 UTC 2017 - arun@gmx.de + +- updated system_zoneinfo.patch + +- update to version 2017.3: + * PYTZ_TZDATADIR environment variable override of database location + * Allow pickles from Python2 to be unpickled with Python3 + * Remove unmaintained CHANGES.txt + * Test with Python 3.6 + * Detect compiled tzfiles by sniffing magic + * Squashed 'tz/' changes from f8ebe3a64..e6ff702de + * Be explicit about supported Python versions + * Fixed README.txt to not issue warnings. + ------------------------------------------------------------------- Wed Jun 28 12:07:24 UTC 2017 - tbechtold@suse.com diff --git a/python-pytz.spec b/python-pytz.spec index 5cc2fad..eba784b 100644 --- a/python-pytz.spec +++ b/python-pytz.spec @@ -19,7 +19,7 @@ %define oldpython python %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-pytz -Version: 2017.2 +Version: 2017.3 Release: 0 Summary: World timezone definitions, modern and historical License: MIT diff --git a/pytz-2017.2.zip b/pytz-2017.2.zip deleted file mode 100644 index 5aa6f13..0000000 --- a/pytz-2017.2.zip +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index 5d059c3..0000000 --- a/pytz-2017.2.zip.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iEYEABECAAYFAljcw1wACgkQAfqZj7rGN0r+EgCcCm8zIZ/sk27xLRMFWsPCN+cI -8o4AniaRsoJ4gVx31u9dJvU14K4pqalE -=Q5A8 ------END PGP SIGNATURE----- diff --git a/pytz-2017.3.zip b/pytz-2017.3.zip new file mode 100644 index 0000000..298c3ca --- /dev/null +++ b/pytz-2017.3.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fae4cffc040921b8a2d60c6cf0b5d662c1190fe54d718271db4eb17d44a185b7 +size 527977 diff --git a/pytz-2017.3.zip.asc b/pytz-2017.3.zip.asc new file mode 100644 index 0000000..ebf3957 --- /dev/null +++ b/pytz-2017.3.zip.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iEYEABECAAYFAln3MrQACgkQAfqZj7rGN0pzowCggUYhB+WYN2w6SPryflzhs1II +HxQAn1a0zf16Al5FA4ATvq4R26PDThut +=qZkB +-----END PGP SIGNATURE----- diff --git a/system_zoneinfo.patch b/system_zoneinfo.patch index 4225e74..3ba3588 100644 --- a/system_zoneinfo.patch +++ b/system_zoneinfo.patch @@ -2,23 +2,27 @@ Index: pytz-2016.10/pytz/__init__.py =================================================================== --- pytz-2016.10.orig/pytz/__init__.py +++ pytz-2016.10/pytz/__init__.py -@@ -81,19 +81,7 @@ def open_resource(name): +@@ -87,23 +87,7 @@ def open_resource(name): for part in name_parts: if part == os.path.pardir or os.path.sep in part: raise ValueError('Bad path segment: %r' % part) -- filename = os.path.join(os.path.dirname(__file__), -- 'zoneinfo', *name_parts) -- if not os.path.exists(filename): -- # http://bugs.launchpad.net/bugs/383171 - we avoid using this -- # unless absolutely necessary to help when a broken version of -- # pkg_resources is installed. -- try: -- from pkg_resources import resource_stream -- except ImportError: -- resource_stream = None +- zoneinfo_dir = os.environ.get('PYTZ_TZDATADIR', None) +- if zoneinfo_dir != None: +- filename = os.path.join(zoneinfo_dir, *name_parts) +- else: +- filename = os.path.join(os.path.dirname(__file__), +- 'zoneinfo', *name_parts) +- if not os.path.exists(filename): +- # http://bugs.launchpad.net/bugs/383171 - we avoid using this +- # unless absolutely necessary to help when a broken version of +- # pkg_resources is installed. +- try: +- from pkg_resources import resource_stream +- except ImportError: +- resource_stream = None - -- if resource_stream is not None: -- return resource_stream(__name__, 'zoneinfo/' + name) +- if resource_stream is not None: +- return resource_stream(__name__, 'zoneinfo/' + name) + filename = os.path.join('/usr/share/zoneinfo', *name_parts) return open(filename, 'rb')