summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2023-03-18 17:42:41 +0100
committerDavid Seifert <soap@gentoo.org>2023-03-18 17:42:41 +0100
commite6d4c9e216ec158e7f2e5d866e5928a0667781e6 (patch)
tree36694a037009dc9854204b48fcc494ff655176d3 /net-misc
parentdev-java/jspeex: treeclean (diff)
downloadgentoo-e6d4c9e216ec158e7f2e5d866e5928a0667781e6.tar.gz
gentoo-e6d4c9e216ec158e7f2e5d866e5928a0667781e6.tar.bz2
gentoo-e6d4c9e216ec158e7f2e5d866e5928a0667781e6.zip
net-misc/gsutil: treeclean
Closes: https://bugs.gentoo.org/527608 Closes: https://bugs.gentoo.org/687694 Closes: https://bugs.gentoo.org/718976 Closes: https://bugs.gentoo.org/857900 Closes: https://bugs.gentoo.org/861632 Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/gsutil/Manifest1
-rw-r--r--net-misc/gsutil/files/dummy.boto6
-rw-r--r--net-misc/gsutil/files/gsutil-4.41-tests.patch14
-rw-r--r--net-misc/gsutil/files/gsutil-4.50-boto-tests.patch44
-rw-r--r--net-misc/gsutil/files/gsutil-4.50-tests.patch57
-rw-r--r--net-misc/gsutil/gsutil-5.9.ebuild91
-rw-r--r--net-misc/gsutil/metadata.xml16
7 files changed, 0 insertions, 229 deletions
diff --git a/net-misc/gsutil/Manifest b/net-misc/gsutil/Manifest
deleted file mode 100644
index a433eb32b814..000000000000
--- a/net-misc/gsutil/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gsutil_5.9.tar.gz 11620858 BLAKE2B 09f2a79d14458a6545c45df23bd86a2769a00441ff03ae47a984cf18ae20c38e7b725f148c4e1d465f850f89871ad70b29463b8c829674d9d70d330b008595c7 SHA512 4916f3ac9c00c310a3dbc342ea0ab245cdf6952a4cee4e5b810f73254fb93439bcd7be35acbedac43501c3f19d8851848eeeff5b6ada6f31d93d478809518e35
diff --git a/net-misc/gsutil/files/dummy.boto b/net-misc/gsutil/files/dummy.boto
deleted file mode 100644
index 93e9dd2f8c77..000000000000
--- a/net-misc/gsutil/files/dummy.boto
+++ /dev/null
@@ -1,6 +0,0 @@
-# dummy .boto file for testing
-
-[Credentials]
-gs_oauth2_refresh_token = 1/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-
-[GSUtil]
diff --git a/net-misc/gsutil/files/gsutil-4.41-tests.patch b/net-misc/gsutil/files/gsutil-4.41-tests.patch
deleted file mode 100644
index 9b4a0bf509ae..000000000000
--- a/net-misc/gsutil/files/gsutil-4.41-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/gslib/third_party/storage_apitools/storage_v1_client.py b/gslib/third_party/storage_apitools/storage_v1_client.py
-index b8162310..933082e9 100644
---- a/gslib/third_party/storage_apitools/storage_v1_client.py
-+++ b/gslib/third_party/storage_apitools/storage_v1_client.py
-@@ -64,8 +64,7 @@ class StorageV1(base_api.BaseApiClient):
- log_request=log_request, log_response=log_response,
- credentials_args=credentials_args,
- default_global_params=default_global_params,
-- additional_http_headers=additional_http_headers,
-- response_encoding=response_encoding)
-+ additional_http_headers=additional_http_headers)
- self._version = version
- self.bucketAccessControls = self.BucketAccessControlsService(self)
- self.buckets = self.BucketsService(self)
diff --git a/net-misc/gsutil/files/gsutil-4.50-boto-tests.patch b/net-misc/gsutil/files/gsutil-4.50-boto-tests.patch
deleted file mode 100644
index 5a9b601604da..000000000000
--- a/net-misc/gsutil/files/gsutil-4.50-boto-tests.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- gsutil.orig/gslib/vendored/boto/tests/integration/s3/mock_storage_service.py 2020-04-10 13:26:12.000000000 -0700
-+++ gsutil/gslib/vendored/boto/tests/integration/s3/mock_storage_service.py 2020-05-07 11:11:14.971631528 -0700
-@@ -30,13 +30,11 @@
- import boto
- import base64
- import re
--import six
- from hashlib import md5
-
- from boto.utils import compute_md5
- from boto.utils import find_matching_headers
- from boto.utils import merge_headers_by_name
--from boto.utils import write_to_fd
- from boto.s3.prefix import Prefix
--from boto.compat import six
-+import six
-
-@@ -90,14 +88,12 @@
- torrent=NOT_IMPL,
- version_id=NOT_IMPL,
- res_download_handler=NOT_IMPL):
-- data = six.ensure_binary(self.data)
-- write_to_fd(fp, data)
-+ fp.write(six.ensure_str(self.data, errors='replace'))
-
- def get_file(self, fp, headers=NOT_IMPL, cb=NOT_IMPL, num_cb=NOT_IMPL,
- torrent=NOT_IMPL, version_id=NOT_IMPL,
- override_num_retries=NOT_IMPL):
-- data = six.ensure_binary(self.data)
-- write_to_fd(fp, data)
-+ fp.write(self.data)
-
- def _handle_headers(self, headers):
- if not headers:
-@@ -284,9 +280,6 @@
- else:
- return '<Subresource/>'
-
-- def get_tags(self):
-- return []
--
- def new_key(self, key_name=None):
- mock_key = MockKey(self, key_name)
- self.keys[key_name] = mock_key
diff --git a/net-misc/gsutil/files/gsutil-4.50-tests.patch b/net-misc/gsutil/files/gsutil-4.50-tests.patch
deleted file mode 100644
index 757f1f4ed4d5..000000000000
--- a/net-misc/gsutil/files/gsutil-4.50-tests.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/gslib/boto_translation.py b/gslib/boto_translation.py
-index 0af2e663..7d2f549f 100644
---- a/gslib/boto_translation.py
-+++ b/gslib/boto_translation.py
-@@ -1457,7 +1457,8 @@ class BotoTranslation(CloudApi):
- # TODO: Define tags-related methods on storage_uri objects. In the
- # meantime, we invoke the underlying bucket's methods directly.
- try:
-- boto_tags = bucket_uri.get_bucket().get_tags()
-+ bucket = bucket_uri.get_bucket()
-+ boto_tags = bucket.get_tags() if hasattr(bucket, 'get_tags') else []
- cloud_api_bucket.labels = (
- LabelTranslation.BotoTagsToMessage(boto_tags))
- except boto.exception.StorageResponseError as e:
-diff --git a/gslib/tests/test_naming.py b/gslib/tests/test_naming.py
-index d91cda04..6b44719f 100644
---- a/gslib/tests/test_naming.py
-+++ b/gslib/tests/test_naming.py
-@@ -36,6 +36,7 @@ from __future__ import unicode_literals
-
- import gzip
- import os
-+import unittest
-
- import six
-
-@@ -504,6 +505,7 @@ class GsutilNamingTests(testcase.GsUtilUnitTestCase):
- self.assertEqual(1, len(actual))
- self.assertEqual('/obj', actual[0].root_object.name)
-
-+ @unittest.skip('test appears to be flakey')
- def testCopyingCompressedFileToBucket(self):
- """Tests copying one file with compression to a bucket."""
- src_file = self.CreateTempFile(contents=b'plaintext', file_name='f2.txt')
-diff --git a/gslib/tests/testcase/unit_testcase.py b/gslib/tests/testcase/unit_testcase.py
-index b25352b6..c958f670 100644
---- a/gslib/tests/testcase/unit_testcase.py
-+++ b/gslib/tests/testcase/unit_testcase.py
-@@ -27,7 +27,6 @@ import tempfile
- import six
-
- import boto
--from boto.utils import get_utf8able_str
- from gslib import project_id
- from gslib import wildcard_iterator
- from gslib.boto_translation import BotoTranslation
-@@ -157,8 +156,8 @@ class GsUtilUnitTestCase(base.GsUtilTestCase):
- stderr = sys.stderr.buffer.read()
- [six.ensure_text(string) for string in self.accumulated_stderr]
- [six.ensure_text(string) for string in self.accumulated_stdout]
-- stdout = six.ensure_text(get_utf8able_str(stdout))
-- stderr = six.ensure_text(get_utf8able_str(stderr))
-+ stdout = six.ensure_text(six.ensure_str(stdout))
-+ stderr = six.ensure_text(six.ensure_str(stderr))
- stdout += ''.join(self.accumulated_stdout)
- stderr += ''.join(self.accumulated_stderr)
- _AttemptToCloseSysFd(sys.stdout)
diff --git a/net-misc/gsutil/gsutil-5.9.ebuild b/net-misc/gsutil/gsutil-5.9.ebuild
deleted file mode 100644
index a35f72008068..000000000000
--- a/net-misc/gsutil/gsutil-5.9.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_10 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="command line tool for interacting with cloud storage services"
-HOMEPAGE="https://github.com/GoogleCloudPlatform/gsutil"
-SRC_URI="http://commondatastorage.googleapis.com/pub/${PN}_${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="${PYTHON_DEPS}
- >=dev-python/argcomplete-1.9.4[${PYTHON_USEDEP}]
- >=dev-python/boto-2.49.0[${PYTHON_USEDEP}]
- >=dev-python/crcmod-1.7[${PYTHON_USEDEP}]
- >=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}]
- >=dev-python/gcs-oauth2-boto-plugin-3.0[${PYTHON_USEDEP}]
- >=dev-python/google-apitools-0.5.32[${PYTHON_USEDEP}]
- dev-python/google-auth[${PYTHON_USEDEP}]
- >=dev-python/google-reauth-python-0.1.0[${PYTHON_USEDEP}]
- >=dev-python/httplib2-0.20.4[${PYTHON_USEDEP}]
- >=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
- >=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
- >=dev-python/six-1.12.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/gsutil-4.41-tests.patch"
- "${FILESDIR}/gsutil-4.50-boto-tests.patch"
- "${FILESDIR}/gsutil-4.50-tests.patch"
-)
-
-S="${WORKDIR}/${PN}"
-
-DOCS=( README.md CHANGES.md )
-
-# Needs to talk to Google to run tests.
-RESTRICT+=" test"
-
-python_prepare_all() {
- distutils-r1_python_prepare_all
-
- # NB: We don't delete all of boto/ because the tests are imported by the
- # production code. The same reason we can't delete gslib/tests/. We can
- # delete the main boto library and use the system version though.
- rm -r gslib/vendored/boto/boto || die
-
- # Fails to compile with py3.
- rm gslib/vendored/boto/tests/mturk/cleanup_tests.py gslib/tests/test_wrapped_credentials.py || die
-
- # monotonic is only used by bundled fasteners that we do not install.
- sed -i \
- -e 's/mock==/mock>=/' \
- -e '/monotonic/d' \
- setup.py || die
- # Sanity check we didn't miss any updates.
- grep '==' setup.py && die "Need to update version requirements"
-
- # For debugging purposes, temporarily uncomment this in order to
- # show hidden tracebacks.
- #sed -e 's/^ except OSError as e:$/&\n raise/' \
- # -e 's/def _HandleUnknownFailure(e):/&\n raise/' \
- # -i gslib/__main__.py || die
-
- # create_bucket raised ResponseNotReady.
- sed -i \
- -e 's/test_cp_unwritable_tracker_file/_&/' \
- -e 's/test_cp_unwritable_tracker_file_download/_&/' \
- gslib/tests/test_cp.py || die
-
- sed -i -E -e 's/(executable_prefix =).*/\1 [sys.executable]/' \
- gslib/commands/test.py || die
-
- # IOError: close() called during concurrent operation on the same file object.
- sed -i -e 's/sys.stderr.close()/#&/' \
- gslib/tests/testcase/unit_testcase.py || die
-}
-
-python_test() {
- BOTO_CONFIG="${FILESDIR}/dummy.boto" \
- "${EPYTHON}" gslib/__main__.py test -u || die "tests failed with ${EPYTHON}"
-}
diff --git a/net-misc/gsutil/metadata.xml b/net-misc/gsutil/metadata.xml
deleted file mode 100644
index 7ce240e8eff8..000000000000
--- a/net-misc/gsutil/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>chutzpah@gentoo.org</email>
- <name>Patrick McLean</name>
- </maintainer>
- <maintainer type="person">
- <email>zmedico@gentoo.org</email>
- <name>Zac Medico</name>
- </maintainer>
- <upstream>
- <remote-id type="google-code">gsutil</remote-id>
- <remote-id type="github">GoogleCloudPlatform/gsutil</remote-id>
- </upstream>
-</pkgmetadata>