* [gentoo-commits] repo/gentoo:master commit in: dev-python/isort/, dev-python/isort/files/
@ 2019-12-06 19:18 Patrick McLean
0 siblings, 0 replies; 5+ messages in thread
From: Patrick McLean @ 2019-12-06 19:18 UTC (permalink / raw
To: gentoo-commits
commit: 5e78d68ea903198a5b3a9bbe72d00c731e250231
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Fri Dec 6 19:18:09 2019 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Fri Dec 6 19:18:31 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e78d68e
dev-python/isort-4.3.21_p2: Version bump, add py38, pypy3
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
dev-python/isort/Manifest | 1 +
dev-python/isort/files/isort-4.3.21_p1-tests.patch | 36 ++++++++++++++++++++++
dev-python/isort/isort-4.3.21_p2.ebuild | 32 +++++++++++++++++++
3 files changed, 69 insertions(+)
diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index 4df4bd97712..80b4bd481b3 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -1,2 +1,3 @@
DIST isort-4.2.5.tar.gz 36361 BLAKE2B 7133ab999200412bc880a5413de81ff0b7718383eaf7f50dd1ca12da4d7ee24f8d47af60e7416ca6898a32074779c4f293d897a0f7d62c2539b10a686484c121 SHA512 ddc8e859bb421e4179315d74896958c8279394d42a75494db5dc22c58422994aa249b63c03645626a021ccf9142941bde51ad400256ab1c6be29da8110375f40
DIST isort-4.3.15.tar.gz 67949 BLAKE2B e78960518928cd74c15733bbc14bf066798ecbcc3e906754c10e352e7b88843451a1d0616d1b450100c77e95974f863951d640c9568277e867fcdfba8f44abdb SHA512 a5774d4f3c49c978e9043e52681e80011591422e60178d72074142725d9d7fa5065553686fd42bffe9e71b38b2b5bdaaa6f20e32cd8dbe33beb9431c397d78e5
+DIST isort-4.3.21_p2.tar.gz 158539 BLAKE2B 316703ca754c939e4af0db4a1060fb13a5164797a672b3faeb585a81fa0c86453fb0f1953b789661588cd0f04267a28837d46a88093a838391f752afa43e9f8b SHA512 fc2aa00c87196864864d2516b8be7acdedcf40d71d1931510e4b878dbd2b6da0b579661b50221f03f4aa5560c8bf23d5e1e10a2694d2b741ca09a92e40a4c687
diff --git a/dev-python/isort/files/isort-4.3.21_p1-tests.patch b/dev-python/isort/files/isort-4.3.21_p1-tests.patch
new file mode 100644
index 00000000000..9ece5ff6de9
--- /dev/null
+++ b/dev-python/isort/files/isort-4.3.21_p1-tests.patch
@@ -0,0 +1,36 @@
+diff --git a/test_isort.py b/test_isort.py
+index 9d9297c..725b1e1 100644
+--- a/test_isort.py
++++ b/test_isort.py
+@@ -1539,6 +1539,7 @@ def test_custom_sections():
+ "import p24.shared.media_wiki_syntax as syntax\n")
+
+
++@pytest.mark.skip("Not going to pull in Django for a couple of tests")
+ def test_glob_known():
+ """Ensure that most specific placement control match wins"""
+ test_input = ("import os\n"
+@@ -2599,6 +2600,7 @@ def test_new_lines_are_preserved():
+ os.remove(n_newline.name)
+
+
++@pytest.mark.skip("Not going to pull in Django for a couple of tests")
+ def test_requirements_finder(tmpdir):
+ subdir = tmpdir.mkdir('subdir').join("lol.txt")
+ subdir.write("flask")
+@@ -2675,6 +2677,7 @@ deal = {editable = true, git = "https://github.com/orsinium/deal.git"}
+ """
+
+
++@pytest.mark.skip("Not going to pull in Django for a couple of tests")
+ def test_pipfile_finder(tmpdir):
+ pipfile = tmpdir.join('Pipfile')
+ pipfile.write(PIPFILE)
+@@ -2979,6 +2982,7 @@ def test_skip_paths_issue_938(tmpdir):
+ assert b'skipped 1' in results.lower()
+
+
++@pytest.mark.skipif(sys.version_info[0] == 2, reason="Broken on Python 2")
+ def test_standard_library_deprecates_user_issue_778():
+ test_input = ('import os\n'
+ '\n'
diff --git a/dev-python/isort/isort-4.3.21_p2.ebuild b/dev-python/isort/isort-4.3.21_p2.ebuild
new file mode 100644
index 00000000000..c55537150d5
--- /dev/null
+++ b/dev-python/isort/isort-4.3.21_p2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+
+inherit distutils-r1
+
+MY_PV="${PV//_p/-}"
+
+DESCRIPTION="A python utility/library to sort imports"
+HOMEPAGE="https://pypi.org/project/isort/"
+SRC_URI="https://github.com/timothycrosley/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/pipfile[${PYTHON_USEDEP}]
+ virtual/python-futures[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' -2)
+"
+BDEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/isort-4.3.21_p1-tests.patch"
+)
+
+distutils_enable_tests pytest
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/isort/, dev-python/isort/files/
@ 2020-12-31 6:39 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2020-12-31 6:39 UTC (permalink / raw
To: gentoo-commits
commit: bc4f8b1b3cda6ec6ba2879dfa1883d6468241158
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 31 06:36:28 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 31 06:36:28 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc4f8b1b
dev-python/isort: cleanup old
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-python/isort/Manifest | 2 --
dev-python/isort/files/isort-4.3.21_p1-tests.patch | 36 ----------------------
dev-python/isort/isort-4.3.15.ebuild | 15 ---------
dev-python/isort/isort-4.3.21_p2-r1.ebuild | 35 ---------------------
4 files changed, 88 deletions(-)
diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index 5fa3daa7f3d..234ea6aa5d2 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -1,4 +1,2 @@
-DIST isort-4.3.15.tar.gz 67949 BLAKE2B e78960518928cd74c15733bbc14bf066798ecbcc3e906754c10e352e7b88843451a1d0616d1b450100c77e95974f863951d640c9568277e867fcdfba8f44abdb SHA512 a5774d4f3c49c978e9043e52681e80011591422e60178d72074142725d9d7fa5065553686fd42bffe9e71b38b2b5bdaaa6f20e32cd8dbe33beb9431c397d78e5
-DIST isort-4.3.21_p2.tar.gz 158539 BLAKE2B 316703ca754c939e4af0db4a1060fb13a5164797a672b3faeb585a81fa0c86453fb0f1953b789661588cd0f04267a28837d46a88093a838391f752afa43e9f8b SHA512 fc2aa00c87196864864d2516b8be7acdedcf40d71d1931510e4b878dbd2b6da0b579661b50221f03f4aa5560c8bf23d5e1e10a2694d2b741ca09a92e40a4c687
DIST isort-5.6.3.tar.gz 161712 BLAKE2B ffbc2977016807d2bd5b1644377efad021af2ad27fd0e27feae1e5dfdfd112c7b5bf4b296ebf47ea6bfcbfe7f56cf3bfa8e1e7cf03963935660e678223397afb SHA512 fa2d9be306d03fc802aab3915bee2c41f4fe0c28353d9d99aa6604755e1602027cd81afca92b4302f80497c88a9dcb2701ec02ca55a5f9a2866669a68368d957
DIST isort-5.7.0.tar.gz 169353 BLAKE2B bafd6a0ce81ed80a3c1ad53ce320361ef11bc01a78211ad13b7947aafddd4d9bb5a4fbf65ec01d4c90dce7ebd0a2e3b1c4dcad729b1e27b1dd2c5c90c802eecf SHA512 ae5ff56394f495f6bd86f7581e0f8a67264671553b344b9dc2c5ba0b37f483ae500ebba9882ff5c315b913a689901b17de2eac403e0b4240f913c9e1864bab9f
diff --git a/dev-python/isort/files/isort-4.3.21_p1-tests.patch b/dev-python/isort/files/isort-4.3.21_p1-tests.patch
deleted file mode 100644
index 9ece5ff6de9..00000000000
--- a/dev-python/isort/files/isort-4.3.21_p1-tests.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/test_isort.py b/test_isort.py
-index 9d9297c..725b1e1 100644
---- a/test_isort.py
-+++ b/test_isort.py
-@@ -1539,6 +1539,7 @@ def test_custom_sections():
- "import p24.shared.media_wiki_syntax as syntax\n")
-
-
-+@pytest.mark.skip("Not going to pull in Django for a couple of tests")
- def test_glob_known():
- """Ensure that most specific placement control match wins"""
- test_input = ("import os\n"
-@@ -2599,6 +2600,7 @@ def test_new_lines_are_preserved():
- os.remove(n_newline.name)
-
-
-+@pytest.mark.skip("Not going to pull in Django for a couple of tests")
- def test_requirements_finder(tmpdir):
- subdir = tmpdir.mkdir('subdir').join("lol.txt")
- subdir.write("flask")
-@@ -2675,6 +2677,7 @@ deal = {editable = true, git = "https://github.com/orsinium/deal.git"}
- """
-
-
-+@pytest.mark.skip("Not going to pull in Django for a couple of tests")
- def test_pipfile_finder(tmpdir):
- pipfile = tmpdir.join('Pipfile')
- pipfile.write(PIPFILE)
-@@ -2979,6 +2982,7 @@ def test_skip_paths_issue_938(tmpdir):
- assert b'skipped 1' in results.lower()
-
-
-+@pytest.mark.skipif(sys.version_info[0] == 2, reason="Broken on Python 2")
- def test_standard_library_deprecates_user_issue_778():
- test_input = ('import os\n'
- '\n'
diff --git a/dev-python/isort/isort-4.3.15.ebuild b/dev-python/isort/isort-4.3.15.ebuild
deleted file mode 100644
index fb2cabcf1a3..00000000000
--- a/dev-python/isort/isort-4.3.15.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1
-
-DESCRIPTION="A python utility/library to sort imports"
-HOMEPAGE="https://pypi.org/project/isort/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
diff --git a/dev-python/isort/isort-4.3.21_p2-r1.ebuild b/dev-python/isort/isort-4.3.21_p2-r1.ebuild
deleted file mode 100644
index 5d9e679b496..00000000000
--- a/dev-python/isort/isort-4.3.21_p2-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-MY_PV="${PV//_p/-}"
-
-DESCRIPTION="A python utility/library to sort imports"
-HOMEPAGE="https://pypi.org/project/isort/"
-SRC_URI="https://github.com/timothycrosley/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
-
-RDEPEND="
- dev-python/pipfile[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/isort-4.3.21_p1-tests.patch"
-)
-
-distutils_enable_tests pytest
-
-python_test() {
- distutils_install_for_testing
- pytest -vv || die "Tests failed with ${EPYTHON}"
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/isort/, dev-python/isort/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: cf90186660bce46085d45a01abdf9f9d6c4768d9
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 19 08:31:17 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Feb 19 08:31:17 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf901866
dev-python/isort: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/isort/Manifest | 2 -
dev-python/isort/files/isort-4.3.21_p1-tests.patch | 36 ---------------
dev-python/isort/isort-4.3.21_p2-r1.ebuild | 35 --------------
dev-python/isort/isort-5.6.3.ebuild | 53 ----------------------
4 files changed, 126 deletions(-)
diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index 313bd85ef40..5ed88ff8be1 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -1,3 +1 @@
-DIST isort-4.3.21_p2.tar.gz 158539 BLAKE2B 316703ca754c939e4af0db4a1060fb13a5164797a672b3faeb585a81fa0c86453fb0f1953b789661588cd0f04267a28837d46a88093a838391f752afa43e9f8b SHA512 fc2aa00c87196864864d2516b8be7acdedcf40d71d1931510e4b878dbd2b6da0b579661b50221f03f4aa5560c8bf23d5e1e10a2694d2b741ca09a92e40a4c687
-DIST isort-5.6.3.tar.gz 161712 BLAKE2B ffbc2977016807d2bd5b1644377efad021af2ad27fd0e27feae1e5dfdfd112c7b5bf4b296ebf47ea6bfcbfe7f56cf3bfa8e1e7cf03963935660e678223397afb SHA512 fa2d9be306d03fc802aab3915bee2c41f4fe0c28353d9d99aa6604755e1602027cd81afca92b4302f80497c88a9dcb2701ec02ca55a5f9a2866669a68368d957
DIST isort-5.7.0.tar.gz 169353 BLAKE2B bafd6a0ce81ed80a3c1ad53ce320361ef11bc01a78211ad13b7947aafddd4d9bb5a4fbf65ec01d4c90dce7ebd0a2e3b1c4dcad729b1e27b1dd2c5c90c802eecf SHA512 ae5ff56394f495f6bd86f7581e0f8a67264671553b344b9dc2c5ba0b37f483ae500ebba9882ff5c315b913a689901b17de2eac403e0b4240f913c9e1864bab9f
diff --git a/dev-python/isort/files/isort-4.3.21_p1-tests.patch b/dev-python/isort/files/isort-4.3.21_p1-tests.patch
deleted file mode 100644
index 9ece5ff6de9..00000000000
--- a/dev-python/isort/files/isort-4.3.21_p1-tests.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/test_isort.py b/test_isort.py
-index 9d9297c..725b1e1 100644
---- a/test_isort.py
-+++ b/test_isort.py
-@@ -1539,6 +1539,7 @@ def test_custom_sections():
- "import p24.shared.media_wiki_syntax as syntax\n")
-
-
-+@pytest.mark.skip("Not going to pull in Django for a couple of tests")
- def test_glob_known():
- """Ensure that most specific placement control match wins"""
- test_input = ("import os\n"
-@@ -2599,6 +2600,7 @@ def test_new_lines_are_preserved():
- os.remove(n_newline.name)
-
-
-+@pytest.mark.skip("Not going to pull in Django for a couple of tests")
- def test_requirements_finder(tmpdir):
- subdir = tmpdir.mkdir('subdir').join("lol.txt")
- subdir.write("flask")
-@@ -2675,6 +2677,7 @@ deal = {editable = true, git = "https://github.com/orsinium/deal.git"}
- """
-
-
-+@pytest.mark.skip("Not going to pull in Django for a couple of tests")
- def test_pipfile_finder(tmpdir):
- pipfile = tmpdir.join('Pipfile')
- pipfile.write(PIPFILE)
-@@ -2979,6 +2982,7 @@ def test_skip_paths_issue_938(tmpdir):
- assert b'skipped 1' in results.lower()
-
-
-+@pytest.mark.skipif(sys.version_info[0] == 2, reason="Broken on Python 2")
- def test_standard_library_deprecates_user_issue_778():
- test_input = ('import os\n'
- '\n'
diff --git a/dev-python/isort/isort-4.3.21_p2-r1.ebuild b/dev-python/isort/isort-4.3.21_p2-r1.ebuild
deleted file mode 100644
index c07bf368c12..00000000000
--- a/dev-python/isort/isort-4.3.21_p2-r1.ebuild
+++ /dev/null
@@ -1,35 +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} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-MY_PV="${PV//_p/-}"
-
-DESCRIPTION="A python utility/library to sort imports"
-HOMEPAGE="https://pypi.org/project/isort/"
-SRC_URI="https://github.com/timothycrosley/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
- dev-python/pipfile[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/isort-4.3.21_p1-tests.patch"
-)
-
-distutils_enable_tests pytest
-
-python_test() {
- distutils_install_for_testing
- pytest -vv || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/isort/isort-5.6.3.ebuild b/dev-python/isort/isort-5.6.3.ebuild
deleted file mode 100644
index 5476eecba44..00000000000
--- a/dev-python/isort/isort-5.6.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A python utility/library to sort imports"
-HOMEPAGE="https://pypi.org/project/isort/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-BDEPEND="
- test? (
- dev-python/black[${PYTHON_USEDEP}]
- dev-python/colorama[${PYTHON_USEDEP}]
- dev-python/hypothesis[${PYTHON_USEDEP}]
- dev-python/pylama[${PYTHON_USEDEP}]
- dev-python/pytest-mock[${PYTHON_USEDEP}]
- dev-vcs/git
- )
-"
-
-distutils_enable_tests pytest
-
-python_test() {
- # Some tests run the "isort" command
- distutils_install_for_testing --via-root
-
- local skipped_tests=(
- # Fails without -s, run it separately to avoid unnecessary output
- tests/unit/test_importable.py
- # Excluded from upstream's test script
- tests/unit/test_deprecated_finders.py
- # Require "example_isort_formatting_plugin", we're not going
- # to add an example package just to run a few tests
- tests/unit/test_literal.py::test_value_assignment_list
- tests/unit/test_ticketed_features.py::test_isort_supports_formatting_plugins_issue_1353
- tests/unit/test_ticketed_features.py::test_isort_literals_issue_1358
- # Same here: requires "example_shared_isort_profile"
- tests/unit/test_ticketed_features.py::test_isort_supports_shared_profiles_issue_970
- )
- pytest -s tests/unit/test_importable.py \
- || die "Tests failed with ${EPYTHON}"
- pytest -vv tests/unit ${skipped_tests[@]/#/--deselect } \
- || die "Tests failed with ${EPYTHON}"
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/isort/, dev-python/isort/files/
@ 2023-11-06 13:22 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2023-11-06 13:22 UTC (permalink / raw
To: gentoo-commits
commit: cbf0ba8d926be7101a8d7cbf19cd2061dbc8584c
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 6 13:07:41 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Nov 6 13:22:30 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbf0ba8d
dev-python/isort: Enable py3.12
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/isort/files/isort-5.12.0-py312.patch | 40 +++++++++++++++++++++++++
dev-python/isort/isort-5.12.0.ebuild | 7 ++++-
2 files changed, 46 insertions(+), 1 deletion(-)
diff --git a/dev-python/isort/files/isort-5.12.0-py312.patch b/dev-python/isort/files/isort-5.12.0-py312.patch
new file mode 100644
index 000000000000..a6de4a75311b
--- /dev/null
+++ b/dev-python/isort/files/isort-5.12.0-py312.patch
@@ -0,0 +1,40 @@
+From abfb91fd7da34111828d81a20fe7aeaaab7a58c7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Mon, 6 Nov 2023 13:29:21 +0100
+Subject: [PATCH] Fix assertions in `test_git_hook`
+
+Fix `called_once()` assertions in `test_git_hook` to use the correct
+`assert_called_once()` method. The former does not exist, so it
+evaluates to a mocked method in Python < 3.12, making the assert
+meaningless, and it triggers an error in Python 3.12+.
+
+While at it, split the mock into two because otherwise the test would
+fail because two `hooks.git_hook()` calls imply two mock calls.
+---
+ tests/unit/test_hooks.py | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/tests/unit/test_hooks.py b/tests/unit/test_hooks.py
+index 2757f414f..29685f503 100644
+--- a/tests/unit/test_hooks.py
++++ b/tests/unit/test_hooks.py
+@@ -11,7 +11,7 @@ def test_git_hook(src_dir):
+ # Ensure correct subprocess command is called
+ with patch("subprocess.run", MagicMock()) as run_mock:
+ hooks.git_hook()
+- assert run_mock.called_once()
++ run_mock.assert_called_once()
+ assert run_mock.call_args[0][0] == [
+ "git",
+ "diff-index",
+@@ -21,8 +21,9 @@ def test_git_hook(src_dir):
+ "HEAD",
+ ]
+
++ with patch("subprocess.run", MagicMock()) as run_mock:
+ hooks.git_hook(lazy=True)
+- assert run_mock.called_once()
++ run_mock.assert_called_once()
+ assert run_mock.call_args[0][0] == [
+ "git",
+ "diff-index",
diff --git a/dev-python/isort/isort-5.12.0.ebuild b/dev-python/isort/isort-5.12.0.ebuild
index 6a9a23af7de4..e3f28e100a52 100644
--- a/dev-python/isort/isort-5.12.0.ebuild
+++ b/dev-python/isort/isort-5.12.0.ebuild
@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit distutils-r1
@@ -39,6 +39,11 @@ BDEPEND="
distutils_enable_tests pytest
src_prepare() {
+ local PATCHES=(
+ # https://github.com/PyCQA/isort/pull/2196
+ "${FILESDIR}/${P}-py312.patch"
+ )
+
# unbundle tomli
sed -i -e 's:from ._vendored ::' isort/settings.py || die
rm -r isort/_vendored || die
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/isort/, dev-python/isort/files/
@ 2023-12-10 16:15 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2023-12-10 16:15 UTC (permalink / raw
To: gentoo-commits
commit: 2192e1edd72a92aa33aeb76b85d888ee7690bcab
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 10 16:15:08 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Dec 10 16:15:36 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2192e1ed
dev-python/isort: Backport broken dependency fix
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/isort/files/isort-5.13.0-poetry.patch | 16 ++++++++++++++++
.../{isort-5.13.0.ebuild => isort-5.13.0-r1.ebuild} | 6 ++++++
2 files changed, 22 insertions(+)
diff --git a/dev-python/isort/files/isort-5.13.0-poetry.patch b/dev-python/isort/files/isort-5.13.0-poetry.patch
new file mode 100644
index 000000000000..31baa2ec08f8
--- /dev/null
+++ b/dev-python/isort/files/isort-5.13.0-poetry.patch
@@ -0,0 +1,16 @@
+diff --git a/pyproject.toml b/pyproject.toml
+index ae539490..11e229ad 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -41,11 +41,6 @@ include = [
+
+ [tool.poetry.dependencies]
+ python = ">=3.8.0"
+-pipreqs = {version = "*", optional = true}
+-requirementslib = {version = "*", optional = true}
+-pip-api = {version = "*", optional = true}
+-colorama = {version = ">=0.4.6", optional = true}
+-setuptools = {version = "*", optional = true}
+
+ [tool.poetry.extras]
+ colors = ["colorama"]
diff --git a/dev-python/isort/isort-5.13.0.ebuild b/dev-python/isort/isort-5.13.0-r1.ebuild
similarity index 89%
rename from dev-python/isort/isort-5.13.0.ebuild
rename to dev-python/isort/isort-5.13.0-r1.ebuild
index 219f0a3f4657..83f18a7f3177 100644
--- a/dev-python/isort/isort-5.13.0.ebuild
+++ b/dev-python/isort/isort-5.13.0-r1.ebuild
@@ -39,6 +39,12 @@ BDEPEND="
distutils_enable_tests pytest
src_prepare() {
+ local PATCHES=(
+ # sigh, can't people just stop using poetry?!
+ # https://github.com/PyCQA/isort/commit/f7a6b0eea57e87155a367e2490b49b40f83c3944
+ "${FILESDIR}/${P}-poetry.patch"
+ )
+
# unbundle tomli
sed -i -e 's:from ._vendored ::' isort/settings.py || die
rm -r isort/_vendored || die
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-12-10 16:15 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-06 19:18 [gentoo-commits] repo/gentoo:master commit in: dev-python/isort/, dev-python/isort/files/ Patrick McLean
-- strict thread matches above, loose matches on Subject: below --
2020-12-31 6:39 Sam James
2021-02-19 8:35 Michał Górny
2023-11-06 13:22 Michał Górny
2023-12-10 16:15 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