1 |
commit: 2c1bb549cdd4f991b50fffebfa5bb46ae2be6d54 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Dec 31 07:34:13 2020 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Dec 31 07:34:13 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c1bb549 |
7 |
|
8 |
Revert "dev-python/isort: cleanup old" |
9 |
|
10 |
This reverts commit bc4f8b1b3cda6ec6ba2879dfa1883d6468241158. |
11 |
|
12 |
Still needed for Python 3.6 in some packages: |
13 |
* dev-python/hcloud-python |
14 |
* dev-python/pylama |
15 |
* dev-python/pylint |
16 |
* net-mail/hyperkitty |
17 |
* net-mail/postorius |
18 |
|
19 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
20 |
|
21 |
dev-python/isort/Manifest | 2 ++ |
22 |
dev-python/isort/files/isort-4.3.21_p1-tests.patch | 36 ++++++++++++++++++++++ |
23 |
dev-python/isort/isort-4.3.15.ebuild | 15 +++++++++ |
24 |
dev-python/isort/isort-4.3.21_p2-r1.ebuild | 35 +++++++++++++++++++++ |
25 |
4 files changed, 88 insertions(+) |
26 |
|
27 |
diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest |
28 |
index 234ea6aa5d2..5fa3daa7f3d 100644 |
29 |
--- a/dev-python/isort/Manifest |
30 |
+++ b/dev-python/isort/Manifest |
31 |
@@ -1,2 +1,4 @@ |
32 |
+DIST isort-4.3.15.tar.gz 67949 BLAKE2B e78960518928cd74c15733bbc14bf066798ecbcc3e906754c10e352e7b88843451a1d0616d1b450100c77e95974f863951d640c9568277e867fcdfba8f44abdb SHA512 a5774d4f3c49c978e9043e52681e80011591422e60178d72074142725d9d7fa5065553686fd42bffe9e71b38b2b5bdaaa6f20e32cd8dbe33beb9431c397d78e5 |
33 |
+DIST isort-4.3.21_p2.tar.gz 158539 BLAKE2B 316703ca754c939e4af0db4a1060fb13a5164797a672b3faeb585a81fa0c86453fb0f1953b789661588cd0f04267a28837d46a88093a838391f752afa43e9f8b SHA512 fc2aa00c87196864864d2516b8be7acdedcf40d71d1931510e4b878dbd2b6da0b579661b50221f03f4aa5560c8bf23d5e1e10a2694d2b741ca09a92e40a4c687 |
34 |
DIST isort-5.6.3.tar.gz 161712 BLAKE2B ffbc2977016807d2bd5b1644377efad021af2ad27fd0e27feae1e5dfdfd112c7b5bf4b296ebf47ea6bfcbfe7f56cf3bfa8e1e7cf03963935660e678223397afb SHA512 fa2d9be306d03fc802aab3915bee2c41f4fe0c28353d9d99aa6604755e1602027cd81afca92b4302f80497c88a9dcb2701ec02ca55a5f9a2866669a68368d957 |
35 |
DIST isort-5.7.0.tar.gz 169353 BLAKE2B bafd6a0ce81ed80a3c1ad53ce320361ef11bc01a78211ad13b7947aafddd4d9bb5a4fbf65ec01d4c90dce7ebd0a2e3b1c4dcad729b1e27b1dd2c5c90c802eecf SHA512 ae5ff56394f495f6bd86f7581e0f8a67264671553b344b9dc2c5ba0b37f483ae500ebba9882ff5c315b913a689901b17de2eac403e0b4240f913c9e1864bab9f |
36 |
|
37 |
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 |
38 |
new file mode 100644 |
39 |
index 00000000000..9ece5ff6de9 |
40 |
--- /dev/null |
41 |
+++ b/dev-python/isort/files/isort-4.3.21_p1-tests.patch |
42 |
@@ -0,0 +1,36 @@ |
43 |
+diff --git a/test_isort.py b/test_isort.py |
44 |
+index 9d9297c..725b1e1 100644 |
45 |
+--- a/test_isort.py |
46 |
++++ b/test_isort.py |
47 |
+@@ -1539,6 +1539,7 @@ def test_custom_sections(): |
48 |
+ "import p24.shared.media_wiki_syntax as syntax\n") |
49 |
+ |
50 |
+ |
51 |
++@×××××××××××.skip("Not going to pull in Django for a couple of tests") |
52 |
+ def test_glob_known(): |
53 |
+ """Ensure that most specific placement control match wins""" |
54 |
+ test_input = ("import os\n" |
55 |
+@@ -2599,6 +2600,7 @@ def test_new_lines_are_preserved(): |
56 |
+ os.remove(n_newline.name) |
57 |
+ |
58 |
+ |
59 |
++@×××××××××××.skip("Not going to pull in Django for a couple of tests") |
60 |
+ def test_requirements_finder(tmpdir): |
61 |
+ subdir = tmpdir.mkdir('subdir').join("lol.txt") |
62 |
+ subdir.write("flask") |
63 |
+@@ -2675,6 +2677,7 @@ deal = {editable = true, git = "https://github.com/orsinium/deal.git"} |
64 |
+ """ |
65 |
+ |
66 |
+ |
67 |
++@×××××××××××.skip("Not going to pull in Django for a couple of tests") |
68 |
+ def test_pipfile_finder(tmpdir): |
69 |
+ pipfile = tmpdir.join('Pipfile') |
70 |
+ pipfile.write(PIPFILE) |
71 |
+@@ -2979,6 +2982,7 @@ def test_skip_paths_issue_938(tmpdir): |
72 |
+ assert b'skipped 1' in results.lower() |
73 |
+ |
74 |
+ |
75 |
++@×××××××××××.skipif(sys.version_info[0] == 2, reason="Broken on Python 2") |
76 |
+ def test_standard_library_deprecates_user_issue_778(): |
77 |
+ test_input = ('import os\n' |
78 |
+ '\n' |
79 |
|
80 |
diff --git a/dev-python/isort/isort-4.3.15.ebuild b/dev-python/isort/isort-4.3.15.ebuild |
81 |
new file mode 100644 |
82 |
index 00000000000..fb2cabcf1a3 |
83 |
--- /dev/null |
84 |
+++ b/dev-python/isort/isort-4.3.15.ebuild |
85 |
@@ -0,0 +1,15 @@ |
86 |
+# Copyright 1999-2020 Gentoo Authors |
87 |
+# Distributed under the terms of the GNU General Public License v2 |
88 |
+ |
89 |
+EAPI=7 |
90 |
+ |
91 |
+PYTHON_COMPAT=( python3_{6,7} ) |
92 |
+inherit distutils-r1 |
93 |
+ |
94 |
+DESCRIPTION="A python utility/library to sort imports" |
95 |
+HOMEPAGE="https://pypi.org/project/isort/" |
96 |
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
97 |
+ |
98 |
+LICENSE="MIT" |
99 |
+SLOT="0" |
100 |
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" |
101 |
|
102 |
diff --git a/dev-python/isort/isort-4.3.21_p2-r1.ebuild b/dev-python/isort/isort-4.3.21_p2-r1.ebuild |
103 |
new file mode 100644 |
104 |
index 00000000000..5d9e679b496 |
105 |
--- /dev/null |
106 |
+++ b/dev-python/isort/isort-4.3.21_p2-r1.ebuild |
107 |
@@ -0,0 +1,35 @@ |
108 |
+# Copyright 1999-2020 Gentoo Authors |
109 |
+# Distributed under the terms of the GNU General Public License v2 |
110 |
+ |
111 |
+EAPI=7 |
112 |
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 ) |
113 |
+DISTUTILS_USE_SETUPTOOLS=rdepend |
114 |
+ |
115 |
+inherit distutils-r1 |
116 |
+ |
117 |
+MY_PV="${PV//_p/-}" |
118 |
+ |
119 |
+DESCRIPTION="A python utility/library to sort imports" |
120 |
+HOMEPAGE="https://pypi.org/project/isort/" |
121 |
+SRC_URI="https://github.com/timothycrosley/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" |
122 |
+S="${WORKDIR}/${PN}-${MY_PV}" |
123 |
+ |
124 |
+LICENSE="MIT" |
125 |
+SLOT="0" |
126 |
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86" |
127 |
+ |
128 |
+RDEPEND=" |
129 |
+ dev-python/pipfile[${PYTHON_USEDEP}] |
130 |
+" |
131 |
+BDEPEND="${RDEPEND}" |
132 |
+ |
133 |
+PATCHES=( |
134 |
+ "${FILESDIR}/isort-4.3.21_p1-tests.patch" |
135 |
+) |
136 |
+ |
137 |
+distutils_enable_tests pytest |
138 |
+ |
139 |
+python_test() { |
140 |
+ distutils_install_for_testing |
141 |
+ pytest -vv || die "Tests failed with ${EPYTHON}" |
142 |
+} |