1 |
commit: 64fae0c2cb02859b1c52ccbf5cc7781815d6771f |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 29 08:46:15 2022 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 29 08:48:44 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64fae0c2 |
7 |
|
8 |
dev-python/autopep8: Remove old |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
dev-python/autopep8/Manifest | 3 -- |
13 |
dev-python/autopep8/autopep8-1.6.0.ebuild | 32 ------------ |
14 |
dev-python/autopep8/autopep8-1.7.0-r1.ebuild | 39 --------------- |
15 |
dev-python/autopep8/autopep8-1.7.1.ebuild | 42 ---------------- |
16 |
.../autopep8/files/autopep8-1.7.0-tomli.patch | 57 ---------------------- |
17 |
5 files changed, 173 deletions(-) |
18 |
|
19 |
diff --git a/dev-python/autopep8/Manifest b/dev-python/autopep8/Manifest |
20 |
index 0e0f1d1a64d1..552e26e681d5 100644 |
21 |
--- a/dev-python/autopep8/Manifest |
22 |
+++ b/dev-python/autopep8/Manifest |
23 |
@@ -1,4 +1 @@ |
24 |
-DIST autopep8-1.6.0.tar.gz 122165 BLAKE2B 606ccf7ab51b52db95287384f9b19fd0f72da9e8fb4537bf395651622a95f88d782679550e61816d60dd3faa2fa096c979575d60cbd95476fa1cd7cf2c4f4180 SHA512 f4ffd564ceb48ff1f37d0a051aa8fefc60595a68709045c13561d8ab73de48dce99cc12acf40559e587ba4f6fddd4727dd2b40691ce43c991d60dda2c8b0d617 |
25 |
-DIST autopep8-1.7.0.tar.gz 117055 BLAKE2B 36e2789551eb671b0bc7481742d9edf25aa622bd3f605fb2491195c45f7630378116e4b0bffb536cf7596b3b1c5ea695796259b944a886d55f05c9891e280d0c SHA512 e93ddf90ff989af71790f70f7e7101f7cc60890c8a976552a097c13b0a0e10c16dfd8770214b19d7fabd59403e6d87a9a37d75a2c6f3ed27f8c82a7d8da95dad |
26 |
-DIST autopep8-1.7.1.tar.gz 117449 BLAKE2B 27bfdc58f647f3f2a7c3945f7faee152667e1dffc13c2b4a5af1f74e7d544c21d1472dc34c797818ca45fccae9f53e7a333c71b52b825b0fb97b50f12567889b SHA512 7a4a8ebf0bacd781fdf7ae32a34bd64f5b6ba9e8ccef5709799cefe5e5bc24da47f36ea49092e26a7c3e254bbea5d6feaeca38f64ffc3fe440307b1331be4766 |
27 |
DIST autopep8-2.0.0.tar.gz 117507 BLAKE2B 8722b19454f47d0b960e3cc0e18ff3d6150ead009630047ecd1ce9001ea6f6d68595f80d7ad1087bddd2993e95d0634d63495b1d43dee095d114535bf632d1bf SHA512 883b79f7011a374a2ef88073a45748268a20449a3bc8da519c036c71700352dd8c4accc60fcb592f1a53ceac06984fcbe6ede8a272bc718c2b79873be5f35dd8 |
28 |
|
29 |
diff --git a/dev-python/autopep8/autopep8-1.6.0.ebuild b/dev-python/autopep8/autopep8-1.6.0.ebuild |
30 |
deleted file mode 100644 |
31 |
index ebe36cfed891..000000000000 |
32 |
--- a/dev-python/autopep8/autopep8-1.6.0.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,32 +0,0 @@ |
35 |
-# Copyright 1999-2022 Gentoo Authors |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=8 |
39 |
- |
40 |
-PYTHON_COMPAT=( python3_{8..11} pypy3 ) |
41 |
-PYTHON_REQ_USE="threads(+)" |
42 |
- |
43 |
-inherit distutils-r1 |
44 |
- |
45 |
-DESCRIPTION="Automatically formats Python code to conform to the PEP 8 style guide" |
46 |
-HOMEPAGE="https://github.com/hhatto/autopep8 https://pypi.org/project/autopep8/" |
47 |
-if [[ ${PV} == *9999* ]]; then |
48 |
- EGIT_REPO_URI="https://github.com/hhatto/${PN}.git" |
49 |
- inherit git-r3 |
50 |
-else |
51 |
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
52 |
- KEYWORDS="~alpha amd64 ~arm64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux" |
53 |
-fi |
54 |
- |
55 |
-LICENSE="MIT" |
56 |
-SLOT="0" |
57 |
- |
58 |
-RDEPEND=" |
59 |
- >=dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}] |
60 |
- dev-python/toml[${PYTHON_USEDEP}]" |
61 |
- |
62 |
-distutils_enable_tests unittest |
63 |
- |
64 |
-PATCHES=( |
65 |
- "${FILESDIR}"/autopep8-1.6.0-lib2to3-deprecation-pytest.patch |
66 |
-) |
67 |
|
68 |
diff --git a/dev-python/autopep8/autopep8-1.7.0-r1.ebuild b/dev-python/autopep8/autopep8-1.7.0-r1.ebuild |
69 |
deleted file mode 100644 |
70 |
index 58d653e49809..000000000000 |
71 |
--- a/dev-python/autopep8/autopep8-1.7.0-r1.ebuild |
72 |
+++ /dev/null |
73 |
@@ -1,39 +0,0 @@ |
74 |
-# Copyright 1999-2022 Gentoo Authors |
75 |
-# Distributed under the terms of the GNU General Public License v2 |
76 |
- |
77 |
-EAPI=8 |
78 |
- |
79 |
-PYTHON_COMPAT=( python3_{8..11} pypy3 ) |
80 |
-PYTHON_REQ_USE="threads(+)" |
81 |
- |
82 |
-inherit distutils-r1 |
83 |
- |
84 |
-DESCRIPTION="Automatically formats Python code to conform to the PEP 8 style guide" |
85 |
-HOMEPAGE="https://github.com/hhatto/autopep8 https://pypi.org/project/autopep8/" |
86 |
-if [[ ${PV} == *9999* ]]; then |
87 |
- EGIT_REPO_URI="https://github.com/hhatto/${PN}.git" |
88 |
- inherit git-r3 |
89 |
-else |
90 |
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
91 |
- KEYWORDS="~alpha amd64 ~arm64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux" |
92 |
-fi |
93 |
- |
94 |
-LICENSE="MIT" |
95 |
-SLOT="0" |
96 |
- |
97 |
-RDEPEND=" |
98 |
- >=dev-python/pycodestyle-2.9.1[${PYTHON_USEDEP}] |
99 |
- dev-python/tomli[${PYTHON_USEDEP}] |
100 |
-" |
101 |
- |
102 |
-distutils_enable_tests pytest |
103 |
- |
104 |
-EPYTEST_DESELECT=( |
105 |
- # test require in source build |
106 |
- test/test_autopep8.py::SystemTests::test_e101_skip_innocuous |
107 |
-) |
108 |
- |
109 |
-PATCHES=( |
110 |
- "${FILESDIR}"/autopep8-1.6.0-lib2to3-deprecation-pytest.patch |
111 |
- "${FILESDIR}"/${P}-tomli.patch |
112 |
-) |
113 |
|
114 |
diff --git a/dev-python/autopep8/autopep8-1.7.1.ebuild b/dev-python/autopep8/autopep8-1.7.1.ebuild |
115 |
deleted file mode 100644 |
116 |
index b201d023a72a..000000000000 |
117 |
--- a/dev-python/autopep8/autopep8-1.7.1.ebuild |
118 |
+++ /dev/null |
119 |
@@ -1,42 +0,0 @@ |
120 |
-# Copyright 1999-2022 Gentoo Authors |
121 |
-# Distributed under the terms of the GNU General Public License v2 |
122 |
- |
123 |
-EAPI=8 |
124 |
- |
125 |
-DISTUTILS_USE_PEP517=setuptools |
126 |
-PYTHON_COMPAT=( python3_{8..11} pypy3 ) |
127 |
-PYTHON_REQ_USE="threads(+)" |
128 |
- |
129 |
-inherit distutils-r1 |
130 |
- |
131 |
-DESCRIPTION="Automatically formats Python code to conform to the PEP 8 style guide" |
132 |
-HOMEPAGE=" |
133 |
- https://github.com/hhatto/autopep8/ |
134 |
- https://pypi.org/project/autopep8/ |
135 |
-" |
136 |
-if [[ ${PV} == *9999* ]]; then |
137 |
- EGIT_REPO_URI="https://github.com/hhatto/${PN}.git" |
138 |
- inherit git-r3 |
139 |
-else |
140 |
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
141 |
- KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux" |
142 |
-fi |
143 |
- |
144 |
-LICENSE="MIT" |
145 |
-SLOT="0" |
146 |
- |
147 |
-RDEPEND=" |
148 |
- >=dev-python/pycodestyle-2.9.1[${PYTHON_USEDEP}] |
149 |
- dev-python/tomli[${PYTHON_USEDEP}] |
150 |
-" |
151 |
- |
152 |
-distutils_enable_tests pytest |
153 |
- |
154 |
-EPYTEST_DESELECT=( |
155 |
- # test require in source build |
156 |
- test/test_autopep8.py::SystemTests::test_e101_skip_innocuous |
157 |
-) |
158 |
- |
159 |
-PATCHES=( |
160 |
- "${FILESDIR}"/autopep8-1.6.0-lib2to3-deprecation-pytest.patch |
161 |
-) |
162 |
|
163 |
diff --git a/dev-python/autopep8/files/autopep8-1.7.0-tomli.patch b/dev-python/autopep8/files/autopep8-1.7.0-tomli.patch |
164 |
deleted file mode 100644 |
165 |
index 6a8dd147d474..000000000000 |
166 |
--- a/dev-python/autopep8/files/autopep8-1.7.0-tomli.patch |
167 |
+++ /dev/null |
168 |
@@ -1,57 +0,0 @@ |
169 |
-From d0836947df66a052a1d18925a64feb0374598f02 Mon Sep 17 00:00:00 2001 |
170 |
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
171 |
-Date: Wed, 6 Apr 2022 18:30:11 +0200 |
172 |
-Subject: [PATCH] Use tomli in place of unmaintained toml package |
173 |
- |
174 |
-Use the modern `tomli` TOML parser instead of `toml`. The latter |
175 |
-package is no longer maintained and does not support TOML 1.0. |
176 |
---- |
177 |
- autopep8.py | 10 +++++----- |
178 |
- setup.py | 2 +- |
179 |
- 2 files changed, 6 insertions(+), 6 deletions(-) |
180 |
- |
181 |
-diff --git a/autopep8.py b/autopep8.py |
182 |
-index d856f711..ab1a88ac 100755 |
183 |
---- a/autopep8.py |
184 |
-+++ b/autopep8.py |
185 |
-@@ -4040,13 +4040,13 @@ def read_config(args, parser): |
186 |
- |
187 |
- def read_pyproject_toml(args, parser): |
188 |
- """Read pyproject.toml and load configuration.""" |
189 |
-- import toml |
190 |
-+ import tomli |
191 |
- |
192 |
- config = None |
193 |
- |
194 |
- if os.path.exists(args.global_config): |
195 |
-- with open(args.global_config) as fp: |
196 |
-- config = toml.load(fp) |
197 |
-+ with open(args.global_config, "rb") as fp: |
198 |
-+ config = tomli.load(fp) |
199 |
- |
200 |
- if not args.ignore_local_config: |
201 |
- parent = tail = args.files and os.path.abspath( |
202 |
-@@ -4054,8 +4054,8 @@ def read_pyproject_toml(args, parser): |
203 |
- while tail: |
204 |
- pyproject_toml = os.path.join(parent, "pyproject.toml") |
205 |
- if os.path.exists(pyproject_toml): |
206 |
-- with open(pyproject_toml) as fp: |
207 |
-- config = toml.load(fp) |
208 |
-+ with open(pyproject_toml, "rb") as fp: |
209 |
-+ config = tomli.load(fp) |
210 |
- break |
211 |
- (parent, tail) = os.path.split(parent) |
212 |
- |
213 |
-diff --git a/setup.py b/setup.py |
214 |
-index caa639bf..4849574a 100755 |
215 |
---- a/setup.py |
216 |
-+++ b/setup.py |
217 |
-@@ -10,7 +10,7 @@ |
218 |
- |
219 |
- |
220 |
- INSTALL_REQUIRES = ( |
221 |
-- ['pycodestyle >= 2.9.1', 'toml'] |
222 |
-+ ['pycodestyle >= 2.9.1', 'tomli'] |
223 |
- ) |
224 |
- |
225 |
- |