[arch-commits] Commit in python-pytz/repos/community-any (4 files)
Jelle van der Waa
jelle at gemini.archlinux.org
Mon Nov 1 08:46:47 UTC 2021
Date: Monday, November 1, 2021 @ 08:46:47
Author: jelle
Revision: 1035152
archrelease: copy trunk to community-any
Added:
python-pytz/repos/community-any/0001-Use-the-system-zoneinfo-from-the-tzdata-package.patch
(from rev 1035151, python-pytz/trunk/0001-Use-the-system-zoneinfo-from-the-tzdata-package.patch)
python-pytz/repos/community-any/PKGBUILD
(from rev 1035151, python-pytz/trunk/PKGBUILD)
Deleted:
python-pytz/repos/community-any/0001-Use-the-system-zoneinfo-from-the-tzdata-package.patch
python-pytz/repos/community-any/PKGBUILD
------------------------------------------------------------+
0001-Use-the-system-zoneinfo-from-the-tzdata-package.patch | 138 +++++------
PKGBUILD | 103 +++-----
2 files changed, 114 insertions(+), 127 deletions(-)
Deleted: 0001-Use-the-system-zoneinfo-from-the-tzdata-package.patch
===================================================================
--- 0001-Use-the-system-zoneinfo-from-the-tzdata-package.patch 2021-11-01 08:46:41 UTC (rev 1035151)
+++ 0001-Use-the-system-zoneinfo-from-the-tzdata-package.patch 2021-11-01 08:46:47 UTC (rev 1035152)
@@ -1,69 +0,0 @@
-From 74baf31e5505d03a71df49894d57e1011e771eb9 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz at 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 <eschwartz at 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
-
Copied: python-pytz/repos/community-any/0001-Use-the-system-zoneinfo-from-the-tzdata-package.patch (from rev 1035151, 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 2021-11-01 08:46:47 UTC (rev 1035152)
@@ -0,0 +1,69 @@
+From 74baf31e5505d03a71df49894d57e1011e771eb9 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz at 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 <eschwartz at 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 2021-11-01 08:46:41 UTC (rev 1035151)
+++ PKGBUILD 2021-11-01 08:46:47 UTC (rev 1035152)
@@ -1,58 +0,0 @@
-# Maintainer: Stefan Husmann <stefan-husmann at t-online.de>
-# Maintainer: Jelle van der Waa <jelle at vdwaa.nl>
-# Contributor: Douglas Soares de Andrade <dsa at aur.archlinux.org>
-# Contributor: William Rea <sillywilly at gmail.com>
-
-pkgname=('python-pytz' 'python2-pytz')
-pkgver=2021.3
-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"
- "0001-Use-the-system-zoneinfo-from-the-tzdata-package.patch")
-sha512sums=('c45099f319592976b7715d9973496a2c7438a1b958ef8b90a1ad1fb97e7035624fe6191796727d4b7edf3236271bea4d864e25d1d92431e8cf767ac798448882'
- '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
-}
Copied: python-pytz/repos/community-any/PKGBUILD (from rev 1035151, python-pytz/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-11-01 08:46:47 UTC (rev 1035152)
@@ -0,0 +1,45 @@
+# Maintainer: Stefan Husmann <stefan-husmann at t-online.de>
+# Maintainer: Jelle van der Waa <jelle at vdwaa.nl>
+# Contributor: Douglas Soares de Andrade <dsa at aur.archlinux.org>
+# Contributor: William Rea <sillywilly at gmail.com>
+
+pkgname=python-pytz
+pkgver=2021.3
+pkgrel=2
+arch=('any')
+url="https://pypi.python.org/pypi/pytz"
+license=("MIT")
+pkgdesc="Cross platform time zone library for Python"
+depends=('python')
+makedepends=('python')
+source=("https://pypi.io/packages/source/p/pytz/pytz-${pkgver}.tar.gz"
+ "0001-Use-the-system-zoneinfo-from-the-tzdata-package.patch")
+sha512sums=('c45099f319592976b7715d9973496a2c7438a1b958ef8b90a1ad1fb97e7035624fe6191796727d4b7edf3236271bea4d864e25d1d92431e8cf767ac798448882'
+ '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(){
+ cd pytz-$pkgver
+ python setup.py build
+}
+
+check(){
+ cd pytz-$pkgver/pytz/tests
+
+ python3 test_tzinfo.py
+}
+
+package(){
+ cd pytz-$pkgver
+
+ python3 setup.py install --root="$pkgdir"/
+
+ install -Dm644 LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
More information about the arch-commits
mailing list