* [gentoo-commits] repo/gentoo:master commit in: dev-python/isort/files/, dev-python/isort/
@ 2020-12-31 7:35 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2020-12-31 7:35 UTC (permalink / raw
To: gentoo-commits
commit: 2c1bb549cdd4f991b50fffebfa5bb46ae2be6d54
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 31 07:34:13 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 31 07:34:13 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c1bb549
Revert "dev-python/isort: cleanup old"
This reverts commit bc4f8b1b3cda6ec6ba2879dfa1883d6468241158.
Still needed for Python 3.6 in some packages:
* dev-python/hcloud-python
* dev-python/pylama
* dev-python/pylint
* net-mail/hyperkitty
* net-mail/postorius
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 insertions(+)
diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index 234ea6aa5d2..5fa3daa7f3d 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -1,2 +1,4 @@
+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
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.15.ebuild b/dev-python/isort/isort-4.3.15.ebuild
new file mode 100644
index 00000000000..fb2cabcf1a3
--- /dev/null
+++ b/dev-python/isort/isort-4.3.15.ebuild
@@ -0,0 +1,15 @@
+# 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
new file mode 100644
index 00000000000..5d9e679b496
--- /dev/null
+++ b/dev-python/isort/isort-4.3.21_p2-r1.ebuild
@@ -0,0 +1,35 @@
+# 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] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/isort/files/, dev-python/isort/
@ 2022-12-21 11:40 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2022-12-21 11:40 UTC (permalink / raw
To: gentoo-commits
commit: 2fb551cbc9570f69c7b59d2cff666fa3904d8502
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 21 09:41:30 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Dec 21 11:40:50 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fb551cb
dev-python/isort: Fix installing junk into site-packages
Closes: https://bugs.gentoo.org/887569
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../isort/files/isort-5.11.3-sitepkg-junk.patch | 35 ++++++++++++++++++++++
...{isort-5.11.3.ebuild => isort-5.11.3-r1.ebuild} | 4 +++
2 files changed, 39 insertions(+)
diff --git a/dev-python/isort/files/isort-5.11.3-sitepkg-junk.patch b/dev-python/isort/files/isort-5.11.3-sitepkg-junk.patch
new file mode 100644
index 000000000000..4843d330a89e
--- /dev/null
+++ b/dev-python/isort/files/isort-5.11.3-sitepkg-junk.patch
@@ -0,0 +1,35 @@
+From a6fdbfd7d82df63c49dcc01b98d25110c0ff4caf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 21 Dec 2022 10:36:42 +0100
+Subject: [PATCH] Stop installing documentation files to top-level
+ site-packages
+
+Add `format = sdist` to `include` table values to prevent
+the documentation files from being installed directly into
+site-packages, i.e.:
+
+ /usr/lib/python3.11/site-packages/CHANGELOG.md
+ /usr/lib/python3.11/site-packages/LICENSE
+
+Originally reported by Anna Vyalkova on https://bugs.gentoo.org/887569.
+---
+ pyproject.toml | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/pyproject.toml b/pyproject.toml
+index eaeafb90..b0608a58 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -34,9 +34,9 @@ classifiers = [
+ urls = { Changelog = "https://github.com/pycqa/isort/blob/main/CHANGELOG.md" }
+ include = [
+ { path = "tests", format = "sdist" },
+- { path = "ACKNOWLEDGEMENTS.md" },
+- { path = "CHANGELOG.md" },
+- { path = "LICENSE" },
++ { path = "ACKNOWLEDGEMENTS.md", format = "sdist" },
++ { path = "CHANGELOG.md", format = "sdist" },
++ { path = "LICENSE", format = "sdist" },
+ ]
+
+ [tool.poetry.dependencies]
diff --git a/dev-python/isort/isort-5.11.3.ebuild b/dev-python/isort/isort-5.11.3-r1.ebuild
similarity index 96%
rename from dev-python/isort/isort-5.11.3.ebuild
rename to dev-python/isort/isort-5.11.3-r1.ebuild
index 3a4a9ec195f1..42e02dc1b62f 100644
--- a/dev-python/isort/isort-5.11.3.ebuild
+++ b/dev-python/isort/isort-5.11.3-r1.ebuild
@@ -40,6 +40,10 @@ BDEPEND="
distutils_enable_tests pytest
src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}"/${P}-sitepkg-junk.patch
+ )
+
# unbundle tomli
sed -i -e 's:from ._vendored ::' isort/settings.py || die
rm -r isort/_vendored || die
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/isort/files/, dev-python/isort/
@ 2023-01-13 17:13 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2023-01-13 17:13 UTC (permalink / raw
To: gentoo-commits
commit: 55b118067f1077121c696b5b7aee01ca6e34b387
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 13 17:11:00 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jan 13 17:11:00 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55b11806
dev-python/isort: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/isort/Manifest | 4 --
.../isort/files/isort-5.11.3-sitepkg-junk.patch | 35 -----------
dev-python/isort/isort-5.10.1-r2.ebuild | 72 ---------------------
dev-python/isort/isort-5.11.1.ebuild | 69 --------------------
dev-python/isort/isort-5.11.2.ebuild | 69 --------------------
dev-python/isort/isort-5.11.3-r1.ebuild | 73 ----------------------
6 files changed, 322 deletions(-)
diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index 4a145b0b6a26..4d7f9756102c 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -1,5 +1 @@
-DIST isort-5.10.1.gh.tar.gz 728462 BLAKE2B 5b892b9849293e8730e6d89592bace62009a8589d185b4d3a5bafded605ccd46fd0f2986fbad5cf1d72321d030e3193a111ab7e6114c6b4a7a67696f546b3a14 SHA512 545c1844bacc1d2d9e87e60b03b30a846ee1ebbfe2a229c3e018a2e1cc6e9a04a3691f1b2e7ec8575806f2341bc1af15eb64904b4eabd786d6b9b289cea5ce2a
-DIST isort-5.11.1.gh.tar.gz 731273 BLAKE2B 9044579ae53df64b78762384eba9b329017c12a1e8208382b56fa76a0d54443379b17463ff547f014d18b0bc06a9d1382b4a7e3c7a44c6a6ada1a8ed836460eb SHA512 0d891bb0b546d01a4bb5ca4f8f62683c8864b396e2c15549b5f40da4c3b630ae9100026f95c7be78aae2e3238e9d173fdb08ea9eca519631f7dea64e0643d4d1
-DIST isort-5.11.2.gh.tar.gz 731273 BLAKE2B 02e135dcf448985ea94dc8e4f077540232099c4f1d671efc34ef7ce113a636b657948c586ab176dd85fc7e431ab54dc7ee3c3fd6515a80dc317fe82809fccf6d SHA512 30d6da4096b0a19686fccafe772ccc45c46a2abf45522afad5d86f3ad9682fd0c3df17349c859d6e359542ef2aa59071613574233d84e8fd90739999582b218c
-DIST isort-5.11.3.gh.tar.gz 733428 BLAKE2B a93b3b44b4b570203520a173b954634b58f124c798f591582be11f40ecaf33e8bb9eb97217426bc228e7951174ee08531bd0af73de5c217c4f38f02ef6be04b3 SHA512 f7e6964097c365f005f387629631fc4177039ce54047f7b8ed76e9ed27331a577139777810cf45c7d7e89054d1b5df67905eec3d8434cefb3b4e73cb1005f4cd
DIST isort-5.11.4.gh.tar.gz 733368 BLAKE2B 82a9738cf48fd662c6128c7f58766e6b204d93fee73cbdd0d84850a62a1a714322dc6c31429a3b043401a963178c4aa3120e98c8f590f24799b75a92f9427798 SHA512 fd7dd8938cc700fa4a295bf1aabb9dc479e1b837e443e3210e4f2234316e207293eeb6f666b49ed2bc4f92942b3185de64439ce86ece201093072fee905766a8
diff --git a/dev-python/isort/files/isort-5.11.3-sitepkg-junk.patch b/dev-python/isort/files/isort-5.11.3-sitepkg-junk.patch
deleted file mode 100644
index 4843d330a89e..000000000000
--- a/dev-python/isort/files/isort-5.11.3-sitepkg-junk.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From a6fdbfd7d82df63c49dcc01b98d25110c0ff4caf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 21 Dec 2022 10:36:42 +0100
-Subject: [PATCH] Stop installing documentation files to top-level
- site-packages
-
-Add `format = sdist` to `include` table values to prevent
-the documentation files from being installed directly into
-site-packages, i.e.:
-
- /usr/lib/python3.11/site-packages/CHANGELOG.md
- /usr/lib/python3.11/site-packages/LICENSE
-
-Originally reported by Anna Vyalkova on https://bugs.gentoo.org/887569.
----
- pyproject.toml | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/pyproject.toml b/pyproject.toml
-index eaeafb90..b0608a58 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -34,9 +34,9 @@ classifiers = [
- urls = { Changelog = "https://github.com/pycqa/isort/blob/main/CHANGELOG.md" }
- include = [
- { path = "tests", format = "sdist" },
-- { path = "ACKNOWLEDGEMENTS.md" },
-- { path = "CHANGELOG.md" },
-- { path = "LICENSE" },
-+ { path = "ACKNOWLEDGEMENTS.md", format = "sdist" },
-+ { path = "CHANGELOG.md", format = "sdist" },
-+ { path = "LICENSE", format = "sdist" },
- ]
-
- [tool.poetry.dependencies]
diff --git a/dev-python/isort/isort-5.10.1-r2.ebuild b/dev-python/isort/isort-5.10.1-r2.ebuild
deleted file mode 100644
index 218db5f02092..000000000000
--- a/dev-python/isort/isort-5.10.1-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A python utility/library to sort imports"
-HOMEPAGE="
- https://github.com/PyCQA/isort/
- https://pypi.org/project/isort/
-"
-SRC_URI="
- https://github.com/PyCQA/isort/archive/${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
- dev-python/tomli[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/black[${PYTHON_USEDEP}]
- dev-python/colorama[${PYTHON_USEDEP}]
- dev-python/hypothesis[${PYTHON_USEDEP}]
- dev-python/natsort[${PYTHON_USEDEP}]
- dev-python/pylama[${PYTHON_USEDEP}]
- dev-python/pytest-mock[${PYTHON_USEDEP}]
- dev-vcs/git
- )
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
- # unbundle tomli
- sed -i -e 's:from ._vendored ::' isort/settings.py || die
- rm -r isort/_vendored || die
- # remove upper bounds from example plugin deps
- # (already removed upstream)
- sed -i -e 's:\^:>=:' example*/pyproject.toml || die
- # leftover toml import used to determine .toml support
- sed -i -e 's:import toml:toml = True:' tests/unit/test_isort.py || die
-
- distutils-r1_src_prepare
-}
-
-python_test() {
- cp -a "${BUILD_DIR}"/{install,test} || die
- local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
-
- # Install necessary plugins
- local p
- for p in example*/; do
- pushd "${p}" >/dev/null || die
- distutils_pep517_install "${BUILD_DIR}"/test
- popd >/dev/null || die
- done
-
- local EPYTEST_IGNORE=(
- # Excluded from upstream's test script
- tests/unit/test_deprecated_finders.py
- )
- epytest tests/unit
-}
diff --git a/dev-python/isort/isort-5.11.1.ebuild b/dev-python/isort/isort-5.11.1.ebuild
deleted file mode 100644
index bd9a3933387a..000000000000
--- a/dev-python/isort/isort-5.11.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A python utility/library to sort imports"
-HOMEPAGE="
- https://github.com/PyCQA/isort/
- https://pypi.org/project/isort/
-"
-SRC_URI="
- https://github.com/PyCQA/isort/archive/${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
- dev-python/tomli[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/black[${PYTHON_USEDEP}]
- dev-python/colorama[${PYTHON_USEDEP}]
- dev-python/hypothesis[${PYTHON_USEDEP}]
- dev-python/natsort[${PYTHON_USEDEP}]
- dev-python/pylama[${PYTHON_USEDEP}]
- dev-python/pytest-mock[${PYTHON_USEDEP}]
- dev-vcs/git
- )
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
- # unbundle tomli
- sed -i -e 's:from ._vendored ::' isort/settings.py || die
- rm -r isort/_vendored || die
- # leftover toml import used to determine .toml support
- sed -i -e 's:import toml:toml = True:' tests/unit/test_isort.py || die
-
- distutils-r1_src_prepare
-}
-
-python_test() {
- cp -a "${BUILD_DIR}"/{install,test} || die
- local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
-
- # Install necessary plugins
- local p
- for p in example*/; do
- pushd "${p}" >/dev/null || die
- distutils_pep517_install "${BUILD_DIR}"/test
- popd >/dev/null || die
- done
-
- local EPYTEST_IGNORE=(
- # Excluded from upstream's test script
- tests/unit/test_deprecated_finders.py
- )
- epytest tests/unit
-}
diff --git a/dev-python/isort/isort-5.11.2.ebuild b/dev-python/isort/isort-5.11.2.ebuild
deleted file mode 100644
index bd9a3933387a..000000000000
--- a/dev-python/isort/isort-5.11.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A python utility/library to sort imports"
-HOMEPAGE="
- https://github.com/PyCQA/isort/
- https://pypi.org/project/isort/
-"
-SRC_URI="
- https://github.com/PyCQA/isort/archive/${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
- dev-python/tomli[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/black[${PYTHON_USEDEP}]
- dev-python/colorama[${PYTHON_USEDEP}]
- dev-python/hypothesis[${PYTHON_USEDEP}]
- dev-python/natsort[${PYTHON_USEDEP}]
- dev-python/pylama[${PYTHON_USEDEP}]
- dev-python/pytest-mock[${PYTHON_USEDEP}]
- dev-vcs/git
- )
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
- # unbundle tomli
- sed -i -e 's:from ._vendored ::' isort/settings.py || die
- rm -r isort/_vendored || die
- # leftover toml import used to determine .toml support
- sed -i -e 's:import toml:toml = True:' tests/unit/test_isort.py || die
-
- distutils-r1_src_prepare
-}
-
-python_test() {
- cp -a "${BUILD_DIR}"/{install,test} || die
- local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
-
- # Install necessary plugins
- local p
- for p in example*/; do
- pushd "${p}" >/dev/null || die
- distutils_pep517_install "${BUILD_DIR}"/test
- popd >/dev/null || die
- done
-
- local EPYTEST_IGNORE=(
- # Excluded from upstream's test script
- tests/unit/test_deprecated_finders.py
- )
- epytest tests/unit
-}
diff --git a/dev-python/isort/isort-5.11.3-r1.ebuild b/dev-python/isort/isort-5.11.3-r1.ebuild
deleted file mode 100644
index 42e02dc1b62f..000000000000
--- a/dev-python/isort/isort-5.11.3-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A python utility/library to sort imports"
-HOMEPAGE="
- https://github.com/PyCQA/isort/
- https://pypi.org/project/isort/
-"
-SRC_URI="
- https://github.com/PyCQA/isort/archive/v${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
- dev-python/tomli[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/black[${PYTHON_USEDEP}]
- dev-python/colorama[${PYTHON_USEDEP}]
- dev-python/hypothesis[${PYTHON_USEDEP}]
- dev-python/natsort[${PYTHON_USEDEP}]
- dev-python/pylama[${PYTHON_USEDEP}]
- dev-python/pytest-mock[${PYTHON_USEDEP}]
- dev-vcs/git
- )
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
- local PATCHES=(
- "${FILESDIR}"/${P}-sitepkg-junk.patch
- )
-
- # unbundle tomli
- sed -i -e 's:from ._vendored ::' isort/settings.py || die
- rm -r isort/_vendored || die
- # leftover toml import used to determine .toml support
- sed -i -e 's:import toml:toml = True:' tests/unit/test_isort.py || die
-
- distutils-r1_src_prepare
-}
-
-python_test() {
- cp -a "${BUILD_DIR}"/{install,test} || die
- local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
-
- # Install necessary plugins
- local p
- for p in example*/; do
- pushd "${p}" >/dev/null || die
- distutils_pep517_install "${BUILD_DIR}"/test
- popd >/dev/null || die
- done
-
- local EPYTEST_IGNORE=(
- # Excluded from upstream's test script
- tests/unit/test_deprecated_finders.py
- )
- epytest tests/unit
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/isort/files/, dev-python/isort/
@ 2023-12-30 14:40 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2023-12-30 14:40 UTC (permalink / raw
To: gentoo-commits
commit: 7567aeb4d9314d1f0071b40305cc4e7744e08f29
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 30 14:36:11 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Dec 30 14:40:08 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7567aeb4
dev-python/isort: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/isort/Manifest | 3 -
dev-python/isort/files/isort-5.12.0-py312.patch | 40 ------------
dev-python/isort/files/isort-5.13.0-poetry.patch | 16 -----
dev-python/isort/isort-5.12.0.ebuild | 79 -----------------------
dev-python/isort/isort-5.13.0-r2.ebuild | 82 ------------------------
dev-python/isort/isort-5.13.1.ebuild | 76 ----------------------
6 files changed, 296 deletions(-)
diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index 268effa60bae..9122a8f7a2dc 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -1,4 +1 @@
-DIST isort-5.12.0.gh.tar.gz 743141 BLAKE2B a7f8deef02b57162eebe15b35e71382c654372a80dedba7eee63d0c9b0899c053fb517401585af17014db3cf9ed44089f6cbd1e2b0ed17393cc667de06bfbddd SHA512 ceb861d1a077be6fecd82fde775bded1fb676c77135e2004c92a6221762e0b3ff6c1071d17957e1add4062ec26ba6c9264e4905724f2c659339cbd0601f4b45e
-DIST isort-5.13.0.gh.tar.gz 753826 BLAKE2B 074e8b762b304618a2291d96dc9e18061e5303f3e6772479e8eda42c687cf289c12c73ce585c869df754b244bf14d59c6d2eba10877756287d88f27a3d470939 SHA512 3c5a170b1526ec58f1c774e4b55e2227df0af23eebd7a387d61cd3eaa0a698b5ad22a0be81a87d4e6a026030ffbdaea0f23331a43e28b5df98bf33b7afe2a42d
-DIST isort-5.13.1.gh.tar.gz 754890 BLAKE2B 53168670d38efa9fba549a32235c47781e200e7ee36289514acc19b127fa5a99d9d97305fbeff1afa9dd6f8f57385f0b01ce57b4bd0ee64e255bcfe144fadbbf SHA512 23a5f7579e327f109575454e5443ee039c207aa0b6f6ad35509cf514b45a7a3fcae116fd8ee40c96d717694cfd85bd7f431481b1a456b7390f914abec2460f42
DIST isort-5.13.2.gh.tar.gz 755256 BLAKE2B 4cc8a0209ba954d93c030e6ad038933b50aa2f17b173762f598bc8038f36f72ecd1e7a3f6e73398bbfc99f464d14927f77044ca68126815023a8d456497985a1 SHA512 fe2bd27f0aa6219d44c3124782d400338a801a911d6a09ad51e7f80cbcbce250838350ad6cc80a35f641e0a319778ddcfb4dc61c8c76999ebc63a5147953e378
diff --git a/dev-python/isort/files/isort-5.12.0-py312.patch b/dev-python/isort/files/isort-5.12.0-py312.patch
deleted file mode 100644
index a6de4a75311b..000000000000
--- a/dev-python/isort/files/isort-5.12.0-py312.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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/files/isort-5.13.0-poetry.patch b/dev-python/isort/files/isort-5.13.0-poetry.patch
deleted file mode 100644
index 31baa2ec08f8..000000000000
--- a/dev-python/isort/files/isort-5.13.0-poetry.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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.12.0.ebuild b/dev-python/isort/isort-5.12.0.ebuild
deleted file mode 100644
index 261752344ba9..000000000000
--- a/dev-python/isort/isort-5.12.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A python utility/library to sort imports"
-HOMEPAGE="
- https://github.com/PyCQA/isort/
- https://pypi.org/project/isort/
-"
-SRC_URI="
- https://github.com/PyCQA/isort/archive/${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
- dev-python/tomli[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/black[${PYTHON_USEDEP}]
- dev-python/colorama[${PYTHON_USEDEP}]
- dev-python/hypothesis[${PYTHON_USEDEP}]
- dev-python/natsort[${PYTHON_USEDEP}]
- dev-python/pytest-mock[${PYTHON_USEDEP}]
- dev-vcs/git
- )
-"
-
-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
-
- distutils-r1_src_prepare
-}
-
-python_test() {
- cp -a "${BUILD_DIR}"/{install,test} || die
- local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
-
- # Install necessary plugins
- local p
- for p in example*/; do
- pushd "${p}" >/dev/null || die
- distutils_pep517_install "${BUILD_DIR}"/test
- popd >/dev/null || die
- done
-
- local EPYTEST_IGNORE=(
- # Excluded from upstream's test script
- tests/unit/test_deprecated_finders.py
- )
-
- if ! has_version "dev-python/pylama[${PYTHON_USEDEP}]"; then
- EPYTEST_IGNORE+=(
- tests/unit/test_importable.py
- tests/unit/test_pylama_isort.py
- )
- fi
-
- epytest tests/unit
-}
diff --git a/dev-python/isort/isort-5.13.0-r2.ebuild b/dev-python/isort/isort-5.13.0-r2.ebuild
deleted file mode 100644
index 739fedb19bdc..000000000000
--- a/dev-python/isort/isort-5.13.0-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A python utility/library to sort imports"
-HOMEPAGE="
- https://github.com/PyCQA/isort/
- https://pypi.org/project/isort/
-"
-SRC_URI="
- https://github.com/PyCQA/isort/archive/${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
- $(python_gen_cond_dep '
- dev-python/tomli[${PYTHON_USEDEP}]
- ' 3.10)
-"
-BDEPEND="
- test? (
- dev-python/black[${PYTHON_USEDEP}]
- >=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
- dev-python/hypothesis[${PYTHON_USEDEP}]
- dev-python/natsort[${PYTHON_USEDEP}]
- dev-python/pytest-mock[${PYTHON_USEDEP}]
- dev-vcs/git
- )
-"
-
-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
-
- distutils-r1_src_prepare
-}
-
-python_test() {
- cp -a "${BUILD_DIR}"/{install,test} || die
- local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
-
- # Install necessary plugins
- local p
- for p in example*/; do
- pushd "${p}" >/dev/null || die
- distutils_pep517_install "${BUILD_DIR}"/test
- popd >/dev/null || die
- done
-
- local EPYTEST_IGNORE=(
- # Excluded from upstream's test script
- tests/unit/test_deprecated_finders.py
- )
-
- if ! has_version "dev-python/pylama[${PYTHON_USEDEP}]"; then
- EPYTEST_IGNORE+=(
- tests/unit/test_importable.py
- tests/unit/test_pylama_isort.py
- )
- fi
-
- epytest tests/unit
-}
diff --git a/dev-python/isort/isort-5.13.1.ebuild b/dev-python/isort/isort-5.13.1.ebuild
deleted file mode 100644
index 2f75471007a0..000000000000
--- a/dev-python/isort/isort-5.13.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A python utility/library to sort imports"
-HOMEPAGE="
- https://github.com/PyCQA/isort/
- https://pypi.org/project/isort/
-"
-SRC_URI="
- https://github.com/PyCQA/isort/archive/${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
- $(python_gen_cond_dep '
- dev-python/tomli[${PYTHON_USEDEP}]
- ' 3.10)
-"
-BDEPEND="
- test? (
- dev-python/black[${PYTHON_USEDEP}]
- >=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
- dev-python/hypothesis[${PYTHON_USEDEP}]
- dev-python/natsort[${PYTHON_USEDEP}]
- dev-python/pytest-mock[${PYTHON_USEDEP}]
- dev-vcs/git
- )
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
- # unbundle tomli
- sed -i -e 's:from ._vendored ::' isort/settings.py || die
- rm -r isort/_vendored || die
-
- distutils-r1_src_prepare
-}
-
-python_test() {
- cp -a "${BUILD_DIR}"/{install,test} || die
- local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
-
- # Install necessary plugins
- local p
- for p in example*/; do
- pushd "${p}" >/dev/null || die
- distutils_pep517_install "${BUILD_DIR}"/test
- popd >/dev/null || die
- done
-
- local EPYTEST_IGNORE=(
- # Excluded from upstream's test script
- tests/unit/test_deprecated_finders.py
- )
-
- if ! has_version "dev-python/pylama[${PYTHON_USEDEP}]"; then
- EPYTEST_IGNORE+=(
- tests/unit/test_importable.py
- tests/unit/test_pylama_isort.py
- )
- fi
-
- epytest tests/unit
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-12-30 14:40 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-31 7:35 [gentoo-commits] repo/gentoo:master commit in: dev-python/isort/files/, dev-python/isort/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2022-12-21 11:40 Michał Górny
2023-01-13 17:13 Michał Górny
2023-12-30 14:40 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