[gentoo-commits] repo/gentoo:master commit in: dev-python/google-apitools/files/, profiles/, dev-python/google-apitools/

[David Seifert]

commit:     44a527b69cab6c19edf7a26f72ab1ddc38310017
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 18 16:42:44 2023 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Mar 18 16:42:44 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44a527b6

dev-python/google-apitools: treeclean

Closes: https://bugs.gentoo.org/718976
Closes: https://bugs.gentoo.org/888249
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 dev-python/google-apitools/Manifest                |   1 -
 .../files/google-apitools-0.5.30-py37.patch        | 144 ---------------------
 .../google-apitools-0.5.32-r1.ebuild               |  31 -----
 dev-python/google-apitools/metadata.xml            |  12 --
 profiles/package.mask                              |   1 -
 5 files changed, 189 deletions(-)

diff --git a/dev-python/google-apitools/Manifest b/dev-python/google-apitools/Manifest
deleted file mode 100644
index 58af2535eda9..000000000000
--- a/dev-python/google-apitools/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST google-apitools-0.5.32.gh.tar.gz 365913 BLAKE2B e43b21e6ce8491c89955bd6c194a1f4076988be2f67280c1bfb8184e1b83a01c307077080d182877d1306814bc38aa0541d9d417cfb93afdd766ddb3c83e0ef5 SHA512 5996d80cb08fd7de3b2df5fbdbe56c885af5d85276a44f174762ac71407227e454d338007035ba2b3deef09384e7bd389f121ea5e19e5e302a054f1033c19b6f

