Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/oauth2client/, dev-python/oauth2client/files/, profiles/
Date: Sat, 18 Mar 2023 16:45:30
Message-Id: 1679157762.96f18d1fb9e250cbfa3e2eb0d3129e5ee4d3b2d9.soap@gentoo
1 commit: 96f18d1fb9e250cbfa3e2eb0d3129e5ee4d3b2d9
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sat Mar 18 16:42:42 2023 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sat Mar 18 16:42:42 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96f18d1f
7
8 dev-python/oauth2client: treeclean
9
10 Closes: https://bugs.gentoo.org/733064
11 Signed-off-by: David Seifert <soap <AT> gentoo.org>
12
13 dev-python/oauth2client/Manifest | 2 -
14 .../files/oauth2client-4.1.3-py38.patch | 35 ---------
15 dev-python/oauth2client/metadata.xml | 13 ----
16 .../oauth2client/oauth2client-4.1.3-r2.ebuild | 52 -------------
17 .../oauth2client/oauth2client-4.1.3-r3.ebuild | 85 ----------------------
18 profiles/package.mask | 1 -
19 6 files changed, 188 deletions(-)
20
21 diff --git a/dev-python/oauth2client/Manifest b/dev-python/oauth2client/Manifest
22 deleted file mode 100644
23 index d913489a234e..000000000000
24 --- a/dev-python/oauth2client/Manifest
25 +++ /dev/null
26 @@ -1,2 +0,0 @@
27 -DIST oauth2client-4.1.3-fixes-20230207.patch 21827 BLAKE2B c04886be0efad92fff75f0d78c5597bbc386939001f1fc5d094f96899bcc25bbd80c4e620cdf401a45c7ed48a8c83515adc98a190cecbbd345f55b78ca4a0257 SHA512 4d648aff20e56628c6fa916627851d7bb50f927c1cb1a056e115130e0aec128e7e2a5571b4a35a167bbcf01762669c22008cffd5530e0006846250d32b3f8093
28 -DIST oauth2client-4.1.3.tar.gz 185589 BLAKE2B 6cd61448e0d55cef7f2ba640c8cbb50ac83e76d0993391eb0acb3e156f937fcdee80576c9d45d505235a9f266495069664ccbfafd649a4e2d7a0990517ee8cb6 SHA512 80f49e09a6dd6767307a2c278544926fbf20b4f55e4cf83563ac7a7c1043622bd3c8c7fcf6de62896b623ca8c7947b309a5e6bf2b7cb0fccff3ff7634386b287
29
30 diff --git a/dev-python/oauth2client/files/oauth2client-4.1.3-py38.patch b/dev-python/oauth2client/files/oauth2client-4.1.3-py38.patch
31 deleted file mode 100644
32 index d0898c02036a..000000000000
33 --- a/dev-python/oauth2client/files/oauth2client-4.1.3-py38.patch
34 +++ /dev/null
35 @@ -1,35 +0,0 @@
36 -diff --git a/oauth2client/contrib/xsrfutil.py b/oauth2client/contrib/xsrfutil.py
37 -index 7c3ec03..20f35c9 100644
38 ---- a/oauth2client/contrib/xsrfutil.py
39 -+++ b/oauth2client/contrib/xsrfutil.py
40 -@@ -44,7 +44,7 @@ def generate_token(key, user_id, action_id='', when=None):
41 - Returns:
42 - A string XSRF protection token.
43 - """
44 -- digester = hmac.new(_helpers._to_bytes(key, encoding='utf-8'))
45 -+ digester = hmac.new(_helpers._to_bytes(key, encoding='utf-8'), digestmod='MD5')
46 - digester.update(_helpers._to_bytes(str(user_id), encoding='utf-8'))
47 - digester.update(DELIMITER)
48 - digester.update(_helpers._to_bytes(action_id, encoding='utf-8'))
49 -diff --git a/tests/contrib/test_xsrfutil.py b/tests/contrib/test_xsrfutil.py
50 -index 3115827..deae568 100644
51 ---- a/tests/contrib/test_xsrfutil.py
52 -+++ b/tests/contrib/test_xsrfutil.py
53 -@@ -54,7 +54,7 @@ class Test_generate_token(unittest.TestCase):
54 - TEST_USER_ID_1,
55 - action_id=TEST_ACTION_ID_1,
56 - when=TEST_TIME)
57 -- hmac.new.assert_called_once_with(TEST_KEY)
58 -+ hmac.new.assert_called_once_with(TEST_KEY, digestmod='MD5')
59 - digester.digest.assert_called_once_with()
60 -
61 - expected_digest_calls = [
62 -@@ -87,7 +87,7 @@ class Test_generate_token(unittest.TestCase):
63 - TEST_USER_ID_1,
64 - action_id=TEST_ACTION_ID_1)
65 -
66 -- hmac.new.assert_called_once_with(TEST_KEY)
67 -+ hmac.new.assert_called_once_with(TEST_KEY, digestmod='MD5')
68 - time.time.assert_called_once_with()
69 - digester.digest.assert_called_once_with()
70 -
71
72 diff --git a/dev-python/oauth2client/metadata.xml b/dev-python/oauth2client/metadata.xml
73 deleted file mode 100644
74 index 465b9dc1a08f..000000000000
75 --- a/dev-python/oauth2client/metadata.xml
76 +++ /dev/null
77 @@ -1,13 +0,0 @@
78 -<?xml version="1.0" encoding="UTF-8"?>
79 -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
80 -<pkgmetadata>
81 - <maintainer type="project">
82 - <email>python@g.o</email>
83 - <name>Python</name>
84 - </maintainer>
85 - <stabilize-allarches/>
86 - <upstream>
87 - <remote-id type="github">googleapis/oauth2client</remote-id>
88 - <remote-id type="pypi">oauth2client</remote-id>
89 - </upstream>
90 -</pkgmetadata>
91
92 diff --git a/dev-python/oauth2client/oauth2client-4.1.3-r2.ebuild b/dev-python/oauth2client/oauth2client-4.1.3-r2.ebuild
93 deleted file mode 100644
94 index f17e9279839b..000000000000
95 --- a/dev-python/oauth2client/oauth2client-4.1.3-r2.ebuild
96 +++ /dev/null
97 @@ -1,52 +0,0 @@
98 -# Copyright 1999-2023 Gentoo Authors
99 -# Distributed under the terms of the GNU General Public License v2
100 -
101 -EAPI=8
102 -
103 -DISTUTILS_USE_PEP517=setuptools
104 -PYTHON_COMPAT=( python3_{9..10} )
105 -
106 -inherit distutils-r1
107 -
108 -DESCRIPTION="Library for accessing resources protected by OAuth 2.0"
109 -HOMEPAGE="https://github.com/googleapis/oauth2client"
110 -SRC_URI="https://github.com/googleapis/oauth2client/archive/v${PV/_p/-post}.tar.gz -> ${P}.tar.gz"
111 -S="${WORKDIR}"/${P/_p/-post}
112 -
113 -LICENSE="Apache-2.0"
114 -SLOT="0"
115 -KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
116 -
117 -RDEPEND="
118 - >=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
119 - >=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
120 - >=dev-python/pyasn1-modules-0.0.5[${PYTHON_USEDEP}]
121 - >=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
122 - >=dev-python/six-1.6.1[${PYTHON_USEDEP}]
123 - dev-python/keyring[${PYTHON_USEDEP}]
124 - !<=dev-python/google-api-python-client-1.1[${PYTHON_USEDEP}]
125 -"
126 -BDEPEND="
127 - test? (
128 - dev-python/flask[${PYTHON_USEDEP}]
129 - dev-python/sqlalchemy[${PYTHON_USEDEP}]
130 - )
131 -"
132 -
133 -distutils_enable_tests nose
134 -
135 -PATCHES=(
136 - "${FILESDIR}/oauth2client-4.1.3-py38.patch"
137 -)
138 -
139 -python_test() {
140 - nosetests -v \
141 - -e appengine \
142 - -e django_util \
143 - -e test_multiprocess_file_storage \
144 - -e test_bad_positional || die "tests fail with ${EPYTHON}"
145 - # appengine - requires appengine
146 - # django_util - requires django
147 - # test_multiprocess_file_storage - requires fasteners
148 - # test_bad_positional - expects TypeError, gets ValueError
149 -}
150
151 diff --git a/dev-python/oauth2client/oauth2client-4.1.3-r3.ebuild b/dev-python/oauth2client/oauth2client-4.1.3-r3.ebuild
152 deleted file mode 100644
153 index fd404d1b6b8e..000000000000
154 --- a/dev-python/oauth2client/oauth2client-4.1.3-r3.ebuild
155 +++ /dev/null
156 @@ -1,85 +0,0 @@
157 -# Copyright 1999-2023 Gentoo Authors
158 -# Distributed under the terms of the GNU General Public License v2
159 -
160 -EAPI=8
161 -
162 -DISTUTILS_USE_PEP517=setuptools
163 -PYTHON_COMPAT=( python3_{9..11} )
164 -
165 -inherit distutils-r1
166 -
167 -DESCRIPTION="Library for accessing resources protected by OAuth 2.0"
168 -HOMEPAGE="https://github.com/googleapis/oauth2client"
169 -SRC_URI="
170 - https://github.com/googleapis/oauth2client/archive/v${PV/_p/-post}.tar.gz -> ${P}.tar.gz
171 - https://dev.gentoo.org/~robbat2/distfiles/oauth2client-4.1.3-fixes-20230207.patch
172 - "
173 -S="${WORKDIR}"/${P/_p/-post}
174 -
175 -LICENSE="Apache-2.0"
176 -SLOT="0"
177 -KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
178 -
179 -# This package supports 3 different crypto options, but tests ALL of them
180 -CRYPTO_A=">=dev-python/pycryptodome-2.6[${PYTHON_USEDEP}]"
181 -CRYPTO_B="dev-python/pyopenssl[${PYTHON_USEDEP}]"
182 -CRYPTO_C="(
183 - >=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
184 - >=dev-python/pyasn1-modules-0.0.5[${PYTHON_USEDEP}]
185 - >=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
186 - )"
187 -
188 -RDEPEND="
189 - >=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
190 - >=dev-python/six-1.6.1[${PYTHON_USEDEP}]
191 - || ( ${CRYPTO_A} ${CRYPTO_B} ${CRYPTO_C} )
192 - dev-python/keyring[${PYTHON_USEDEP}]
193 - !<=dev-python/google-api-python-client-1.1[${PYTHON_USEDEP}]
194 -"
195 -
196 -# Not well-tested upstream, and broken:
197 -# django dev-python/django[${PYTHON_USEDEP}]
198 -# flask dev-python/flask[${PYTHON_USEDEP}]
199 -BDEPEND="
200 - test? (
201 - dev-python/mock[${PYTHON_USEDEP}]
202 - dev-python/sqlalchemy[${PYTHON_USEDEP}]
203 - dev-python/fasteners[${PYTHON_USEDEP}]
204 - ${CRYPTO_A}
205 - ${CRYPTO_B}
206 - ${CRYPTO_C}
207 - )
208 -"
209 -
210 -distutils_enable_tests pytest
211 -
212 -PATCHES=(
213 - "${DISTDIR}/oauth2client-4.1.3-fixes-20230207.patch"
214 -)
215 -
216 -src_prepare() {
217 - default
218 - # These contrib modules are broken upstream:
219 - REMOVE=(
220 - # django
221 - "${S}"/oauth2client/contrib/django_util/
222 - "${S}"/samples/django/
223 - "${S}"/tests/contrib/django_util/
224 - "${S}"/docs/source/oauth2client.contrib.django*
225 - # flask
226 - "${S}"/docs/source/oauth2client.contrib.flask_util.rst
227 - "${S}"/oauth2client/contrib/flask_util.py
228 - "${S}"/tests/contrib/test_flask_util.py
229 - )
230 - rm -rf "${REMOVE[@]}"
231 -}
232 -
233 -python_test() {
234 - TEST_ARGS=(
235 - # appengine - requires appengine
236 - # django_util - requires django, contrib module broken upstream
237 - # flash - requires flask, contrib module broken upstream
238 - --ignore-glob='*appengine*'
239 - )
240 - epytest "${TEST_ARGS[@]}" || die "tests fail with ${EPYTHON}"
241 -}
242
243 diff --git a/profiles/package.mask b/profiles/package.mask
244 index 09147061c4ae..642868a4ba1b 100644
245 --- a/profiles/package.mask
246 +++ b/profiles/package.mask
247 @@ -290,7 +290,6 @@ app-misc/goobook
248 dev-python/gcs-oauth2-boto-plugin
249 dev-python/google-apitools
250 dev-python/google-reauth-python
251 -dev-python/oauth2client
252
253 # Michał Górny <mgorny@g.o> (2023-02-02)
254 # dev-python/citeproc-py requires dev-python/nose and is not maintained