commit: d4994527bdbaeeead40e730eaabd364c407c5c92 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Dec 30 18:25:35 2023 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Dec 30 18:26:31 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4994527
dev-python/braintree: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/braintree/Manifest | 2 - dev-python/braintree/braintree-4.23.0.ebuild | 44 ------------ dev-python/braintree/braintree-4.24.0.ebuild | 39 ----------- .../braintree/files/braintree-4.23.0-py312.patch | 81 ---------------------- 4 files changed, 166 deletions(-) diff --git a/dev-python/braintree/Manifest b/dev-python/braintree/Manifest index 8cc0a12ef166..176825af3d95 100644 --- a/dev-python/braintree/Manifest +++ b/dev-python/braintree/Manifest @@ -1,3 +1 @@ -DIST braintree_python-4.23.0.gh.tar.gz 220576 BLAKE2B 23d158c0216a63ce7746a521c339663dc4f1fcc355f3cf65d526c19f7b6a29e49da6a8905059a1410bcf0390c7d44bc267963d68e44e5f4ddc0de57b2500c06f SHA512 e5be83985a6605e68317eafa7533e826d3965707e691791a045f1cbeddded718b21d62e5156c402142228742b13de9859e586b4236865ea675c5c57a3410ffb3 -DIST braintree_python-4.24.0.gh.tar.gz 223640 BLAKE2B ac3c7b1dbf7f781f9e9a08366b28bbb1306a8e5b48c9c57a8bdf9dce2b57f974009b6ba2d351e0f81c9967e6fea12316f254684b7a0753bb3f548284cd51a3e8 SHA512 6620903ce50c613a5cdfab8dac96f37ccbf36ef1cc74c217ca4a00f86c840bc2f0525942d2deebf3ca20a3346b010a9e6d4a81fa75e1536b9d13ea46e6f38009 DIST braintree_python-4.25.0.gh.tar.gz 224552 BLAKE2B 05f4fda190fd7d9a7d9a32b5e05c4255de8d37540df247833bdf80c8fbd219b80f743f0f839b8804bc9732eaf13ca3a44c53c399d766c4e5301bcd761e02690d SHA512 2d6ad2e787cc40d7da4abd6a01b34f8c25e0191cf1e4d706cf02674c21f454ffc4e22f2a2629440984cea95f83a8e968175e8f2c65ed77f868f505f34cd91e16 diff --git a/dev-python/braintree/braintree-4.23.0.ebuild b/dev-python/braintree/braintree-4.23.0.ebuild deleted file mode 100644 index 06d433d74228..000000000000 --- a/dev-python/braintree/braintree-4.23.0.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 2020-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) - -inherit distutils-r1 - -MY_P=braintree_python-${PV} -DESCRIPTION="Braintree Python Library" -HOMEPAGE=" - https://developer.paypal.com/braintree/docs/reference/overview/ - https://github.com/braintree/braintree_python/ - https://pypi.org/project/braintree/ -" -# no tests in sdist, as of 4.19.0 -SRC_URI=" - https://github.com/braintree/braintree_python/archive/${PV}.tar.gz - -> ${MY_P}.gh.tar.gz -" -S=${WORKDIR}/${MY_P} - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - >=dev-python/requests-0.11.1[${PYTHON_USEDEP}] -" - -DOCS=( README.md ) - -distutils_enable_tests unittest - -PATCHES=( - # https://github.com/braintree/braintree_python/pull/154 - "${FILESDIR}/${P}-py312.patch" -) - -python_test() { - eunittest tests/unit -} diff --git a/dev-python/braintree/braintree-4.24.0.ebuild b/dev-python/braintree/braintree-4.24.0.ebuild deleted file mode 100644 index 8b60825aff84..000000000000 --- a/dev-python/braintree/braintree-4.24.0.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 2020-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) - -inherit distutils-r1 - -MY_P=braintree_python-${PV} -DESCRIPTION="Braintree Python Library" -HOMEPAGE=" - https://developer.paypal.com/braintree/docs/reference/overview/ - https://github.com/braintree/braintree_python/ - https://pypi.org/project/braintree/ -" -# no tests in sdist, as of 4.19.0 -SRC_URI=" - https://github.com/braintree/braintree_python/archive/${PV}.tar.gz - -> ${MY_P}.gh.tar.gz -" -S=${WORKDIR}/${MY_P} - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - >=dev-python/requests-0.11.1[${PYTHON_USEDEP}] -" - -DOCS=( README.md ) - -distutils_enable_tests unittest - -python_test() { - eunittest tests/unit -} diff --git a/dev-python/braintree/files/braintree-4.23.0-py312.patch b/dev-python/braintree/files/braintree-4.23.0-py312.patch deleted file mode 100644 index 4ecbd9e555dd..000000000000 --- a/dev-python/braintree/files/braintree-4.23.0-py312.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 9fbdf874ef6a6874db5e98cb2c93ab9736810d4e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgo...@gentoo.org> -Date: Sun, 29 Oct 2023 11:18:56 +0100 -Subject: [PATCH] Fix test suite compatibility with Python 3.12 - -Replace the deprecated `unittest.TestCase.assertRaisesRegexp()` method -with `assertRaisesRegex()`. The former is no longer present in Python -3.12, while the latter is available since Python 3.2. - -Replace the deprecated `imp.reload()` function with -`importlib.reload()`. The former module is no longer present -in Python 3.12, while `importlib.reload()` is available since -Python 3.4. - -With these changes, unit tests pass with Python 3.12.0. - -Fixes #153 ---- - CHANGELOG.md | 3 +++ - tests/unit/test_client_token.py | 2 +- - tests/unit/test_configuration.py | 6 +++--- - 3 files changed, 7 insertions(+), 4 deletions(-) - -diff --git a/CHANGELOG.md b/CHANGELOG.md -index 56e4373..792ee9c 100644 ---- a/CHANGELOG.md -+++ b/CHANGELOG.md -@@ -1,5 +1,8 @@ - # Changelog - -+## 4.24.0 -+* Fix unittest compatibility with Python 3.12 -+ - ## 4.23.0 - * Deprecate `evidenceSubmittable` in Dispute - * Add missing `escape` calls in `generator` for: -diff --git a/tests/unit/test_client_token.py b/tests/unit/test_client_token.py -index 7216a6b..74eb8a2 100644 ---- a/tests/unit/test_client_token.py -+++ b/tests/unit/test_client_token.py -@@ -3,7 +3,7 @@ from tests.test_helper import * - class TestClientToken(unittest.TestCase): - def test_credit_card_options_require_customer_id(self): - for option in ["verify_card", "make_default", "fail_on_duplicate_payment_method"]: -- with self.assertRaisesRegexp(InvalidSignatureError, option): -+ with self.assertRaisesRegex(InvalidSignatureError, option): - ClientToken.generate({ - "options": {option: True} - }) -diff --git a/tests/unit/test_configuration.py b/tests/unit/test_configuration.py -index cf82831..5b24540 100644 ---- a/tests/unit/test_configuration.py -+++ b/tests/unit/test_configuration.py -@@ -1,13 +1,13 @@ - from tests.test_helper import * - import braintree - import os --import imp -+import importlib - - class TestConfiguration(unittest.TestCase): - def test_works_with_unconfigured_configuration(self): - try: - # reset class level attributes on Configuration set in test helper -- imp.reload(braintree.configuration) -+ importlib.reload(braintree.configuration) - config = Configuration( - environment=braintree.Environment.Sandbox, - merchant_id='my_merchant_id', -@@ -21,7 +21,7 @@ class TestConfiguration(unittest.TestCase): - finally: - # repopulate class level attributes on Configuration - import tests.test_helper -- imp.reload(tests.test_helper) -+ importlib.reload(tests.test_helper) - - def test_base_merchant_path_for_development(self): - self.assertEqual("/merchants/integration_merchant_id", Configuration.instantiate().base_merchant_path()) --- -2.42.0 -