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/flit/
Date: Sun, 01 Aug 2021 12:25:16
Message-Id: 1627820359.27d69acc90dd3b17b848bbb92c5374ed2cb83b9f.mgorny@gentoo
1 commit: 27d69acc90dd3b17b848bbb92c5374ed2cb83b9f
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 1 10:11:30 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 1 12:19:19 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27d69acc
7
8 dev-python/flit: Revert "Bump to 3.3.0"
9
10 The commit accidentally included changes to 3.2.0.
11
12 Reverts: 0ebeafe5cae26a6599da337f2a79af02904acd84
13 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
14
15 dev-python/flit/Manifest | 1 -
16 dev-python/flit/flit-3.2.0.ebuild | 15 ++++++++++----
17 dev-python/flit/flit-3.3.0.ebuild | 41 ---------------------------------------
18 3 files changed, 11 insertions(+), 46 deletions(-)
19
20 diff --git a/dev-python/flit/Manifest b/dev-python/flit/Manifest
21 index 84ed16c295b..b98e888eed1 100644
22 --- a/dev-python/flit/Manifest
23 +++ b/dev-python/flit/Manifest
24 @@ -1,3 +1,2 @@
25 DIST flit-2.1.0.tar.gz 106459 BLAKE2B db51d8cc119ae8aa5f8d0ac1655cd29390065567391cbdf06ca7dbb98a79e96a6d8f318273c2f9a58aaf549090a903360701a844ac071d15304a21ea54052a91 SHA512 0fcbfaa1e5e83216a5c98cc87b0a8f2aa17e2c184ec3f09c7dd0dd5e695311be62344ac4f101cb71f87390513496f8c1152a2cd8d7363202f7696ee002f07a55
26 DIST flit-3.2.0.tar.gz 115192 BLAKE2B dda4b9f5b56b9868d737516841d7fc49c0e97ef8a71f9f0628112f68c3dadae89a87aef56cebfe8ec3762af5970d206fe462add146d52b3893fb8852fd7f9625 SHA512 1db7c4118fe1d70d1e318db3bc282747d6cc3f3b626ad68420fa056e585caad9ff0a3f230e17c919ea260ddeb6330effc4bbed8b30d11ed7b27e78d9d7af0445
27 -DIST flit-3.3.0.tar.gz 117809 BLAKE2B 8ad74f70406e41b35b44886b145b52d83fc30d0a1395bf711807da2ae3974ae8606113e4bcd556694854c48c8c01c3c03b4a1021c7cc3e33cce0e99a5abbb9ea SHA512 904889298aab581640e8323fd68c83d753ea97af0ed1b8f438f192d84d09ced83718440a03d23864885fcf966de9665c3046f0f3a1b1d4170b2decf8430ff006
28
29 diff --git a/dev-python/flit/flit-3.2.0.ebuild b/dev-python/flit/flit-3.2.0.ebuild
30 index 4ce07661eaf..289ae980771 100644
31 --- a/dev-python/flit/flit-3.2.0.ebuild
32 +++ b/dev-python/flit/flit-3.2.0.ebuild
33 @@ -1,10 +1,9 @@
34 # Copyright 2019-2021 Gentoo Authors
35 # Distributed under the terms of the GNU General Public License v2
36
37 -EAPI=8
38 +EAPI=7
39
40 -DISTUTILS_USE_SETUPTOOLS=pyproject.toml
41 -PYTHON_COMPAT=( python3_{8..10} pypy3 )
42 +PYTHON_COMPAT=( python3_{7..10} pypy3 )
43 inherit distutils-r1
44
45 DESCRIPTION="Simplified packaging of Python modules"
46 @@ -14,6 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
47 LICENSE="BSD"
48 SLOT="0"
49 KEYWORDS="~amd64 ~x86"
50 +IUSE="test"
51
52 RDEPEND="
53 >=dev-python/flit_core-3.2.0[${PYTHON_USEDEP}]
54 @@ -22,7 +22,7 @@ RDEPEND="
55 dev-python/requests_download[${PYTHON_USEDEP}]
56 dev-python/toml[${PYTHON_USEDEP}]
57 "
58 -BDEPEND="
59 +BDEPEND="${RDEPEND}
60 sys-apps/grep
61 sys-apps/findutils
62 test? (
63 @@ -39,3 +39,10 @@ distutils_enable_tests pytest
64 distutils_enable_sphinx doc \
65 dev-python/sphinxcontrib-github-alt \
66 dev-python/pygments-github-lexers \
67 +
68 +python_prepare_all() {
69 + printf -- "from setuptools import setup, find_packages\nsetup(name='%s',version='%s',%s)" \
70 + "${PN}" "${PV}" "packages=find_packages(exclude=['tests'])" > setup.py || die
71 +
72 + distutils-r1_python_prepare_all
73 +}
74
75 diff --git a/dev-python/flit/flit-3.3.0.ebuild b/dev-python/flit/flit-3.3.0.ebuild
76 deleted file mode 100644
77 index b7434f5ec52..00000000000
78 --- a/dev-python/flit/flit-3.3.0.ebuild
79 +++ /dev/null
80 @@ -1,41 +0,0 @@
81 -# Copyright 2019-2021 Gentoo Authors
82 -# Distributed under the terms of the GNU General Public License v2
83 -
84 -EAPI=8
85 -
86 -DISTUTILS_USE_SETUPTOOLS=pyproject.toml
87 -PYTHON_COMPAT=( python3_{8..10} pypy3 )
88 -inherit distutils-r1
89 -
90 -DESCRIPTION="Simplified packaging of Python modules"
91 -HOMEPAGE="https://github.com/takluyver/flit https://flit.readthedocs.io/"
92 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
93 -
94 -LICENSE="BSD"
95 -SLOT="0"
96 -KEYWORDS="~amd64 ~x86"
97 -
98 -RDEPEND="
99 - >=dev-python/flit_core-3.3.0[${PYTHON_USEDEP}]
100 - dev-python/intreehooks[${PYTHON_USEDEP}]
101 - dev-python/requests[${PYTHON_USEDEP}]
102 - dev-python/requests_download[${PYTHON_USEDEP}]
103 - dev-python/toml[${PYTHON_USEDEP}]
104 -"
105 -BDEPEND="
106 - sys-apps/grep
107 - sys-apps/findutils
108 - test? (
109 - dev-python/responses[${PYTHON_USEDEP}]
110 - dev-python/testpath[${PYTHON_USEDEP}]
111 - )
112 -"
113 -
114 -PATCHES=(
115 - "${FILESDIR}/flit-3.2.0-tests.patch"
116 -)
117 -
118 -distutils_enable_tests pytest
119 -distutils_enable_sphinx doc \
120 - dev-python/sphinxcontrib-github-alt \
121 - dev-python/pygments-github-lexers \