summaryrefslogtreecommitdiff
path: root/dev-python/google-apitools
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-06-13 10:39:22 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-06-13 10:39:22 +0100
commit9452a6e87b6c2c70513bc47a2470bf9f1168920e (patch)
tree8ac67e26b45f34d71c5aab3621813b100a0d5f00 /dev-python/google-apitools
parentf516638b7fe9592837389826a6152a7e1b251c54 (diff)
gentoo resync : 13.06.2020
Diffstat (limited to 'dev-python/google-apitools')
-rw-r--r--dev-python/google-apitools/Manifest2
-rw-r--r--dev-python/google-apitools/files/google-apitools-0.5.30-abc.patch81
-rw-r--r--dev-python/google-apitools/files/google-apitools-0.5.30-skip-enum-test-on-new-python.patch21
3 files changed, 0 insertions, 104 deletions
diff --git a/dev-python/google-apitools/Manifest b/dev-python/google-apitools/Manifest
index f5b403945b38..1cc612a277d4 100644
--- a/dev-python/google-apitools/Manifest
+++ b/dev-python/google-apitools/Manifest
@@ -1,6 +1,4 @@
-AUX google-apitools-0.5.30-abc.patch 2828 BLAKE2B 52f328e0701002fbc95f2749329e03a682a15113c693030cc3648ca7432b05a4975d2b4437a76bb1e40232d8317cdf3db7e3e3a14fab780326526a494fe05311 SHA512 d53104ebded8c19a4ef74f721056c107b7be42c5936215d4722672e8ace02d4adc2d7fb8589d92b3025950c2535879c4e79e1ab43fa6ac2dfa1ea6e48594aa47
AUX google-apitools-0.5.30-py37.patch 5938 BLAKE2B efc0962d612017903092b7ed37561a09eb78f8b2c189d7c8bf902fd11b711676a230fed57f2671ac0d0c9fdddfbe66ac911d84ce1cfab64ed6b3a865d3ba1aaa SHA512 0cbeaf85568a23224c32647c1e3f6ce3a173093df1d40e36a8f2dd9155f19b3211fc926c054add955934104a069787d7cac03aa86efad526556f3255cdff98f0
-AUX google-apitools-0.5.30-skip-enum-test-on-new-python.patch 807 BLAKE2B 7753d11545ffbf40abd7003e3efa777ec7245151eae2a3ee825e4fd5905af99cee3d5306a9b745d749785f818f6cf6daeca1f25895a179d2ac5aca2a58c18865 SHA512 a614ebefabc75ced727dece6a5a531e857b1282c7e7053c4a5fff90514f8240177ebfac8af8d000791f2adf69d624a2e5d68c16bfd1ec8e1083e354121d6f434
DIST google-apitools-0.5.30_p20200507.tar.gz 365250 BLAKE2B 58d52016775b387b494d8b5897886f059fe74a360098f6527089039469d4d4e3c0d9ec63a12be1215741fd15a1a03e2204f54ace7c9eaf8bbdc8236c9c1fe576 SHA512 94879360c5de3d7405b7377b2baf0fa303c1b0bace56cf75d203b0a509ac028e1d3208a82ba08de7d17e4e26571c9b8601cb07e6897b658eeede9d06fd384fe3
DIST google-apitools-0.5.31.tar.gz 364797 BLAKE2B f61ea1f982653998d9c85782f171f1bbb5f1c20dee067eb5b865d4eb87db8287544aeeb94f722f8cd1d04c45974c15c54ec7edd581287323c9336d11e642f1b6 SHA512 b66b4ee17dca9330c036ad93521ec76ece84b2780743486e58f768db8949875710af256fe6ba8e570c1309b791c0fc0d6fca84342e3ced85fc6fba416cd849e1
EBUILD google-apitools-0.5.30_p20200507.ebuild 1053 BLAKE2B e52b88a54e0140f768849d625eb80208c4bb0831785d4f630bf84ff71f5a350e8c3b3e8dafcd64d77ef588289e457e392bb7da130d33e7ca000962f7d5a254c5 SHA512 bcc2bd37d218564d257f3b72de3200398851a0816fbc2bd9e373ee6700d9b0d49b3433d55bebc835e383d246b3c48385ad7f76297c6a3a183b3e4df3dd2c30ab
diff --git a/dev-python/google-apitools/files/google-apitools-0.5.30-abc.patch b/dev-python/google-apitools/files/google-apitools-0.5.30-abc.patch
deleted file mode 100644
index 32f61a3d889a..000000000000
--- a/dev-python/google-apitools/files/google-apitools-0.5.30-abc.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-commit cfefe5a8322b40c6e7bd3cc794fd644edcc3a6d6
-Author: Karthikeyan Singaravelan <tir.karthi@gmail.com>
-Date: Mon Jan 27 20:21:15 2020 +0530
-
- Import ABC from collections.abc instead of collections for Python 3.9 compatibility. (#286)
-
-diff --git a/apitools/base/py/extra_types.py b/apitools/base/py/extra_types.py
-index 847dc91..e40a785 100644
---- a/apitools/base/py/extra_types.py
-+++ b/apitools/base/py/extra_types.py
-@@ -16,7 +16,6 @@
-
- """Extra types understood by apitools."""
-
--import collections
- import datetime
- import json
- import numbers
-@@ -30,6 +29,11 @@ from apitools.base.py import encoding_helper as encoding
- from apitools.base.py import exceptions
- from apitools.base.py import util
-
-+if six.PY3:
-+ from collections.abc import Iterable
-+else:
-+ from collections import Iterable
-+
- __all__ = [
- 'DateField',
- 'DateTimeMessage',
-@@ -129,7 +133,7 @@ def _PythonValueToJsonValue(py_value):
- return JsonValue(double_value=float(py_value))
- if isinstance(py_value, dict):
- return JsonValue(object_value=_PythonValueToJsonObject(py_value))
-- if isinstance(py_value, collections.Iterable):
-+ if isinstance(py_value, Iterable):
- return JsonValue(array_value=_PythonValueToJsonArray(py_value))
- raise exceptions.InvalidDataError(
- 'Cannot convert "%s" to JsonValue' % py_value)
-@@ -212,7 +216,7 @@ def _JsonProtoToPythonValue(json_proto):
- def _PythonValueToJsonProto(py_value):
- if isinstance(py_value, dict):
- return _PythonValueToJsonObject(py_value)
-- if (isinstance(py_value, collections.Iterable) and
-+ if (isinstance(py_value, Iterable) and
- not isinstance(py_value, six.string_types)):
- return _PythonValueToJsonArray(py_value)
- return _PythonValueToJsonValue(py_value)
-diff --git a/apitools/base/py/util.py b/apitools/base/py/util.py
-index ac1a44c..ad086e4 100644
---- a/apitools/base/py/util.py
-+++ b/apitools/base/py/util.py
-@@ -16,7 +16,6 @@
-
- """Assorted utilities shared between parts of apitools."""
-
--import collections
- import os
- import random
-
-@@ -30,6 +29,11 @@ from apitools.base.protorpclite import messages
- from apitools.base.py import encoding_helper as encoding
- from apitools.base.py import exceptions
-
-+if six.PY3:
-+ from collections.abc import Iterable
-+else:
-+ from collections import Iterable
-+
- __all__ = [
- 'DetectGae',
- 'DetectGce',
-@@ -78,7 +82,7 @@ def NormalizeScopes(scope_spec):
- if isinstance(scope_spec, six.string_types):
- scope_spec = six.ensure_str(scope_spec)
- return set(scope_spec.split(' '))
-- elif isinstance(scope_spec, collections.Iterable):
-+ elif isinstance(scope_spec, Iterable):
- scope_spec = [six.ensure_str(x) for x in scope_spec]
- return set(scope_spec)
- raise exceptions.TypecheckError(
diff --git a/dev-python/google-apitools/files/google-apitools-0.5.30-skip-enum-test-on-new-python.patch b/dev-python/google-apitools/files/google-apitools-0.5.30-skip-enum-test-on-new-python.patch
deleted file mode 100644
index 6003db87a97f..000000000000
--- a/dev-python/google-apitools/files/google-apitools-0.5.30-skip-enum-test-on-new-python.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/apitools/base/protorpclite/descriptor_test.py b/apitools/base/protorpclite/descriptor_test.py
-index fc27ec4..d518e24 100644
---- a/apitools/base/protorpclite/descriptor_test.py
-+++ b/apitools/base/protorpclite/descriptor_test.py
-@@ -16,6 +16,7 @@
- #
-
- """Tests for apitools.base.protorpclite.descriptor."""
-+import sys
- import platform
- import types
-
-@@ -78,7 +79,7 @@ class DescribeEnumTest(test_util.TestCase):
- described.check_initialized()
- self.assertEquals(expected, described)
-
-- @unittest2.skipIf('PyPy' in platform.python_implementation(),
-+ @unittest2.skipIf('PyPy' in platform.python_implementation() or sys.hexversion >= 0x03060000,
- 'todo: reenable this')
- def testEnumWithItems(self):
- class EnumWithItems(messages.Enum):