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/python-distutils-extra/files/, dev-python/python-distutils-extra/
Date: Wed, 05 Aug 2020 15:18:38
Message-Id: 1596640696.65b67009f8f6d65483fdb81362126fcf223639ca.mgorny@gentoo
1 commit: 65b67009f8f6d65483fdb81362126fcf223639ca
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 5 15:10:47 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 5 15:18:16 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65b67009
7
8 dev-python/python-distutils-extra: Remove old
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-python/python-distutils-extra/Manifest | 1 -
13 .../python-distutils-extra-2.44-skip-build.patch | 63 ----------------------
14 .../files/python-distutils-extra-2.44-test.patch | 27 ----------
15 .../python-distutils-extra-2.44-r1.ebuild | 42 ---------------
16 4 files changed, 133 deletions(-)
17
18 diff --git a/dev-python/python-distutils-extra/Manifest b/dev-python/python-distutils-extra/Manifest
19 index 3c6dcf4b79a..beb806cef34 100644
20 --- a/dev-python/python-distutils-extra/Manifest
21 +++ b/dev-python/python-distutils-extra/Manifest
22 @@ -1,2 +1 @@
23 -DIST python-distutils-extra-2.44.tar.bz2 37687 BLAKE2B 3d7e3ad277440bfb6fbade8b890b95aad37589700b69a26ec9a5c30e97491871bc8c8f82b540131859d2ce82cebd3758f29ca510abe28046ffcaa0e7240fad3e SHA512 517222b4e34efba730db53ffeee8b8c8d96bd9d1b6044e6ca84c0f2c1d5c0e044240b899d460c50295615c94c513f7e57db3e34e5db6588a01ec92a73999f822
24 DIST python-distutils-extra-2.45.tar.bz2 38094 BLAKE2B b8c0adcb92d07e087e10389c9671e9eca78a9a634d0092c1633e184fb9d128b006903ce8f2c9deb504b3d1557a8afc78e3edea7f1a2e95734c55099b4a21dd41 SHA512 04d2be290726d7ceed599031bfa960468c6a8654c8d9105dd77cb5744f6908d1c9a6732095692aebde1f1e042ef70b2695d41586663e4d539ee96247a39f02a1
25
26 diff --git a/dev-python/python-distutils-extra/files/python-distutils-extra-2.44-skip-build.patch b/dev-python/python-distutils-extra/files/python-distutils-extra-2.44-skip-build.patch
27 deleted file mode 100644
28 index f2a19990ed3..00000000000
29 --- a/dev-python/python-distutils-extra/files/python-distutils-extra-2.44-skip-build.patch
30 +++ /dev/null
31 @@ -1,63 +0,0 @@
32 -From 4f5e11110ce9cc3f511c798acfc009ce5db4e9ef Mon Sep 17 00:00:00 2001
33 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o>
34 -Date: Tue, 28 Apr 2020 10:48:18 +0200
35 -Subject: [PATCH] Fix install_auto command with --skip-build
36 -
37 -python-distutils-extra seems to rely on a very bad practice of modifying
38 -internal state (file lists) in middle of `build` commands. As a result,
39 -if the package is installed via `build` command followed by `install
40 ---skip-build` (since everything was built already!), most of the files
41 -are not installed.
42 -
43 -Ideally, this would be resolved by making internal state updates
44 -independent of `build` command execution. However, given that
45 -the package is not really alive and worth the effort, let's settle
46 -on a cheap hack of calling all `build_*` subcommands from `install`
47 -if `--skip-build` is used. This partially reverses what standard
48 -distutils `install` command does but it will rebuild only the data files
49 -rather than all C extensions.
50 -
51 -Modify tests to use `--skip-build` unconditionally to test this better.
52 -Testing both scenarios probably makes little sense.
53 ----
54 - DistUtilsExtra/auto.py | 7 +++++++
55 - test/auto.py | 5 +++--
56 - 2 files changed, 10 insertions(+), 2 deletions(-)
57 -
58 -diff --git a/DistUtilsExtra/auto.py b/DistUtilsExtra/auto.py
59 -index ea15183..db45f7a 100644
60 ---- a/DistUtilsExtra/auto.py
61 -+++ b/DistUtilsExtra/auto.py
62 -@@ -711,6 +711,13 @@ class sdist_auto(distutils.command.sdist.sdist):
63 -
64 - class install_auto(distutils.command.install.install):
65 - def run(self):
66 -+ # run build_* subcommands to get file lists if install command
67 -+ # won't run 'build' for us
68 -+ if self.skip_build:
69 -+ self.run_command('build_help')
70 -+ self.run_command('build_i18n')
71 -+ self.run_command('build_icons')
72 -+
73 - # install files from etc/
74 - if os.path.isdir('etc'):
75 - # work around a bug in copy_tree() which fails with "File exists" on
76 -diff --git a/test/auto.py b/test/auto.py
77 -index b9644ba..15780c6 100755
78 ---- a/test/auto.py
79 -+++ b/test/auto.py
80 -@@ -873,8 +873,9 @@ print ('import iamnota.module')
81 - '''
82 - self.install_tree = tempfile.mkdtemp()
83 -
84 -- return self.setup_py(['install', '--no-compile', '--prefix=/usr',
85 -- '--root=' + self.install_tree])
86 -+ self.setup_py(['build'])
87 -+ return self.setup_py(['install', '--no-compile', '--skip-build',
88 -+ '--prefix=/usr', '--root=' + self.install_tree])
89 -
90 - def installed_files(self):
91 - '''Return list of file paths in install tree.'''
92 ---
93 -2.26.2
94 -
95
96 diff --git a/dev-python/python-distutils-extra/files/python-distutils-extra-2.44-test.patch b/dev-python/python-distutils-extra/files/python-distutils-extra-2.44-test.patch
97 deleted file mode 100644
98 index b00fc32d017..00000000000
99 --- a/dev-python/python-distutils-extra/files/python-distutils-extra-2.44-test.patch
100 +++ /dev/null
101 @@ -1,27 +0,0 @@
102 -From 33026583f3b2f59bcc415fae4c1ae84bfd058817 Mon Sep 17 00:00:00 2001
103 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o>
104 -Date: Mon, 27 Apr 2020 21:25:37 +0200
105 -Subject: [PATCH] test: Find .egg-info file rather than guessing path (wrong)
106 -
107 ----
108 - test/auto.py | 4 +++-
109 - 1 file changed, 3 insertions(+), 1 deletion(-)
110 -
111 -diff --git a/test/auto.py b/test/auto.py
112 -index b9644ba..1d605e6 100755
113 ---- a/test/auto.py
114 -+++ b/test/auto.py
115 -@@ -734,7 +734,9 @@ print ('import iamnota.module')
116 - # parse .egg-info
117 - (o, e, s) = self.setup_py(['install_egg_info', '-d', self.install_tree])
118 - self.assertEqual(e, 'ERROR: Python module unknown not found\n')
119 -- egg = self._installed_contents('foo-0.1.egg-info').splitlines()
120 -+ egg_paths = [x for x in inst if x.endswith('.egg-info')]
121 -+ self.assertEqual(len(egg_paths), 1)
122 -+ egg = self._installed_contents(egg_paths[0].strip(os.path.sep)).splitlines()
123 - self.assertIn('Name: foo', egg)
124 -
125 - # check provides
126 ---
127 -2.26.2
128 -
129
130 diff --git a/dev-python/python-distutils-extra/python-distutils-extra-2.44-r1.ebuild b/dev-python/python-distutils-extra/python-distutils-extra-2.44-r1.ebuild
131 deleted file mode 100644
132 index be925cb1c86..00000000000
133 --- a/dev-python/python-distutils-extra/python-distutils-extra-2.44-r1.ebuild
134 +++ /dev/null
135 @@ -1,42 +0,0 @@
136 -# Copyright 1999-2020 Gentoo Authors
137 -# Distributed under the terms of the GNU General Public License v2
138 -
139 -EAPI=7
140 -
141 -DISTUTILS_USE_SETUPTOOLS="rdepend"
142 -PYTHON_COMPAT=( python{3_6,3_7,3_8} )
143 -
144 -inherit distutils-r1
145 -
146 -DESCRIPTION="Gettext support, themed icons and scrollkeeper-based documentation in distutils"
147 -HOMEPAGE="
148 - https://salsa.debian.org/python-team/modules/python-distutils-extra
149 - https://launchpad.net/python-distutils-extra"
150 -SRC_URI="
151 - https://salsa.debian.org/python-team/modules/python-distutils-extra/-/archive/${PV}/${P}.tar.bz2"
152 -
153 -LICENSE="GPL-2+"
154 -SLOT="0"
155 -KEYWORDS="amd64 ~arm ~arm64 ppc x86"
156 -IUSE="test"
157 -RESTRICT="!test? ( test )"
158 -
159 -DOCS=( doc/{README,FAQ} )
160 -
161 -BDEPEND="
162 - test? (
163 - dev-libs/gobject-introspection
164 - dev-python/httplib2[${PYTHON_USEDEP}]
165 - dev-python/pygobject[${PYTHON_USEDEP}]
166 - dev-util/intltool
167 - )"
168 -
169 -PATCHES=(
170 - "${FILESDIR}"/python-distutils-extra-2.44-test.patch
171 - "${FILESDIR}"/python-distutils-extra-2.44-skip-build.patch
172 -)
173 -
174 -python_test() {
175 - unset LINGUAS PYTHONDONTWRITEBYTECODE
176 - "${EPYTHON}" test/auto.py -v || die "Tests fail with ${EPYTHON}"
177 -}