diff --git a/dev-python/google-apitools/files/google-apitools-0.5.30-py37.patch b/dev-python/google-apitools/files/google-apitools-0.5.30-py37.patch
deleted file mode 100644
index 77f2c59b8296..000000000000
--- a/dev-python/google-apitools/files/google-apitools-0.5.30-py37.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-diff --git a/apitools/base/protorpclite/messages.py b/apitools/base/protorpclite/messages.py
-index 0d564e9..5b2346a 100644
---- a/apitools/base/protorpclite/messages.py
-+++ b/apitools/base/protorpclite/messages.py
-@@ -757,6 +757,7 @@ class Message(six.with_metaclass(_MessageClass, object)):
-       order.check_initialized()
- 
-     """
-+    __hash__ = None
- 
-     def __init__(self, **kwargs):
-         """Initialize internal messages state.
-@@ -1079,9 +1080,9 @@ class FieldList(list):
-         if not field_instance.repeated:
-             raise FieldDefinitionError(
-                 'FieldList may only accept repeated fields')
--        self.__field = field_instance
--        self.__field.validate(sequence)
--        list.__init__(self, sequence)
-+        self._field = field_instance
-+        self._field.validate(sequence)
-+        super().__init__(sequence)
- 
-     def __getstate__(self):
-         """Enable pickling.
-@@ -1098,10 +1099,10 @@ class FieldList(list):
-                 None.
- 
-         """
--        message_class = self.__field.message_definition()
-+        message_class = self._field.message_definition()
-         if message_class is None:
--            return self.__field, None, None
--        return None, message_class, self.__field.number
-+            return self._field, None, None
-+        return None, message_class, self._field.number
- 
-     def __setstate__(self, state):
-         """Enable unpickling.
-@@ -1115,41 +1116,43 @@ class FieldList(list):
-         """
-         field_instance, message_class, number = state
-         if field_instance is None:
--            self.__field = message_class.field_by_number(number)
-+            self._field = message_class.field_by_number(number)
-         else:
--            self.__field = field_instance
-+            self._field = field_instance
- 
-     @property
-     def field(self):
-         """Field that validates list."""
--        return self.__field
-+        return self._field
- 
-     def __setslice__(self, i, j, sequence):
-         """Validate slice assignment to list."""
--        self.__field.validate(sequence)
-+        self._field.validate(sequence)
-         list.__setslice__(self, i, j, sequence)
- 
-     def __setitem__(self, index, value):
-         """Validate item assignment to list."""
-         if isinstance(index, slice):
--            self.__field.validate(value)
-+            self._field.validate(value)
-         else:
--            self.__field.validate_element(value)
-+            self._field.validate_element(value)
-         list.__setitem__(self, index, value)
- 
-     def append(self, value):
-         """Validate item appending to list."""
--        self.__field.validate_element(value)
-+        if hasattr(self, '_field'):
-+            self._field.validate_element(value)
-         return list.append(self, value)
- 
-     def extend(self, sequence):
-         """Validate extension of list."""
--        self.__field.validate(sequence)
-+        if hasattr(self, '_field'):
-+            self._field.validate(sequence)
-         return list.extend(self, sequence)
- 
-     def insert(self, index, value):
-         """Validate item insertion to list."""
--        self.__field.validate_element(value)
-+        self._field.validate_element(value)
-         return list.insert(self, index, value)
- 
- 
-diff --git a/apitools/base/protorpclite/messages_test.py b/apitools/base/protorpclite/messages_test.py
-index 3ad75e4..1acdab3 100644
---- a/apitools/base/protorpclite/messages_test.py
-+++ b/apitools/base/protorpclite/messages_test.py
-@@ -508,7 +508,8 @@ class FieldListTest(test_util.TestCase):
-     def testPickle(self):
-         """Testing pickling and unpickling of FieldList instances."""
-         field_list = messages.FieldList(self.integer_field, [1, 2, 3, 4, 5])
--        unpickled = pickle.loads(pickle.dumps(field_list))
-+        pickled = pickle.dumps(field_list)
-+        unpickled = pickle.loads(pickled)
-         self.assertEquals(field_list, unpickled)
-         self.assertIsInstance(unpickled.field, messages.IntegerField)
-         self.assertEquals(1, unpickled.field.number)
-diff --git a/apitools/base/protorpclite/protojson_test.py b/apitools/base/protorpclite/protojson_test.py
-index 7a8f875..69804f5 100644
---- a/apitools/base/protorpclite/protojson_test.py
-+++ b/apitools/base/protorpclite/protojson_test.py
-@@ -440,7 +440,7 @@ class ProtojsonTest(test_util.TestCase,
-         """Test decoding improperly encoded base64 bytes value."""
-         self.assertRaisesWithRegexpMatch(
-             messages.DecodeError,
--            'Base64 decoding error: Incorrect padding',
-+            'Base64 decoding error: (?:Incorrect padding|Invalid base64-encoded string: .*)',
-             protojson.decode_message,
-             test_util.OptionalMessage,
-             '{"bytes_value": "abcdefghijklmnopq"}')
-diff --git a/apitools/base/py/batch_test.py b/apitools/base/py/batch_test.py
-index 90cf4fb..e1384c5 100644
---- a/apitools/base/py/batch_test.py
-+++ b/apitools/base/py/batch_test.py
-@@ -357,7 +357,7 @@ class BatchTest(unittest.TestCase):
-         self._DoTestConvertIdToHeader('blah', '<%s+blah>')
- 
-     def testConvertIdThatNeedsEscaping(self):
--        self._DoTestConvertIdToHeader('~tilde1', '<%s+%%7Etilde1>')
-+        self._DoTestConvertIdToHeader('#hash1', r'<%s+%%23hash1>')
- 
-     def _DoTestConvertHeaderToId(self, header, expected_id):
-         batch_request = batch.BatchHttpRequest('https://www.example.com')
-diff --git a/apitools/gen/client_generation_test.py b/apitools/gen/client_generation_test.py
-index 4e382dd..c26db39 100644
---- a/apitools/gen/client_generation_test.py
-+++ b/apitools/gen/client_generation_test.py
-@@ -42,6 +42,7 @@ class ClientGenerationTest(unittest.TestCase):
-         self.gen_client_binary = 'gen_client'
- 
-     @test_utils.SkipOnWindows
-+    @unittest.skip('needs network access')
-     def testGeneration(self):
-         for api in _API_LIST:
-             with test_utils.TempDir(change_to=True):

diff --git a/dev-python/google-apitools/google-apitools-0.5.32-r1.ebuild b/dev-python/google-apitools/google-apitools-0.5.32-r1.ebuild
deleted file mode 100644
index 8e201b95b35c..000000000000
--- a/dev-python/google-apitools/google-apitools-0.5.32-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
-inherit distutils-r1
-
-COMMIT_HASH="7975c0cdbae1b9fc106553ce46e4a59cf0bea1e1"
-DESCRIPTION="Python library to manipulate Google APIs"
-HOMEPAGE="https://github.com/google/apitools"
-SRC_URI="https://github.com/google/apitools/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}/${P#google-}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-RDEPEND=">=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.14[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-1.5.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
-	>=dev-python/python-gflags-3.1.2[${PYTHON_USEDEP}]"
-BDEPEND="test? ( >=dev-python/mock-1.0.1[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/google-apitools-0.5.30-py37.patch"
-)
-
-distutils_enable_tests nose

diff --git a/dev-python/google-apitools/metadata.xml b/dev-python/google-apitools/metadata.xml
deleted file mode 100644
index 837b1fee7452..000000000000
--- a/dev-python/google-apitools/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@g.o</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">google/apitools</remote-id>
-		<remote-id type="pypi">google-apitools</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/profiles/package.mask b/profiles/package.mask
index d7400f1453fd..11f720f716fa 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -288,7 +288,6 @@ acct-group/jabber
 app-misc/gcalcli
 app-misc/goobook
 dev-python/gcs-oauth2-boto-plugin
-dev-python/google-apitools
 
 # Michał Górny <mgorny@g.o> (2023-02-02)
 # dev-python/citeproc-py requires dev-python/nose and is not maintained