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/argcomplete/files/, dev-python/argcomplete/
Date: Tue, 24 Dec 2019 10:21:07
Message-Id: 1577182851.664a5c4d0e6c68ff0f270f5d3531df48ca663825.mgorny@gentoo
1 commit: 664a5c4d0e6c68ff0f270f5d3531df48ca663825
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Dec 24 06:05:39 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 24 10:20:51 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=664a5c4d
7
8 dev-python/argcomplete: Remove redundant versions
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-python/argcomplete/Manifest | 2 --
13 dev-python/argcomplete/argcomplete-1.10.0.ebuild | 30 -----------------
14 dev-python/argcomplete/argcomplete-1.10.2.ebuild | 36 --------------------
15 .../files/argcomplete-1.10.2-test-pythonpath.patch | 39 ----------------------
16 4 files changed, 107 deletions(-)
17
18 diff --git a/dev-python/argcomplete/Manifest b/dev-python/argcomplete/Manifest
19 index 46b8846a81c..40279d6af88 100644
20 --- a/dev-python/argcomplete/Manifest
21 +++ b/dev-python/argcomplete/Manifest
22 @@ -1,4 +1,2 @@
23 -DIST argcomplete-1.10.0.tar.gz 47271 BLAKE2B 78a67b56d4871120d7384459c8ee591f42dee195143712c5c70d144d4116041d36ba687d4425beba6258b58d5a0a3ef847d10d6267f372282f37e953c6f92d80 SHA512 59e9cb721ddffd85d9f6461a70d50f9ba0795e36044cd46fa5fe707fb1be28c12f4ef531d2844020efc156300861b2ca8b73f56a116dd54bda0e52cf68c0a411
24 -DIST argcomplete-1.10.2.tar.gz 50128 BLAKE2B 95a7f5a10b5d86e2b065b0d0563ff6281a5d6a0c9ea83b432492a00f67a1321c52cb9d5907868f36351f3057b21d215ab5a897a2ea7530d27925914a9e04eba8 SHA512 5e425f7ed042c429d8c01bdf11b6e721343229ec9fe0e3f9d4a6e49c40473a40286175a82f62530b822294e1fd8539e941c17673f2a0dd05216a243f1c2f4fce
25 DIST argcomplete-1.10.3.tar.gz 50173 BLAKE2B 371baf55b65d49885398d3b2cbc2fa8abda30345643fd3f5700f92b76d4426a5f790835a83c158e47f9ee0f5fb6de8f8696528dc0701a1c8431f205bf2033703 SHA512 ea0fa18c161b395448fc09f5fad1190040ac05bb8c763c1ab775a95a10fcc88342f1b8594edcb07d56728014487f6ac54899b7e4cd16788cdc40cf14a4d60731
26 DIST argcomplete-1.9.4.tar.gz 47471 BLAKE2B ba64acc1fb2ae336166504db3dd991227c4e2a04abc6909ecf6723c1d2ce82ea65453ca2dde97316da9eaaa5b60026a6c8e4f3d658f1ed8122ca4fd00723fca1 SHA512 831958dffc75c65e2a63918d1e6f5e1fa47ec753b913c978e8d1d30d430ab8fedf66c99d8df23b2abc547b42c27335ccf47811224322994316ca2225c85ce346
27
28 diff --git a/dev-python/argcomplete/argcomplete-1.10.0.ebuild b/dev-python/argcomplete/argcomplete-1.10.0.ebuild
29 deleted file mode 100644
30 index bcf6b4e4748..00000000000
31 --- a/dev-python/argcomplete/argcomplete-1.10.0.ebuild
32 +++ /dev/null
33 @@ -1,30 +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 -
39 -PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} pypy pypy3 )
40 -
41 -inherit distutils-r1
42 -
43 -DESCRIPTION="Bash tab completion for argparse"
44 -HOMEPAGE="https://pypi.org/project/argcomplete/"
45 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
46 -
47 -LICENSE="Apache-2.0"
48 -SLOT="0"
49 -KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
50 -IUSE="test"
51 -RESTRICT="!test? ( test )"
52 -
53 -DEPEND="
54 - dev-python/setuptools[${PYTHON_USEDEP}]
55 - test? (
56 - dev-python/pexpect[${PYTHON_USEDEP}]
57 - app-shells/fish
58 - app-shells/tcsh
59 - )"
60 -
61 -python_test() {
62 - "${EPYTHON}" test/test.py -v || die
63 -}
64
65 diff --git a/dev-python/argcomplete/argcomplete-1.10.2.ebuild b/dev-python/argcomplete/argcomplete-1.10.2.ebuild
66 deleted file mode 100644
67 index b4d81cae436..00000000000
68 --- a/dev-python/argcomplete/argcomplete-1.10.2.ebuild
69 +++ /dev/null
70 @@ -1,36 +0,0 @@
71 -# Copyright 1999-2019 Gentoo Authors
72 -# Distributed under the terms of the GNU General Public License v2
73 -
74 -EAPI=7
75 -
76 -PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} pypy pypy3 )
77 -
78 -inherit distutils-r1
79 -
80 -DESCRIPTION="Bash tab completion for argparse"
81 -HOMEPAGE="https://pypi.org/project/argcomplete/"
82 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
83 -
84 -LICENSE="Apache-2.0"
85 -SLOT="0"
86 -KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
87 -IUSE="test"
88 -RESTRICT="!test? ( test )"
89 -
90 -# pip is called as an external tool
91 -BDEPEND="
92 - dev-python/setuptools[${PYTHON_USEDEP}]
93 - test? (
94 - app-shells/fish
95 - app-shells/tcsh
96 - dev-python/pexpect[${PYTHON_USEDEP}]
97 - dev-python/pip
98 - )"
99 -
100 -PATCHES=(
101 - "${FILESDIR}"/argcomplete-1.10.2-test-pythonpath.patch
102 -)
103 -
104 -python_test() {
105 - "${EPYTHON}" test/test.py -v || die
106 -}
107
108 diff --git a/dev-python/argcomplete/files/argcomplete-1.10.2-test-pythonpath.patch b/dev-python/argcomplete/files/argcomplete-1.10.2-test-pythonpath.patch
109 deleted file mode 100644
110 index 18bd22cf189..00000000000
111 --- a/dev-python/argcomplete/files/argcomplete-1.10.2-test-pythonpath.patch
112 +++ /dev/null
113 @@ -1,39 +0,0 @@
114 -From 003cc45b1fa45c766e38c3230423a5662a00d371 Mon Sep 17 00:00:00 2001
115 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o>
116 -Date: Thu, 21 Nov 2019 11:29:41 +0100
117 -Subject: [PATCH] Prepend to PYTHONPATH in test_console_script* instead of
118 - replacing
119 -
120 -Modify _test_console_script() to prepend to PYTHONPATH instead of
121 -overwriting its value. This is necessary so that it is able to find
122 -just-built version of argcomplete that is provided via PYTHONPATH
123 -(vs requiring it to be installed in system-wide directory prior).
124 -
125 -Otherwise, the tests are failing:
126 -
127 - Traceback (most recent call last):
128 - File "./bin/test-package", line 5, in <module>
129 - from test_package import main
130 - File "/tmp/argcomplete/test_dir_pychyg9vqx/test_package/__init__.py", line 4, in <module>
131 - import argcomplete
132 - ModuleNotFoundError: No module named 'argcomplete'
133 ----
134 - test/test.py | 2 +-
135 - 1 file changed, 1 insertion(+), 1 deletion(-)
136 -
137 -diff --git a/test/test.py b/test/test.py
138 -index 98da760..ddf5a03 100755
139 ---- a/test/test.py
140 -+++ b/test/test.py
141 -@@ -1185,7 +1185,7 @@ class TestBashGlobal(TestBash):
142 - with TempDir(prefix='test_dir_py', dir='.'):
143 - self.sh.run_command('cd ' + os.getcwd())
144 - self.sh.run_command('export PATH=$PATH:./bin')
145 -- self.sh.run_command('export PYTHONPATH=.')
146 -+ self.sh.run_command('export PYTHONPATH=.:$PYTHONPATH')
147 - test_package = os.path.join(TEST_DIR, 'test_package')
148 - command = 'pip install {} --target .'.format(test_package)
149 - if not wheel:
150 ---
151 -2.24.0
152 -