public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pytz/, dev-python/pytz/files/
@ 2016-07-14 12:37 Dirkjan Ochtman
  0 siblings, 0 replies; 5+ messages in thread
From: Dirkjan Ochtman @ 2016-07-14 12:37 UTC (permalink / raw
  To: gentoo-commits

commit:     c3baa934bb67ec87ecddb9b46a96cf4f6349a87d
Author:     Dirkjan Ochtman <djc <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 14 11:24:47 2016 +0000
Commit:     Dirkjan Ochtman <djc <AT> gentoo <DOT> org>
CommitDate: Thu Jul 14 12:37:33 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3baa934

dev-python/pytz: version bump to 2016.6.1

Package-Manager: portage-2.2.28

 dev-python/pytz/Manifest                      |  1 +
 dev-python/pytz/files/2016.6.1-zoneinfo.patch | 12 +++++++++
 dev-python/pytz/pytz-2016.6.1.ebuild          | 35 +++++++++++++++++++++++++++
 3 files changed, 48 insertions(+)

diff --git a/dev-python/pytz/Manifest b/dev-python/pytz/Manifest
index 1da34e98..0232797 100644
--- a/dev-python/pytz/Manifest
+++ b/dev-python/pytz/Manifest
@@ -2,3 +2,4 @@ DIST pytz-2015.4.tar.bz2 157361 SHA256 a78b484d5472dd8c688f8b3eee18646a25c66ce45
 DIST pytz-2015.6.tar.bz2 156925 SHA256 01eed1b2226dc386d8e467a2ff8c4f1aa08c65d5d7e7c43aa094bd45d5bd68ba SHA512 e6e117d85c0a0310b115cfaae2b9d5957641f8367a7890f4e1afed8129e77c6a08b733b985c06d5f3fe5bbfa565387826883864b79dd4946065561a60ad24f35 WHIRLPOOL 255684e9f24353aeda2f26fc89216aef3b34a87a74df4dc758f87da31cedce6d372d405d37e8c538b786324c6ce03da177d3429438999ecfd744009fd7bbbbe9
 DIST pytz-2015.7.tar.bz2 156812 SHA256 fbd26746772c24cb93c8b97cbdad5cb9e46c86bbdb1b9d8a743ee00e2fb1fc5d SHA512 ffdea72f36b286ea63a3dbc022626ab01d2348ebd29c3532e9e1a289c3112f0ff01e9f3fcf2ad389b609d14393b68c9652f61d1589551f4979a010185da0609c WHIRLPOOL 3ed0deee15f831ae735a9d4f317fe1eaca91e10f450343b0a1e24998846785fd5b02c71caa4ee4e40e426fdc780e2ac9ccaf54abc1f7a66c662bef84feacd691
 DIST pytz-2016.3.tar.bz2 170906 SHA256 c193dfa167ac32c8cb96f26cbcd92972591b22bda0bac3effdbdb04de6cc55d6 SHA512 8d91a84500257327361a8ccd19ce2d2e5848c10c7d4105ec1be012be592ec38113611558c7894c1825cc1967303901fce35079fc799cc10e84216864cd00266f WHIRLPOOL b2af20a788fa70c23b04cda3acdff812c30713f00a9aaf2144d85c64341f6fe4e365b558f3f0b5491c6c99ebf633d2d3910c95f7a6ae1f9c53b40da6bcbc23af
+DIST pytz-2016.6.1.tar.bz2 172223 SHA256 b5aff44126cf828537581e534cc94299b223b945a2bb3b5434d37bf8c7f3a10c SHA512 89a1e19861a15884aa0ddc68ad7221e362994a0457e2e178e80fee539bd52dd9dcdf94a5bb3aa33e60e7523b803860f8fe01f90236f2a8f0c2a8da0a62bb61b2 WHIRLPOOL b8f6de9065fce0b34a6aca21f3f2625d2e077f705ccd80baaec92e70e51960e0a88edb0611a18197612f4b359720cd34994d14cf2327cb9871e98f78035ff6d9

diff --git a/dev-python/pytz/files/2016.6.1-zoneinfo.patch b/dev-python/pytz/files/2016.6.1-zoneinfo.patch
new file mode 100644
index 0000000..2d61448
--- /dev/null
+++ b/dev-python/pytz/files/2016.6.1-zoneinfo.patch
@@ -0,0 +1,12 @@
+--- pytz/__init__.py.bak	2016-07-14 13:20:37.856381431 +0200
++++ pytz/__init__.py	2016-07-14 13:21:00.464512973 +0200
+@@ -81,8 +81,7 @@
+     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)
++    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

