Date: Thursday, August 20, 2020 @ 14:58:36 Author: eschwartz Revision: 685526
archrelease: copy trunk to community-any Added: python-pytz/repos/community-any/0001-Use-the-system-zoneinfo-from-the-tzdata-package.patch (from rev 685525, python-pytz/trunk/0001-Use-the-system-zoneinfo-from-the-tzdata-package.patch) python-pytz/repos/community-any/PKGBUILD (from rev 685525, python-pytz/trunk/PKGBUILD) Deleted: python-pytz/repos/community-any/PKGBUILD ------------------------------------------------------------+ 0001-Use-the-system-zoneinfo-from-the-tzdata-package.patch | 69 +++++++ PKGBUILD | 107 +++++------ 2 files changed, 127 insertions(+), 49 deletions(-) Copied: python-pytz/repos/community-any/0001-Use-the-system-zoneinfo-from-the-tzdata-package.patch (from rev 685525, python-pytz/trunk/0001-Use-the-system-zoneinfo-from-the-tzdata-package.patch) =================================================================== --- 0001-Use-the-system-zoneinfo-from-the-tzdata-package.patch (rev 0) +++ 0001-Use-the-system-zoneinfo-from-the-tzdata-package.patch 2020-08-20 14:58:36 UTC (rev 685526) @@ -0,0 +1,69 @@ +From 74baf31e5505d03a71df49894d57e1011e771eb9 Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwa...@archlinux.org> +Date: Mon, 4 May 2020 15:26:01 -0400 +Subject: [PATCH] Use the system zoneinfo from the tzdata package. + +We don't need to ship these vendored blobs as our system copy works +quite well. + +Signed-off-by: Eli Schwartz <eschwa...@archlinux.org> +--- + src/pytz/__init__.py | 13 +------------ + src/pytz/tzfile.py | 2 +- + src/setup.py | 2 -- + 3 files changed, 2 insertions(+), 15 deletions(-) + +diff --git a/src/pytz/__init__.py b/src/pytz/__init__.py +index c25a1d1..3cc59ef 100644 +--- a/src/pytz/__init__.py ++++ b/src/pytz/__init__.py +@@ -92,19 +92,8 @@ def open_resource(name): + if zoneinfo_dir is not None: + filename = os.path.join(zoneinfo_dir, *name_parts) + else: +- filename = os.path.join(os.path.dirname(__file__), ++ filename = os.path.join('/usr', 'share', + '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) + return open(filename, 'rb') + + +diff --git a/src/pytz/tzfile.py b/src/pytz/tzfile.py +index 25117f3..98eba05 100644 +--- a/src/pytz/tzfile.py ++++ b/src/pytz/tzfile.py +@@ -126,7 +126,7 @@ def build_tzinfo(zone, fp): + if __name__ == '__main__': + import os.path + from pprint import pprint +- base = os.path.join(os.path.dirname(__file__), 'zoneinfo') ++ base = os.path.join('/usr', 'share', 'zoneinfo') + tz = build_tzinfo('Australia/Melbourne', + open(os.path.join(base, 'Australia', 'Melbourne'), 'rb')) + tz = build_tzinfo('US/Eastern', +diff --git a/src/setup.py b/src/setup.py +index fa9a592..675618c 100644 +--- a/src/setup.py ++++ b/src/setup.py +@@ -22,8 +22,6 @@ for dirpath, dirnames, filenames in os.walk(os.path.join('pytz', 'zoneinfo')): + for filename in filenames]) + package_data = {'pytz': resources} + +-assert len(resources) > 10, 'zoneinfo files not found!' +- + setup( + name='pytz', + version=pytz.VERSION, +-- +2.26.2 + Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-08-20 14:58:18 UTC (rev 685525) +++ PKGBUILD 2020-08-20 14:58:36 UTC (rev 685526) @@ -1,49 +0,0 @@ -# Maintainer: Stefan Husmann <stefan-husm...@t-online.de> -# Maintainer: Jelle van der Waa <je...@vdwaa.nl> -# Contributor: Douglas Soares de Andrade <d...@aur.archlinux.org> -# Contributor: William Rea <sillywi...@gmail.com> - -pkgname=('python-pytz' 'python2-pytz') -pkgver=2020.1 -pkgrel=1 -arch=('any') -url="https://pypi.python.org/pypi/pytz" -license=("MIT") -makedepends=('python' 'python2') -source=("https://pypi.io/packages/source/p/pytz/pytz-${pkgver}.tar.gz") -sha512sums=('4f652ab400bac0bd83ed305be7540094e674029a0cbde7da280adfd911b8c0a44023799b7c61971a5a61a1d6e3992c5b621e5e95bbfe962f310d5f26d4fda3ce') -validpgpkeys=('C7ECC365AB6F255E1EB9BA1701FA998FBAC6374A') - -build(){ - cp -rf pytz-$pkgver pytz2-$pkgver -} - -check(){ - cd pytz-$pkgver/pytz/tests - - python3 test_tzinfo.py - python2 test_tzinfo.py -} - -package_python-pytz(){ - depends=('python') - pkgdesc="Cross platform time zone library for Python" - - cd pytz-$pkgver - - python3 setup.py install --root=$pkgdir/ - - install -Dm644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE -} - - -package_python2-pytz(){ - depends=('python2') - pkgdesc="Cross platform time zone library for Python" - - cd pytz2-$pkgver - - python2 setup.py install --root="$pkgdir/" - - install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} Copied: python-pytz/repos/community-any/PKGBUILD (from rev 685525, python-pytz/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-08-20 14:58:36 UTC (rev 685526) @@ -0,0 +1,58 @@ +# Maintainer: Stefan Husmann <stefan-husm...@t-online.de> +# Maintainer: Jelle van der Waa <je...@vdwaa.nl> +# Contributor: Douglas Soares de Andrade <d...@aur.archlinux.org> +# Contributor: William Rea <sillywi...@gmail.com> + +pkgname=('python-pytz' 'python2-pytz') +pkgver=2020.1 +pkgrel=2 +arch=('any') +url="https://pypi.python.org/pypi/pytz" +license=("MIT") +makedepends=('python' 'python2') +source=("https://pypi.io/packages/source/p/pytz/pytz-${pkgver}.tar.gz" + "0001-Use-the-system-zoneinfo-from-the-tzdata-package.patch") +sha512sums=('4f652ab400bac0bd83ed305be7540094e674029a0cbde7da280adfd911b8c0a44023799b7c61971a5a61a1d6e3992c5b621e5e95bbfe962f310d5f26d4fda3ce' + '3cbd497313c3049a2ae04298118aefb6dfa9ec4626078c665c95c13a78ae944b33a68813aea0c53b02b0532b64221cca4a0cd2153bd91b3760916bc3c0f6df8f') +validpgpkeys=('C7ECC365AB6F255E1EB9BA1701FA998FBAC6374A') + +prepare() { + cd pytz-$pkgver + + patch -p2 -i ../0001-Use-the-system-zoneinfo-from-the-tzdata-package.patch + rm -r pytz/zoneinfo/ +} + +build(){ + cp -rf pytz-$pkgver pytz2-$pkgver +} + +check(){ + cd pytz-$pkgver/pytz/tests + + python3 test_tzinfo.py + python2 test_tzinfo.py +} + +package_python-pytz(){ + depends=('python') + pkgdesc="Cross platform time zone library for Python" + + cd pytz-$pkgver + + python3 setup.py install --root=$pkgdir/ + + install -Dm644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE +} + + +package_python2-pytz(){ + depends=('python2') + pkgdesc="Cross platform time zone library for Python" + + cd pytz2-$pkgver + + python2 setup.py install --root="$pkgdir/" + + install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +}