| 1 |
commit: 8b1e7fd32b497092bbe578e3bedd0e5fe0bcca8d |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 26 15:31:55 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 28 07:59:58 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b1e7fd3 |
| 7 |
|
| 8 |
dev-python/twine: Port to py39 |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-python/twine/twine-1.15.0.ebuild | 11 +++++------ |
| 13 |
dev-python/twine/twine-3.1.1.ebuild | 11 +++++------ |
| 14 |
2 files changed, 10 insertions(+), 12 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-python/twine/twine-1.15.0.ebuild b/dev-python/twine/twine-1.15.0.ebuild |
| 17 |
index c306897ff28..685e99a4a62 100644 |
| 18 |
--- a/dev-python/twine/twine-1.15.0.ebuild |
| 19 |
+++ b/dev-python/twine/twine-1.15.0.ebuild |
| 20 |
@@ -3,7 +3,8 @@ |
| 21 |
|
| 22 |
EAPI=7 |
| 23 |
|
| 24 |
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 ) |
| 25 |
+DISTUTILS_USE_SETUPTOOLS=rdepend |
| 26 |
+PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 ) |
| 27 |
|
| 28 |
inherit distutils-r1 |
| 29 |
|
| 30 |
@@ -15,15 +16,15 @@ LICENSE="Apache-2.0" |
| 31 |
SLOT="0" |
| 32 |
KEYWORDS="~alpha amd64 ~arm64 ~hppa ~sparc x86" |
| 33 |
IUSE="test" |
| 34 |
+RESTRICT="!test? ( test )" |
| 35 |
|
| 36 |
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" |
| 37 |
-DEPEND="${CDEPEND} |
| 38 |
+DEPEND=" |
| 39 |
test? ( |
| 40 |
dev-python/pytest[${PYTHON_USEDEP}] |
| 41 |
dev-python/pretend[${PYTHON_USEDEP}] |
| 42 |
) |
| 43 |
" |
| 44 |
-RDEPEND="${CDEPEND} |
| 45 |
+RDEPEND=" |
| 46 |
>=dev-python/tqdm-4.14[${PYTHON_USEDEP}] |
| 47 |
>=dev-python/pkginfo-1.4.2[${PYTHON_USEDEP}] |
| 48 |
>=dev-python/readme_renderer-21.0[${PYTHON_USEDEP}] |
| 49 |
@@ -32,8 +33,6 @@ RDEPEND="${CDEPEND} |
| 50 |
$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_5}) |
| 51 |
" |
| 52 |
|
| 53 |
-RESTRICT="!test? ( test )" |
| 54 |
- |
| 55 |
PATCHES=( |
| 56 |
"${FILESDIR}/twine-1.15.0-tests.patch" |
| 57 |
) |
| 58 |
|
| 59 |
diff --git a/dev-python/twine/twine-3.1.1.ebuild b/dev-python/twine/twine-3.1.1.ebuild |
| 60 |
index 6b1e17bcd56..7217eb64527 100644 |
| 61 |
--- a/dev-python/twine/twine-3.1.1.ebuild |
| 62 |
+++ b/dev-python/twine/twine-3.1.1.ebuild |
| 63 |
@@ -3,7 +3,8 @@ |
| 64 |
|
| 65 |
EAPI=7 |
| 66 |
|
| 67 |
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 ) |
| 68 |
+DISTUTILS_USE_SETUPTOOLS=rdepend |
| 69 |
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 ) |
| 70 |
|
| 71 |
inherit distutils-r1 |
| 72 |
|
| 73 |
@@ -15,9 +16,9 @@ LICENSE="Apache-2.0" |
| 74 |
SLOT="0" |
| 75 |
KEYWORDS="~alpha amd64 ~arm64 x86" |
| 76 |
IUSE="test" |
| 77 |
+RESTRICT="!test? ( test )" |
| 78 |
|
| 79 |
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" |
| 80 |
-BDEPEND="${CDEPEND} |
| 81 |
+BDEPEND=" |
| 82 |
test? ( |
| 83 |
dev-python/jaraco-envs[${PYTHON_USEDEP}] |
| 84 |
dev-python/jaraco-functools[${PYTHON_USEDEP}] |
| 85 |
@@ -28,7 +29,7 @@ BDEPEND="${CDEPEND} |
| 86 |
dev-python/pytest[${PYTHON_USEDEP}] |
| 87 |
) |
| 88 |
" |
| 89 |
-RDEPEND="${CDEPEND} |
| 90 |
+RDEPEND=" |
| 91 |
>=dev-python/tqdm-4.14[${PYTHON_USEDEP}] |
| 92 |
>=dev-python/pkginfo-1.4.2[${PYTHON_USEDEP}] |
| 93 |
>=dev-python/readme_renderer-21.0[${PYTHON_USEDEP}] |
| 94 |
@@ -38,8 +39,6 @@ RDEPEND="${CDEPEND} |
| 95 |
>=dev-python/keyring-15.1[${PYTHON_USEDEP}] |
| 96 |
" |
| 97 |
|
| 98 |
-RESTRICT="!test? ( test )" |
| 99 |
- |
| 100 |
PATCHES=( |
| 101 |
"${FILESDIR}/twine-3.0.0-tests.patch" |
| 102 |
) |
Archives