1 |
commit: 16549328631858d7bc2d227ba46a393dd1d7e710 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Feb 10 18:28:25 2020 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 10 18:28:25 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16549328 |
7 |
|
8 |
dev-python/setuptools: Reland "Remove redundant versions"" |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
dev-python/setuptools/Manifest | 2 - |
13 |
dev-python/setuptools/setuptools-40.6.3.ebuild | 73 -------------------------- |
14 |
dev-python/setuptools/setuptools-45.0.0.ebuild | 66 ----------------------- |
15 |
dev-python/setuptools/setuptools-45.2.0.ebuild | 3 ++ |
16 |
4 files changed, 3 insertions(+), 141 deletions(-) |
17 |
|
18 |
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest |
19 |
index 6b18b818438..820a957bb55 100644 |
20 |
--- a/dev-python/setuptools/Manifest |
21 |
+++ b/dev-python/setuptools/Manifest |
22 |
@@ -1,6 +1,4 @@ |
23 |
-DIST setuptools-40.6.3.zip 839328 BLAKE2B ddc87213439ce2ad96ba54218bd5b3e41a7c31d670bddb9e4ea058b8ee7dffbe6fcb0e5fd24baf3fb38f5e824fde36aa8dc1e09d7ac37f9375ee351406389cd6 SHA512 6c628b8fc67645bca96ddcd016ec9a685e91690bf98dff077e842cfbd0d8d24de76ac51b3ff238d31551a48819d8f694fee6e9bb422ca954e54c22b4bda0038c |
24 |
DIST setuptools-42.0.2.zip 858444 BLAKE2B 2b77dbeeb9a3b4138810a96fe7ac0a7800717b4b68d6e9db2d146ca176127d5bfd5e4ef07adfa98758f8c4d05396152ca08e1707caf3d91703c7b268bd291f28 SHA512 ab623fd69b92111d3ab19a3ad9de9c07b4316f4130f3db4068a436d3c13c971d97506f7307c9f64d9cc9ca24a5f3800b68748455e70418d0c0cd240c93ebae35 |
25 |
DIST setuptools-44.0.0.zip 858893 BLAKE2B 02ba2a838487ba9e80d9ca3b8598cecbec4d286f2734be439d2b73f3f7f0ca80e80ea71a0c2322093deb548503c82d6eb32b1585992979b053f14f49baa00baa SHA512 bb48e7763d258e654472bc416d16ec8708eefa95d1eb03cb6e81b623fd636cefc51a0bd67887084ab0214e256e2030a8f655184c3b59ad6937abab6a6178f3a1 |
26 |
-DIST setuptools-45.0.0.zip 859461 BLAKE2B 060cd64efb4ce67b931f5a5672222d2cb6e2bacb68edd50af5b14b8de95b5b9b7727b76b970084257ec9f3afdf4a7bf4acbc6223b6e355d033af3660dfe4f1aa SHA512 d912d093866dfcf7b0e22ba2df51ab0d366c52bd5796f0aedfa0b1848abc80a2e30035897b83bed08b67d9d7d0fce4b0c4981c2a80196b8637c19f34ec269645 |
27 |
DIST setuptools-45.1.0.zip 859771 BLAKE2B 585ff16f57709c4e8c74fe51442a21e052be9de20e2d8c619ebb7435764297bde9223f1a1660b4101b33241d0d6c308f3ccf7cd2404caa3652334a6d314eb53f SHA512 0f08a9b3fad131a99c44d3cdced21b533a30b5f8fd25d4ce21263f14ca6ed6a6789969b67757ea67c62b9cc189155b08c886c3706ce9f2fd30bd5537e1a4a7e1 |
28 |
DIST setuptools-45.2.0.zip 859896 BLAKE2B adc9ae0ebd6ec5c59b7541fa7cf2898f0b9082cdd9cb7ddb614d749deebda260da489890fae5da77c622d47dccdee14ac9d5bf3ddf4393ca43ff679bc726cea7 SHA512 0d1e1e5b4074bdf9b35515dc6d9b03476ebe48287f30ff81ebc23a4b6e12a9faabd6ced40642ca6c5f27030be0252f48f18e73eac3876a447b1c6d4320a50147 |
29 |
|
30 |
diff --git a/dev-python/setuptools/setuptools-40.6.3.ebuild b/dev-python/setuptools/setuptools-40.6.3.ebuild |
31 |
deleted file mode 100644 |
32 |
index cda3f2830f2..00000000000 |
33 |
--- a/dev-python/setuptools/setuptools-40.6.3.ebuild |
34 |
+++ /dev/null |
35 |
@@ -1,73 +0,0 @@ |
36 |
-# Copyright 1999-2020 Gentoo Authors |
37 |
-# Distributed under the terms of the GNU General Public License v2 |
38 |
- |
39 |
-EAPI=6 |
40 |
-DISTUTILS_USE_SETUPTOOLS=no |
41 |
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 ) |
42 |
-PYTHON_REQ_USE="xml(+)" |
43 |
- |
44 |
-inherit distutils-r1 |
45 |
- |
46 |
-if [[ ${PV} == "9999" ]]; then |
47 |
- EGIT_REPO_URI="https://github.com/pypa/setuptools.git" |
48 |
- inherit git-r3 |
49 |
-else |
50 |
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip" |
51 |
- KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
52 |
-fi |
53 |
- |
54 |
-DESCRIPTION="Collection of extensions to Distutils" |
55 |
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/" |
56 |
- |
57 |
-LICENSE="MIT" |
58 |
-SLOT="0" |
59 |
-IUSE="test" |
60 |
-RESTRICT="!test? ( test )" |
61 |
- |
62 |
-RDEPEND=" |
63 |
-" |
64 |
-DEPEND="${RDEPEND} |
65 |
- app-arch/unzip |
66 |
- test? ( |
67 |
- dev-python/pip[${PYTHON_USEDEP}] |
68 |
- >=dev-python/pytest-3.1.0[${PYTHON_USEDEP}] |
69 |
- dev-python/pytest-fixture-config[${PYTHON_USEDEP}] |
70 |
- dev-python/pytest-virtualenv[${PYTHON_USEDEP}] |
71 |
- >=dev-python/backports-unittest-mock-1.2[${PYTHON_USEDEP}] |
72 |
- dev-python/wheel[${PYTHON_USEDEP}] |
73 |
- virtual/python-futures[${PYTHON_USEDEP}] |
74 |
- ) |
75 |
-" |
76 |
-PDEPEND=" |
77 |
- >=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]" |
78 |
- |
79 |
-# Force in-source build because build system modifies sources. |
80 |
-DISTUTILS_IN_SOURCE_BUILD=1 |
81 |
- |
82 |
-DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} ) |
83 |
- |
84 |
-python_prepare_all() { |
85 |
- if [[ ${PV} == "9999" ]]; then |
86 |
- python_setup |
87 |
- ${EPYTHON} bootstrap.py || die |
88 |
- fi |
89 |
- |
90 |
- # disable tests requiring a network connection |
91 |
- rm setuptools/tests/test_packageindex.py || die |
92 |
- |
93 |
- # don't run integration tests |
94 |
- rm setuptools/tests/test_integration.py || die |
95 |
- |
96 |
- distutils-r1_python_prepare_all |
97 |
-} |
98 |
- |
99 |
-python_test() { |
100 |
- # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg |
101 |
- # It tries to sandbox the test in a tempdir |
102 |
- HOME="${PWD}" py.test --verbose ${PN} || die "Tests failed under ${EPYTHON}" |
103 |
-} |
104 |
- |
105 |
-python_install() { |
106 |
- export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1 |
107 |
- distutils-r1_python_install |
108 |
-} |
109 |
|
110 |
diff --git a/dev-python/setuptools/setuptools-45.0.0.ebuild b/dev-python/setuptools/setuptools-45.0.0.ebuild |
111 |
deleted file mode 100644 |
112 |
index b3c6db3ab76..00000000000 |
113 |
--- a/dev-python/setuptools/setuptools-45.0.0.ebuild |
114 |
+++ /dev/null |
115 |
@@ -1,66 +0,0 @@ |
116 |
-# Copyright 1999-2020 Gentoo Authors |
117 |
-# Distributed under the terms of the GNU General Public License v2 |
118 |
- |
119 |
-EAPI=7 |
120 |
-DISTUTILS_USE_SETUPTOOLS=no |
121 |
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 ) |
122 |
-PYTHON_REQ_USE="xml(+)" |
123 |
- |
124 |
-inherit distutils-r1 |
125 |
- |
126 |
-DESCRIPTION="Collection of extensions to Distutils" |
127 |
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/" |
128 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip" |
129 |
- |
130 |
-LICENSE="MIT" |
131 |
-SLOT="0" |
132 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
133 |
-IUSE="test" |
134 |
-RESTRICT="!test? ( test )" |
135 |
- |
136 |
-BDEPEND=" |
137 |
- app-arch/unzip |
138 |
- test? ( |
139 |
- dev-python/mock[${PYTHON_USEDEP}] |
140 |
- dev-python/pip[${PYTHON_USEDEP}] |
141 |
- >=dev-python/pytest-3.7.0[${PYTHON_USEDEP}] |
142 |
- dev-python/pytest-fixture-config[${PYTHON_USEDEP}] |
143 |
- dev-python/pytest-virtualenv[${PYTHON_USEDEP}] |
144 |
- dev-python/wheel[${PYTHON_USEDEP}] |
145 |
- virtual/python-futures[${PYTHON_USEDEP}] |
146 |
- ) |
147 |
-" |
148 |
-PDEPEND=" |
149 |
- >=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]" |
150 |
- |
151 |
-# Force in-source build because build system modifies sources. |
152 |
-DISTUTILS_IN_SOURCE_BUILD=1 |
153 |
- |
154 |
-DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} ) |
155 |
- |
156 |
-PATCHES=( |
157 |
- # fix regression introduced by reinventing deprecated 'imp' |
158 |
- # https://github.com/pypa/setuptools/pull/1905 |
159 |
- "${FILESDIR}"/setuptools-42.0.0-imp-fix.patch |
160 |
-) |
161 |
- |
162 |
-python_prepare_all() { |
163 |
- # disable tests requiring a network connection |
164 |
- rm setuptools/tests/test_packageindex.py || die |
165 |
- |
166 |
- # don't run integration tests |
167 |
- rm setuptools/tests/test_integration.py || die |
168 |
- |
169 |
- distutils-r1_python_prepare_all |
170 |
-} |
171 |
- |
172 |
-python_test() { |
173 |
- # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg |
174 |
- # It tries to sandbox the test in a tempdir |
175 |
- HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}" |
176 |
-} |
177 |
- |
178 |
-python_install() { |
179 |
- export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1 |
180 |
- distutils-r1_python_install |
181 |
-} |
182 |
|
183 |
diff --git a/dev-python/setuptools/setuptools-45.2.0.ebuild b/dev-python/setuptools/setuptools-45.2.0.ebuild |
184 |
index 49e44b53174..e9378e5d2c3 100644 |
185 |
--- a/dev-python/setuptools/setuptools-45.2.0.ebuild |
186 |
+++ b/dev-python/setuptools/setuptools-45.2.0.ebuild |
187 |
@@ -45,6 +45,9 @@ python_prepare_all() { |
188 |
# don't run integration tests |
189 |
rm setuptools/tests/test_integration.py || die |
190 |
|
191 |
+ # avoid pointless dep on flake8 |
192 |
+ sed -i -e 's:--flake8::' pytest.ini || die |
193 |
+ |
194 |
distutils-r1_python_prepare_all |
195 |
} |