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/boto3/
Date: Tue, 18 Jan 2022 22:44:43
Message-Id: 1642545861.ac9c41e0fcb271c4bcb72a16bfc56527929d5e67.mgorny@gentoo
1 commit: ac9c41e0fcb271c4bcb72a16bfc56527929d5e67
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 18 21:44:10 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 18 22:44:21 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac9c41e0
7
8 dev-python/boto3: Bump to 1.20.38
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-python/boto3/Manifest | 1 +
13 .../boto3/{boto3-9999.ebuild => boto3-1.20.38.ebuild} | 18 +++++++++++-------
14 dev-python/boto3/boto3-9999.ebuild | 18 +++++++++++-------
15 3 files changed, 23 insertions(+), 14 deletions(-)
16
17 diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
18 index e29eefedc9e7..597e8ac8f950 100644
19 --- a/dev-python/boto3/Manifest
20 +++ b/dev-python/boto3/Manifest
21 @@ -10,4 +10,5 @@ DIST boto3-1.20.33.tar.gz 459654 BLAKE2B bf2090e6af9cad5f4e9e5178d30e109c63c4031
22 DIST boto3-1.20.34.tar.gz 460169 BLAKE2B d687bb3a90da0e8cd48e551dad68754edc97689350f43879c90e8c96470dc79d389b5332d06d079dd4d26f303d9260f1a83bfc2edfa2507e3a33020e4475e8f1 SHA512 ae13db5ed516a9166c14e72e078f45c911a9c16edc2e2d95dc296de09345fb311ecad92ec7615137b01edaae254d075b74e68c1c909a79b2eb1ac2416ab5bbad
23 DIST boto3-1.20.35.tar.gz 460636 BLAKE2B 4ec04ae5caac912beb4933727ef0f8f1266b9ab27788a98d7ae10fc8b19a79e3deeed0ce6c1156f12ad12062df24828909fff070813fae4efc705b5e7babc2b1 SHA512 59fcaf477d5d67d68dcc007d93391b71ad8d04d46fc3c098c3f0fb7c82806a1a37999bdb292a240862dbaf83a6c2890d947315d1d9a4faeae68fb9e896cae73b
24 DIST boto3-1.20.37.tar.gz 461197 BLAKE2B 4ae94815809401378bbd6c6b7774776c62436c3ae379be44b045105d00ffdebc6cfba1112ed6d4693662c6a00b5de53b4fcd1ea605a93cccb1406f3f983d8c9a SHA512 368abbe51e814b5a8080323f436d8e0b5ea660b31abd77a49299afd6363c3d10e51883a3237f06799be53472c3e24c76f5ba3ece8cc9721b87fe3fb40ad8911f
25 +DIST boto3-1.20.38.tar.gz 461687 BLAKE2B 8a2959be81279d20036f1f9da239260f3161f6b7f8c25716ad56075b354cc24bd555bbd32f5addf6e0cf3447676a54ee01f9f6a14e907214c248e1e20941e215 SHA512 73c080e466d2c45dcfb897e2d7390fa4c1acd93625791b6c6a96b8b48b9990aa4e5377486293e92701392faacfdeaa97579dbdc6f29a48ba5ddba0037533a4cf
26 DIST boto3-1.20.5.tar.gz 439166 BLAKE2B c140e15e497e6cdf6b4b77bb99e0a0f5ac01d5b5793f8bfb210b52bbc09e39e6fe06a957951375e0795210dc1c3b2a0afd2f498bc88e449d9e6846f2b357f016 SHA512 2823466e4851684253d4ce42a8c34e5cbdad6d04c823040fe2cebdf0cffb14d5d3f40e28d57ebec14533fab04ba74f27c25f078ddb8791b8f52d0424e11b39fc
27
28 diff --git a/dev-python/boto3/boto3-9999.ebuild b/dev-python/boto3/boto3-1.20.38.ebuild
29 similarity index 71%
30 copy from dev-python/boto3/boto3-9999.ebuild
31 copy to dev-python/boto3/boto3-1.20.38.ebuild
32 index 666cbfa63e3f..48ea5aa483a1 100644
33 --- a/dev-python/boto3/boto3-9999.ebuild
34 +++ b/dev-python/boto3/boto3-1.20.38.ebuild
35 @@ -1,8 +1,9 @@
36 -# Copyright 1999-2021 Gentoo Authors
37 +# Copyright 1999-2022 Gentoo Authors
38 # Distributed under the terms of the GNU General Public License v2
39
40 -EAPI=7
41 +EAPI=8
42
43 +DISTUTILS_USE_PEP517=setuptools
44 PYTHON_COMPAT=( python3_{8..10} )
45 inherit distutils-r1
46
47 @@ -17,7 +18,7 @@ if [[ "${PV}" == "9999" ]]; then
48 BOTOCORE_PV=${PV}
49 else
50 SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
51 - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
52 + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
53
54 # botocore is x.(y+3).z
55 BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
56 @@ -36,7 +37,7 @@ BDEPEND="
57
58 distutils_enable_sphinx docs/source \
59 'dev-python/guzzle_sphinx_theme'
60 -distutils_enable_tests nose
61 +distutils_enable_tests pytest
62
63 python_prepare_all() {
64 # don't lock versions to narrow ranges
65 @@ -45,12 +46,15 @@ python_prepare_all() {
66 -e '/s3transfer/ d' \
67 -i setup.py || die
68
69 - # prevent an infinite loop
70 - rm tests/functional/docs/test_smoke.py || die
71 + # do not rely on bundled deps in botocore (sic!)
72 + find -name '*.py' -exec sed -i \
73 + -e 's:from botocore[.]vendored import:import:' \
74 + -e 's:from botocore[.]vendored[.]:from :' \
75 + {} + || die
76
77 distutils-r1_python_prepare_all
78 }
79
80 python_test() {
81 - nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
82 + epytest tests/{functional,unit}
83 }
84
85 diff --git a/dev-python/boto3/boto3-9999.ebuild b/dev-python/boto3/boto3-9999.ebuild
86 index 666cbfa63e3f..48ea5aa483a1 100644
87 --- a/dev-python/boto3/boto3-9999.ebuild
88 +++ b/dev-python/boto3/boto3-9999.ebuild
89 @@ -1,8 +1,9 @@
90 -# Copyright 1999-2021 Gentoo Authors
91 +# Copyright 1999-2022 Gentoo Authors
92 # Distributed under the terms of the GNU General Public License v2
93
94 -EAPI=7
95 +EAPI=8
96
97 +DISTUTILS_USE_PEP517=setuptools
98 PYTHON_COMPAT=( python3_{8..10} )
99 inherit distutils-r1
100
101 @@ -17,7 +18,7 @@ if [[ "${PV}" == "9999" ]]; then
102 BOTOCORE_PV=${PV}
103 else
104 SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
105 - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
106 + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
107
108 # botocore is x.(y+3).z
109 BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
110 @@ -36,7 +37,7 @@ BDEPEND="
111
112 distutils_enable_sphinx docs/source \
113 'dev-python/guzzle_sphinx_theme'
114 -distutils_enable_tests nose
115 +distutils_enable_tests pytest
116
117 python_prepare_all() {
118 # don't lock versions to narrow ranges
119 @@ -45,12 +46,15 @@ python_prepare_all() {
120 -e '/s3transfer/ d' \
121 -i setup.py || die
122
123 - # prevent an infinite loop
124 - rm tests/functional/docs/test_smoke.py || die
125 + # do not rely on bundled deps in botocore (sic!)
126 + find -name '*.py' -exec sed -i \
127 + -e 's:from botocore[.]vendored import:import:' \
128 + -e 's:from botocore[.]vendored[.]:from :' \
129 + {} + || die
130
131 distutils-r1_python_prepare_all
132 }
133
134 python_test() {
135 - nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
136 + epytest tests/{functional,unit}
137 }