diff --git a/dev-python/pytz/pytz-2016.6.1.ebuild b/dev-python/pytz/pytz-2016.6.1.ebuild
new file mode 100644
index 0000000..c923463
--- /dev/null
+++ b/dev-python/pytz/pytz-2016.6.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="World timezone definitions for Python"
+HOMEPAGE="http://pythonhosted.org/pytz/ https://pypi.python.org/pypi/pytz/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=sys-libs/timezone-data-2015g"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	# Use timezone-data zoneinfo.
+	"${FILESDIR}"/2016.6.1-zoneinfo.patch
+	# ...and do not install a copy of it.
+	"${FILESDIR}"/${PN}-2009h-zoneinfo-noinstall.patch
+)
+
+python_test() {
+	"${PYTHON}" pytz/tests/test_tzinfo.py -v || die "Tests fail with ${EPYTHON}"
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/pytz/, dev-python/pytz/files/
@ 2020-12-25  9:17 Michał Górny
  0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2020-12-25  9:17 UTC (permalink / raw
  To: gentoo-commits

commit:     0c2448f5380c933df73fed46490ef130aec4f1e5
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 25 08:20:33 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Dec 25 08:37:41 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c2448f5

dev-python/pytz: Bump to 2020.5

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/pytz/Manifest                           |  1 +
 .../pytz/files/pytz-2020.5-system-zoneinfo.patch   | 33 ++++++++++++++++++++++
 dev-python/pytz/pytz-2020.5.ebuild                 | 32 +++++++++++++++++++++
 3 files changed, 66 insertions(+)

diff --git a/dev-python/pytz/Manifest b/dev-python/pytz/Manifest
index 403e47ba5db..13d5040e6f8 100644
--- a/dev-python/pytz/Manifest
+++ b/dev-python/pytz/Manifest
@@ -1 +1,2 @@
 DIST pytz-2020.4.tar.gz 310941 BLAKE2B 8abe524ccb7ed676c64dbc129ade5d6562980ea28f8939a3a7a406acf16a8a936e79ff630bf37884610e8936dfe96311ecb752f3b79519a126e1f1ac48883842 SHA512 dcbe763bc6e48c52df855fe03a8109dc0656a0e851324c0468f4307e8aff60e577fe0c9f0b062319e90d2f639b96e98edf8346064705e244143386c863a0aa7c
+DIST pytz-2020.5.tar.gz 314194 BLAKE2B c374e0ee803878ad2dde1ef03c108f59f431d645d8067fb9f183b9feb029b4de283477e7f6c146a6d03462bd5cb4fc98118e03601c838f73903f5f7a7d28bf8f SHA512 0845c0b7cefb8732e3016568b17ae73232fe6537bac6da89cb1bf911ba5786ee1be6b5e3aa8767225291e3a7e9afd5b8e40e4051671a3a006f9e2f71c551e13e

diff --git a/dev-python/pytz/files/pytz-2020.5-system-zoneinfo.patch b/dev-python/pytz/files/pytz-2020.5-system-zoneinfo.patch
new file mode 100644
index 00000000000..94bad7e234a
--- /dev/null
+++ b/dev-python/pytz/files/pytz-2020.5-system-zoneinfo.patch
@@ -0,0 +1,33 @@
+diff --git a/pytz/__init__.py b/pytz/__init__.py
+index a1f75b6..f2a2330 100644
+--- a/pytz/__init__.py
++++ b/pytz/__init__.py
+@@ -92,8 +92,7 @@ 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__),
+-                                'zoneinfo', *name_parts)
++        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
+diff --git a/setup.py b/setup.py
+index e31ff2b..ba6926b 100644
+--- a/setup.py
++++ b/setup.py
+@@ -15,14 +15,8 @@ me = 'Stuart Bishop'
+ memail = 'stuart@stuartbishop.net'
+ packages = ['pytz']
+ resources = ['zone.tab', 'locales/pytz.pot']
+-for dirpath, dirnames, filenames in os.walk(os.path.join('pytz', 'zoneinfo')):
+-    # remove the 'pytz' part of the path
+-    basepath = dirpath.split(os.path.sep, 1)[1]
+-    resources.extend([os.path.join(basepath, filename) for filename in filenames])
+ package_data = {'pytz': resources}
+ 
+-assert len(resources) > 10, 'zoneinfo files not found!'
+-
+ setup(
+     name='pytz',
+     version=pytz.VERSION,

diff --git a/dev-python/pytz/pytz-2020.5.ebuild b/dev-python/pytz/pytz-2020.5.ebuild
new file mode 100644
index 00000000000..58a2cbcffbd
--- /dev/null
+++ b/dev-python/pytz/pytz-2020.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="World timezone definitions for Python"
+HOMEPAGE="https://pythonhosted.org/pytz/ https://pypi.org/project/pytz/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE=""
+
+RDEPEND="
+	|| ( >=sys-libs/timezone-data-2017a sys-libs/glibc[vanilla] )"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+PATCHES=(
+	# Use timezone-data zoneinfo.
+	"${FILESDIR}"/pytz-2020.5-system-zoneinfo.patch
+)
+
+python_test() {
+	"${EPYTHON}" pytz/tests/test_tzinfo.py -v || die "Tests fail with ${EPYTHON}"
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/pytz/, dev-python/pytz/files/
@ 2021-02-19  8:35 Michał Górny
  0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2021-02-19  8:35 UTC (permalink / raw
  To: gentoo-commits

commit:     917843e0359f86f7a7ad1beea78e3fe4825a653c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 19 08:30:08 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Feb 19 08:30:08 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=917843e0

dev-python/pytz: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/pytz/Manifest                           |  1 -
 dev-python/pytz/files/2018.4-zoneinfo.patch        | 12 --------
 .../files/pytz-2018.4-zoneinfo-noinstall.patch     | 18 ------------
 dev-python/pytz/pytz-2020.4.ebuild                 | 34 ----------------------
 4 files changed, 65 deletions(-)

diff --git a/dev-python/pytz/Manifest b/dev-python/pytz/Manifest
index 8cc3cd00a6d..f1333d81872 100644
--- a/dev-python/pytz/Manifest
+++ b/dev-python/pytz/Manifest
@@ -1,3 +1,2 @@
-DIST pytz-2020.4.tar.gz 310941 BLAKE2B 8abe524ccb7ed676c64dbc129ade5d6562980ea28f8939a3a7a406acf16a8a936e79ff630bf37884610e8936dfe96311ecb752f3b79519a126e1f1ac48883842 SHA512 dcbe763bc6e48c52df855fe03a8109dc0656a0e851324c0468f4307e8aff60e577fe0c9f0b062319e90d2f639b96e98edf8346064705e244143386c863a0aa7c
 DIST pytz-2020.5.tar.gz 314194 BLAKE2B c374e0ee803878ad2dde1ef03c108f59f431d645d8067fb9f183b9feb029b4de283477e7f6c146a6d03462bd5cb4fc98118e03601c838f73903f5f7a7d28bf8f SHA512 0845c0b7cefb8732e3016568b17ae73232fe6537bac6da89cb1bf911ba5786ee1be6b5e3aa8767225291e3a7e9afd5b8e40e4051671a3a006f9e2f71c551e13e
 DIST pytz-2021.1.tar.gz 317945 BLAKE2B 5d8b5ac80a9d5be56977df8a422e9f008ccb1afb9468155c53aa97f0bf43ba15c27fd30ee7be035be6fa590dcb272991a069cd1383f1c6c8d378958d7b0c4970 SHA512 507e24e3c5c2c619d9f3c7f4c33d44d262e33656b07701d0db78f5d67b263ad845dccc4ff50e48c580b0f295cf97ed146af7b9259890a50bb6da4c82b70c439b

diff --git a/dev-python/pytz/files/2018.4-zoneinfo.patch b/dev-python/pytz/files/2018.4-zoneinfo.patch
deleted file mode 100644
index 2eeeab416d7..00000000000
--- a/dev-python/pytz/files/2018.4-zoneinfo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/pytz/__init__.py
-+++ b/pytz/__init__.py
-@@ -91,8 +91,7 @@
-     if zoneinfo_dir is not None:
-         filename = os.path.join(zoneinfo_dir, *name_parts)
-     else:
--        filename = os.path.join(os.path.dirname(__file__),
--                                'zoneinfo', *name_parts)
-+        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

diff --git a/dev-python/pytz/files/pytz-2018.4-zoneinfo-noinstall.patch b/dev-python/pytz/files/pytz-2018.4-zoneinfo-noinstall.patch
deleted file mode 100644
index 9f8b93bf70a..00000000000
--- a/dev-python/pytz/files/pytz-2018.4-zoneinfo-noinstall.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -15,15 +15,8 @@
- memail = 'stuart@stuartbishop.net'
- packages = ['pytz']
- resources = ['zone.tab', 'locales/pytz.pot']
--for dirpath, dirnames, filenames in os.walk(os.path.join('pytz', 'zoneinfo')):
--    # remove the 'pytz' part of the path
--    basepath = dirpath.split(os.path.sep, 1)[1]
--    resources.extend([os.path.join(basepath, filename)
--                     for filename in filenames])
- package_data = {'pytz': resources}
- 
--assert len(resources) > 10, 'zoneinfo files not found!'
--
- setup(
-     name='pytz',
-     version=pytz.VERSION,

diff --git a/dev-python/pytz/pytz-2020.4.ebuild b/dev-python/pytz/pytz-2020.4.ebuild
deleted file mode 100644
index ffa78dffaeb..00000000000
--- a/dev-python/pytz/pytz-2020.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="World timezone definitions for Python"
-HOMEPAGE="https://pythonhosted.org/pytz/ https://pypi.org/project/pytz/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE=""
-
-RDEPEND="
-	|| ( >=sys-libs/timezone-data-2017a sys-libs/glibc[vanilla] )"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-PATCHES=(
-	# Use timezone-data zoneinfo.
-	"${FILESDIR}"/2018.4-zoneinfo.patch
-	# ...and do not install a copy of it.
-	"${FILESDIR}"/${PN}-2018.4-zoneinfo-noinstall.patch
-)
-
-python_test() {
-	"${EPYTHON}" pytz/tests/test_tzinfo.py -v || die "Tests fail with ${EPYTHON}"
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/pytz/, dev-python/pytz/files/
@ 2022-09-20  5:57 Michał Górny
  0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2022-09-20  5:57 UTC (permalink / raw
  To: gentoo-commits

commit:     0a48faeacde0fd3cb7d7662d558d2904cd81ded5
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 20 05:54:44 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Sep 20 05:56:30 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a48faea

dev-python/pytz: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/pytz/Manifest                           |  2 --
 .../pytz/files/pytz-2020.5-system-zoneinfo.patch   | 33 -----------------
 dev-python/pytz/pytz-2022.1.ebuild                 | 42 ----------------------
 dev-python/pytz/pytz-2022.2.ebuild                 | 34 ------------------
 4 files changed, 111 deletions(-)

diff --git a/dev-python/pytz/Manifest b/dev-python/pytz/Manifest
index dcf992af2219..4863ccf5f897 100644
--- a/dev-python/pytz/Manifest
+++ b/dev-python/pytz/Manifest
@@ -1,3 +1 @@
-DIST pytz-2022.1.tar.gz 320473 BLAKE2B 9a745629a9e4547f8c8765353e58baa6d63e3e6b357e9ca88f69928fb9350cebb6bb3371eee419b4b92b29e6253f8c24af8c781f10d72211d78cb699043496fe SHA512 7737aa28626743026b7de932b27bf44d7b209f495d9dd7f90c6448ec271e007f23004fcd04982e2ca6d0a4075206e1dae7b8836319c299b5559c514366d518a6
 DIST pytz-2022.2.1.tar.gz 316105 BLAKE2B 74a3f416c5e15a050cc62594851d80022c81cb611e6c1d1130cfc7e1bc9cb3b833edca9e67203695c50abb7587bf514216f8c0153890658bc8a9f1498e82f867 SHA512 9c78d9f484e2e0e101ca7e10fba8e6c9870255b2c320b3499a0cc9b480adac64b07f2f124048aa957c6bc9311a4ac43060368e1f0d85d8e8c8f7df598e47912b
-DIST pytz-2022.2.tar.gz 322487 BLAKE2B 37aa920a571b751e7fe55140561f9d895273c63c5ec4f0ce32e12a9966c903de590d1bbeb8c3d29eeb6ffa46ecf68584128aefc4349c3fde2af923f275c1c01c SHA512 7a908801585f95dc7e19756b454b38ca991e3c280ab4d946152ff0ecfb5ac89e266b21c5a165797ec64c9aaaaadf729f935d7eebd3f918df3143bd68b23876cf

diff --git a/dev-python/pytz/files/pytz-2020.5-system-zoneinfo.patch b/dev-python/pytz/files/pytz-2020.5-system-zoneinfo.patch
deleted file mode 100644
index 94bad7e234ac..000000000000
--- a/dev-python/pytz/files/pytz-2020.5-system-zoneinfo.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/pytz/__init__.py b/pytz/__init__.py
-index a1f75b6..f2a2330 100644
---- a/pytz/__init__.py
-+++ b/pytz/__init__.py
-@@ -92,8 +92,7 @@ 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__),
--                                'zoneinfo', *name_parts)
-+        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
-diff --git a/setup.py b/setup.py
-index e31ff2b..ba6926b 100644
---- a/setup.py
-+++ b/setup.py
-@@ -15,14 +15,8 @@ me = 'Stuart Bishop'
- memail = 'stuart@stuartbishop.net'
- packages = ['pytz']
- resources = ['zone.tab', 'locales/pytz.pot']
--for dirpath, dirnames, filenames in os.walk(os.path.join('pytz', 'zoneinfo')):
--    # remove the 'pytz' part of the path
--    basepath = dirpath.split(os.path.sep, 1)[1]
--    resources.extend([os.path.join(basepath, filename) for filename in filenames])
- package_data = {'pytz': resources}
- 
--assert len(resources) > 10, 'zoneinfo files not found!'
--
- setup(
-     name='pytz',
-     version=pytz.VERSION,

diff --git a/dev-python/pytz/pytz-2022.1.ebuild b/dev-python/pytz/pytz-2022.1.ebuild
deleted file mode 100644
index ddd2ce81c6a3..000000000000
--- a/dev-python/pytz/pytz-2022.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="World timezone definitions for Python"
-HOMEPAGE="
-	https://pythonhosted.org/pytz/
-	https://pypi.org/project/pytz/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE=""
-
-DEPEND="
-	|| (
-		>=sys-libs/timezone-data-2017a
-		sys-libs/glibc[vanilla]
-	)
-"
-RDEPEND="
-	${DEPEND}
-"
-
-PATCHES=(
-	# Use timezone-data zoneinfo.
-	"${FILESDIR}"/pytz-2020.5-system-zoneinfo.patch
-)
-
-python_test() {
-	"${EPYTHON}" pytz/tests/test_tzinfo.py -v ||
-		die "Tests fail with ${EPYTHON}"
-}

diff --git a/dev-python/pytz/pytz-2022.2.ebuild b/dev-python/pytz/pytz-2022.2.ebuild
deleted file mode 100644
index 02775780a89a..000000000000
--- a/dev-python/pytz/pytz-2022.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="World timezone definitions for Python"
-HOMEPAGE="
-	https://pythonhosted.org/pytz/
-	https://pypi.org/project/pytz/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-DEPEND="
-	|| (
-		>=sys-libs/timezone-data-2017a
-		sys-libs/glibc[vanilla]
-	)
-"
-RDEPEND="${DEPEND}"
-
-python_test() {
-	"${EPYTHON}" pytz/tests/test_tzinfo.py -v ||
-		die "Tests fail with ${EPYTHON}"
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/pytz/, dev-python/pytz/files/
@ 2023-03-30 15:41 Michał Górny
  0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2023-03-30 15:41 UTC (permalink / raw
  To: gentoo-commits

commit:     dcfc92cb1264ed25655a035d5cf4993ee384c1f6
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 30 15:09:44 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Mar 30 15:40:57 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcfc92cb

dev-python/pytz: Fix resource leak in system-tzinfo patch

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/pytz/files/pytz-2023.2-system-tzinfo.patch            | 7 ++++---
 dev-python/pytz/{pytz-2023.2-r1.ebuild => pytz-2023.2-r2.ebuild} | 0
 dev-python/pytz/{pytz-2023.3.ebuild => pytz-2023.3-r1.ebuild}    | 0
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dev-python/pytz/files/pytz-2023.2-system-tzinfo.patch b/dev-python/pytz/files/pytz-2023.2-system-tzinfo.patch
index 1e64f1bd2fa4..85b639f0e615 100644
--- a/dev-python/pytz/files/pytz-2023.2-system-tzinfo.patch
+++ b/dev-python/pytz/files/pytz-2023.2-system-tzinfo.patch
@@ -7,7 +7,7 @@ diff --git a/pytz/__init__.py b/pytz/__init__.py
 index f89d0eb..d00f3bb 100644
 --- a/pytz/__init__.py
 +++ b/pytz/__init__.py
-@@ -75,6 +75,20 @@ else:  # Python 2.x
+@@ -75,6 +75,21 @@ else:  # Python 2.x
          return s.encode('ASCII')
  
  
@@ -15,8 +15,9 @@ index f89d0eb..d00f3bb 100644
 +    for dirpath, dirnames, filenames in os.walk(_PYTZ_TZDATADIR):
 +        for f in filenames:
 +            p = os.path.join(dirpath, f)
-+            if open(p, 'rb').read(4) == b'TZif':
-+                yield os.path.relpath(p, _PYTZ_TZDATADIR)
++            with open(p, 'rb') as tzfile:
++                if tzfile.read(4) == b'TZif':
++                    yield os.path.relpath(p, _PYTZ_TZDATADIR)
 +
 +
 +_PYTZ_TZDATADIR = os.environ.get('PYTZ_TZDATADIR', '/usr/share/zoneinfo')

diff --git a/dev-python/pytz/pytz-2023.2-r1.ebuild b/dev-python/pytz/pytz-2023.2-r2.ebuild
similarity index 100%
rename from dev-python/pytz/pytz-2023.2-r1.ebuild
rename to dev-python/pytz/pytz-2023.2-r2.ebuild

diff --git a/dev-python/pytz/pytz-2023.3.ebuild b/dev-python/pytz/pytz-2023.3-r1.ebuild
similarity index 100%
rename from dev-python/pytz/pytz-2023.3.ebuild
rename to dev-python/pytz/pytz-2023.3-r1.ebuild


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2023-03-30 15:41 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-14 12:37 [gentoo-commits] repo/gentoo:master commit in: dev-python/pytz/, dev-python/pytz/files/ Dirkjan Ochtman
  -- strict thread matches above, loose matches on Subject: below --
2020-12-25  9:17 Michał Górny
2021-02-19  8:35 Michał Górny
2022-09-20  5:57 Michał Górny
2023-03-30 15:41 Michał Górny

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox