1 |
commit: 03c13f91ccc5269f43a5089d2bb4b19edc2eb22f |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jul 8 07:00:56 2021 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jul 8 07:00:56 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03c13f91 |
7 |
|
8 |
dev-python/distlib: Remove old |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
dev-python/distlib/Manifest | 1 - |
13 |
dev-python/distlib/distlib-0.3.1-r1.ebuild | 54 ---------------------- |
14 |
.../files/distlib-0.3.1-system-pypiserver.py | 37 --------------- |
15 |
3 files changed, 92 deletions(-) |
16 |
|
17 |
diff --git a/dev-python/distlib/Manifest b/dev-python/distlib/Manifest |
18 |
index 04e1bb52bd1..593287ce60f 100644 |
19 |
--- a/dev-python/distlib/Manifest |
20 |
+++ b/dev-python/distlib/Manifest |
21 |
@@ -1,2 +1 @@ |
22 |
-DIST distlib-0.3.1.tar.bz2 1068500 BLAKE2B 52135869242f71cc6d6887da6d9e20ffc6b46c84d8146393961062d92d8c0bd68e1309277f64fdec0319ff3c503b1caaba3d5378f5c081dca79573c8d9c2e6f2 SHA512 f259299176c45be7024b80759015a2fad120ffdde55b6abea0f7fb0335cee90809b5daedcb88abdfb68fd496284b2e478df622004b3750327bfc86807581116c |
23 |
DIST distlib-0.3.2.tar.bz2 1075843 BLAKE2B 3595dc6af53beb7ff7dc49013e6c3db3453b501b56790a953c2cfea5a73aaca71fc69de68c8121ae92ffafd32a70ffa69d768cfd42844135fd5bd6647611e090 SHA512 e033ff2ff6b760f698a20103e01d63fa87bc1839bbf44fce252284c793e10a057dac645d818a4e0a2aa8be97bb85fcf9c8706b2399c505f12a093024d11be578 |
24 |
|
25 |
diff --git a/dev-python/distlib/distlib-0.3.1-r1.ebuild b/dev-python/distlib/distlib-0.3.1-r1.ebuild |
26 |
deleted file mode 100644 |
27 |
index ab98794d534..00000000000 |
28 |
--- a/dev-python/distlib/distlib-0.3.1-r1.ebuild |
29 |
+++ /dev/null |
30 |
@@ -1,54 +0,0 @@ |
31 |
-# Copyright 2021 Gentoo Authors |
32 |
-# Distributed under the terms of the GNU General Public License v2 |
33 |
- |
34 |
-EAPI=7 |
35 |
- |
36 |
-DISTUTILS_USE_SETUPTOOLS=no |
37 |
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 ) |
38 |
- |
39 |
-inherit distutils-r1 vcs-snapshot |
40 |
- |
41 |
-DESCRIPTION="Low-level components of distutils2/packaging" |
42 |
-HOMEPAGE="https://pypi.org/project/distlib/ |
43 |
- https://bitbucket.org/pypa/distlib/" |
44 |
-# pypi has zip only :-( |
45 |
-SRC_URI=" |
46 |
- https://bitbucket.org/pypa/distlib/get/${PV}.tar.bz2 -> ${P}.tar.bz2" |
47 |
- |
48 |
-LICENSE="PSF-2" |
49 |
-SLOT="0" |
50 |
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" |
51 |
-IUSE="test" |
52 |
-# This package's tests are extremely fragile and tend to break or hang |
53 |
-# when it doesn't like metadata of packages installed on the system. |
54 |
-RESTRICT="test" |
55 |
- |
56 |
-# pypiserver is called as external executable |
57 |
-# openpyxl installs invalid metadata that breaks distlib |
58 |
-BDEPEND=" |
59 |
- test? ( |
60 |
- dev-python/pypiserver |
61 |
- !!<dev-python/openpyxl-3.0.3[${PYTHON_USEDEP}] |
62 |
- )" |
63 |
- |
64 |
-src_prepare() { |
65 |
- # make sure they're not used |
66 |
- rm -r tests/unittest2 || die |
67 |
- rm tests/pypi-server-standalone.py || die |
68 |
- |
69 |
- # use system pypiserver instead of broken bundled one |
70 |
- eapply "${FILESDIR}"/distlib-0.3.1-system-pypiserver.py || die |
71 |
- |
72 |
- # doesn't work with our patched pip |
73 |
- sed -e '/PIP_AVAIL/s:True:False:' \ |
74 |
- -i tests/test_wheel.py || die |
75 |
- |
76 |
- distutils-r1_src_prepare |
77 |
-} |
78 |
- |
79 |
-python_test() { |
80 |
- local -x SKIP_ONLINE=1 |
81 |
- local -x PYTHONHASHSEED=0 |
82 |
- "${EPYTHON}" tests/test_all.py -v || |
83 |
- die "Tests failed with ${EPYTHON}" |
84 |
-} |
85 |
|
86 |
diff --git a/dev-python/distlib/files/distlib-0.3.1-system-pypiserver.py b/dev-python/distlib/files/distlib-0.3.1-system-pypiserver.py |
87 |
deleted file mode 100644 |
88 |
index beb0cd8dd92..00000000000 |
89 |
--- a/dev-python/distlib/files/distlib-0.3.1-system-pypiserver.py |
90 |
+++ /dev/null |
91 |
@@ -1,37 +0,0 @@ |
92 |
-From f30a24d3dffee78cf0581218d9cca0e395b75f6a Mon Sep 17 00:00:00 2001 |
93 |
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
94 |
-Date: Wed, 8 Jul 2020 09:24:42 +0200 |
95 |
-Subject: [PATCH] Use system pypiserver |
96 |
- |
97 |
---- |
98 |
- tests/test_index.py | 7 +------ |
99 |
- 1 file changed, 1 insertion(+), 6 deletions(-) |
100 |
- |
101 |
-diff --git a/tests/test_index.py b/tests/test_index.py |
102 |
-index bc24367..4971e3f 100644 |
103 |
---- a/tests/test_index.py |
104 |
-+++ b/tests/test_index.py |
105 |
-@@ -52,11 +52,6 @@ class PackageIndexTestCase(unittest.TestCase): |
106 |
- def setUpClass(cls): |
107 |
- if cls.run_test_server: |
108 |
- cls.server = None |
109 |
-- server_script = os.path.join(HERE, 'pypi-server-standalone.py') |
110 |
-- if not os.path.exists(server_script): |
111 |
-- logger.debug('test server not available - some tests ' |
112 |
-- 'will be skipped.') |
113 |
-- return |
114 |
- pwdfn = os.path.join(HERE, 'passwords') |
115 |
- if not os.path.exists(pwdfn): # pragma: no cover |
116 |
- with open(pwdfn, 'w') as f: |
117 |
-@@ -65,7 +60,7 @@ class PackageIndexTestCase(unittest.TestCase): |
118 |
- if not os.path.isdir(pkgdir): # pragma: no cover |
119 |
- os.mkdir(pkgdir) |
120 |
- cls.sink = sink = open(os.devnull, 'w') |
121 |
-- cmd = [sys.executable, 'pypi-server-standalone.py', |
122 |
-+ cmd = ['pypi-server', |
123 |
- '-P', 'passwords', 'packages'] |
124 |
- cls.server = subprocess.Popen(cmd, stdout=sink, stderr=sink, |
125 |
- cwd=HERE) |
126 |
--- |
127 |
-2.27.0 |
128 |
- |