Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/setuptools/
Date: Thu, 02 Jan 2020 08:07:18
Message-Id: 1577952417.9af357f23ce6f5e32a64e772ee064f65a0d35384.mgorny@gentoo
1 commit: 9af357f23ce6f5e32a64e772ee064f65a0d35384
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 2 07:57:19 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 2 08:06:57 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9af357f2
7
8 dev-python/setuptools: 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-41.5.1.ebuild | 86 --------------------------
14 dev-python/setuptools/setuptools-43.0.0.ebuild | 77 -----------------------
15 3 files changed, 165 deletions(-)
16
17 diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
18 index 92b2777b928..2141333faca 100644
19 --- a/dev-python/setuptools/Manifest
20 +++ b/dev-python/setuptools/Manifest
21 @@ -1,5 +1,3 @@
22 DIST setuptools-40.6.3.zip 839328 BLAKE2B ddc87213439ce2ad96ba54218bd5b3e41a7c31d670bddb9e4ea058b8ee7dffbe6fcb0e5fd24baf3fb38f5e824fde36aa8dc1e09d7ac37f9375ee351406389cd6 SHA512 6c628b8fc67645bca96ddcd016ec9a685e91690bf98dff077e842cfbd0d8d24de76ac51b3ff238d31551a48819d8f694fee6e9bb422ca954e54c22b4bda0038c
23 -DIST setuptools-41.5.1.zip 851097 BLAKE2B 2411db77cffb24190c1510c7fab623ae0fb2a248994eae01e1a79427d35d8bf6a2f065de0d95dc11105df0bb42962a57c914486b48dc91115ec32e4dbcbc059d SHA512 eb6e944c80448873f8970477aaf474e75879e2b81b91fdc7a308670fed231d52880c3be3452e7ed3f094f20d4afe54b1db24ec4d98845ed47ee5e71dbf66261d
24 DIST setuptools-42.0.2.zip 858444 BLAKE2B 2b77dbeeb9a3b4138810a96fe7ac0a7800717b4b68d6e9db2d146ca176127d5bfd5e4ef07adfa98758f8c4d05396152ca08e1707caf3d91703c7b268bd291f28 SHA512 ab623fd69b92111d3ab19a3ad9de9c07b4316f4130f3db4068a436d3c13c971d97506f7307c9f64d9cc9ca24a5f3800b68748455e70418d0c0cd240c93ebae35
25 -DIST setuptools-43.0.0.zip 858857 BLAKE2B 763067560c7f9ee7e2e205eb2c8f215c0c82a5f0b40f3cae2d6a55024376196b478ac1fc44b5f6e4ca55a05d53c16e32b671e409d7d142042cc174fc92540a16 SHA512 bcd630e387784c14bc5427b7a99f7da2d46cca178c318d33a3b5be31b0315b6f957bdabfe85112ad3ffcd39442e654a3d80b609ee4cdac122a19597314f90714
26 DIST setuptools-44.0.0.zip 858893 BLAKE2B 02ba2a838487ba9e80d9ca3b8598cecbec4d286f2734be439d2b73f3f7f0ca80e80ea71a0c2322093deb548503c82d6eb32b1585992979b053f14f49baa00baa SHA512 bb48e7763d258e654472bc416d16ec8708eefa95d1eb03cb6e81b623fd636cefc51a0bd67887084ab0214e256e2030a8f655184c3b59ad6937abab6a6178f3a1
27
28 diff --git a/dev-python/setuptools/setuptools-41.5.1.ebuild b/dev-python/setuptools/setuptools-41.5.1.ebuild
29 deleted file mode 100644
30 index a7b9022b6a0..00000000000
31 --- a/dev-python/setuptools/setuptools-41.5.1.ebuild
32 +++ /dev/null
33 @@ -1,86 +0,0 @@
34 -# Copyright 1999-2019 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=7
38 -DISTUTILS_USE_SETUPTOOLS=no
39 -PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
40 -PYTHON_REQ_USE="xml(+)"
41 -
42 -inherit distutils-r1
43 -
44 -if [[ ${PV} == "9999" ]]; then
45 - EGIT_REPO_URI="https://github.com/pypa/setuptools.git"
46 - inherit git-r3
47 -else
48 - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
49 - 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"
50 -fi
51 -
52 -DESCRIPTION="Collection of extensions to Distutils"
53 -HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
54 -
55 -LICENSE="MIT"
56 -SLOT="0"
57 -IUSE="test"
58 -RESTRICT="!test? ( test )"
59 -
60 -RDEPEND="
61 -"
62 -# Temporary hack to avoid py38 keywording hell. Please remove when
63 -# the test deps all have py38. Also setuptools' test pass with py38,
64 -# so you need to hack them all in locally before bumping and test.
65 -TEST_USEDEP=$(python_gen_usedep python2_7 python3_{5,6,7} pypy{,3})
66 -DEPEND="${RDEPEND}
67 - app-arch/unzip
68 - test? (
69 - dev-python/mock[${TEST_USEDEP}]
70 - dev-python/pip[${TEST_USEDEP}]
71 - >=dev-python/pytest-3.7.0[${TEST_USEDEP}]
72 - dev-python/pytest-fixture-config[${TEST_USEDEP}]
73 - dev-python/pytest-virtualenv[${TEST_USEDEP}]
74 - dev-python/wheel[${TEST_USEDEP}]
75 - virtual/python-futures[${PYTHON_USEDEP}]
76 - )
77 -"
78 -PDEPEND="
79 - >=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
80 -
81 -# Force in-source build because build system modifies sources.
82 -DISTUTILS_IN_SOURCE_BUILD=1
83 -
84 -DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
85 -
86 -python_prepare_all() {
87 - if [[ ${PV} == "9999" ]]; then
88 - python_setup
89 - ${EPYTHON} bootstrap.py || die
90 - fi
91 -
92 - # disable tests requiring a network connection
93 - rm setuptools/tests/test_packageindex.py || die
94 -
95 - # don't run integration tests
96 - rm setuptools/tests/test_integration.py || die
97 -
98 - distutils-r1_python_prepare_all
99 -}
100 -
101 -python_test() {
102 - if [[ ${EPYTHON} == python3.8 ]]; then
103 - if [[ ${PV} != 41.5.1 ]]; then
104 - eerror "Please disable py38 hacks and test locally, then update this."
105 - die "Python 3.8 support untested for ${PV}"
106 - fi
107 - einfo "Skipping testing on ${EPYTHON} due to unkeyworded deps"
108 - return
109 - fi
110 -
111 - # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
112 - # It tries to sandbox the test in a tempdir
113 - HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}"
114 -}
115 -
116 -python_install() {
117 - export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
118 - distutils-r1_python_install
119 -}
120
121 diff --git a/dev-python/setuptools/setuptools-43.0.0.ebuild b/dev-python/setuptools/setuptools-43.0.0.ebuild
122 deleted file mode 100644
123 index 417a3cbbded..00000000000
124 --- a/dev-python/setuptools/setuptools-43.0.0.ebuild
125 +++ /dev/null
126 @@ -1,77 +0,0 @@
127 -# Copyright 1999-2020 Gentoo Authors
128 -# Distributed under the terms of the GNU General Public License v2
129 -
130 -EAPI=7
131 -DISTUTILS_USE_SETUPTOOLS=no
132 -PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
133 -PYTHON_REQ_USE="xml(+)"
134 -
135 -inherit distutils-r1
136 -
137 -if [[ ${PV} == "9999" ]]; then
138 - EGIT_REPO_URI="https://github.com/pypa/setuptools.git"
139 - inherit git-r3
140 -else
141 - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
142 - 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"
143 -fi
144 -
145 -DESCRIPTION="Collection of extensions to Distutils"
146 -HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
147 -
148 -LICENSE="MIT"
149 -SLOT="0"
150 -IUSE="test"
151 -RESTRICT="!test? ( test )"
152 -
153 -BDEPEND="
154 - app-arch/unzip
155 - test? (
156 - dev-python/mock[${PYTHON_USEDEP}]
157 - dev-python/pip[${PYTHON_USEDEP}]
158 - >=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
159 - dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
160 - dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
161 - dev-python/wheel[${PYTHON_USEDEP}]
162 - virtual/python-futures[${PYTHON_USEDEP}]
163 - )
164 -"
165 -PDEPEND="
166 - >=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
167 -
168 -# Force in-source build because build system modifies sources.
169 -DISTUTILS_IN_SOURCE_BUILD=1
170 -
171 -DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
172 -
173 -PATCHES=(
174 - # fix regression introduced by reinventing deprecated 'imp'
175 - # https://github.com/pypa/setuptools/pull/1905
176 - "${FILESDIR}"/setuptools-42.0.0-imp-fix.patch
177 -)
178 -
179 -python_prepare_all() {
180 - if [[ ${PV} == "9999" ]]; then
181 - python_setup
182 - ${EPYTHON} bootstrap.py || die
183 - fi
184 -
185 - # disable tests requiring a network connection
186 - rm setuptools/tests/test_packageindex.py || die
187 -
188 - # don't run integration tests
189 - rm setuptools/tests/test_integration.py || die
190 -
191 - distutils-r1_python_prepare_all
192 -}
193 -
194 -python_test() {
195 - # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
196 - # It tries to sandbox the test in a tempdir
197 - HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}"
198 -}
199 -
200 -python_install() {
201 - export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
202 - distutils-r1_python_install
203 -}