diff options
author | Michał Górny <mgorny@gentoo.org> | 2021-10-17 08:40:34 +0200 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2021-10-17 09:14:53 +0200 |
commit | 7584533d7cfcdcb955ea2fa8360e97fdbf18f08a (patch) | |
tree | d09abb9fba4832070563485d08f9d3e9ebd08b52 /app-admin | |
parent | dev-python/twisted: Remove old (diff) | |
download | gentoo-7584533d7cfcdcb955ea2fa8360e97fdbf18f08a.tar.gz gentoo-7584533d7cfcdcb955ea2fa8360e97fdbf18f08a.tar.bz2 gentoo-7584533d7cfcdcb955ea2fa8360e97fdbf18f08a.zip |
app-admin/awscli: Remove old
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'app-admin')
-rw-r--r-- | app-admin/awscli/Manifest | 3 | ||||
-rw-r--r-- | app-admin/awscli/awscli-1.20.28.ebuild | 58 | ||||
-rw-r--r-- | app-admin/awscli/awscli-1.20.40.ebuild | 58 | ||||
-rw-r--r-- | app-admin/awscli/awscli-1.20.47.ebuild | 52 | ||||
-rw-r--r-- | app-admin/awscli/files/awscli-1.19.47-py39.patch | 60 |
5 files changed, 0 insertions, 231 deletions
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest index 9496258245a5..60be88c9cc15 100644 --- a/app-admin/awscli/Manifest +++ b/app-admin/awscli/Manifest @@ -1,6 +1,3 @@ -DIST awscli-1.20.28.tar.gz 2058578 BLAKE2B 3f6993a41f46ad9d8d45cebc0d5ea95a954e15c73d236426590c389aba6de6a99b6a5000f065f932733151c14f3112bacc25c670a05d2a991a976669ce54554e SHA512 b75974450cea3744ed15cf00ca82a35aa377c55e0ef67bb5536ed136e768d5030e6707f12e2e7de8bfce48296295ff4ed4c9f9b15c642104ea34c7492291135b -DIST awscli-1.20.40.tar.gz 2071857 BLAKE2B b2511d610c13b4ddf8b1f5c6442f0939072eecf81d97805800bd83b6f481d744ad4344dace6e6553e3d4b7cbf9546f911398311cb04fb698a418579e784539a3 SHA512 aa39a8d67cd8efc63687929f19d5878269ce7f3155a0a64ca2f271251a334f57d2358aa4f0aee76415aee33fe23a1e3b19eb2c6dcfa21e8c0fb7409f5d29a001 -DIST awscli-1.20.47.tar.gz 2079314 BLAKE2B 2c202ed3e3527a6881c3f9ca73e8639732442948c6cd6a79fc3fe64de38ff56f7e595f0a0e4badeade81624f8a0323f435b63199a138ce90acb0a1785a326dcf SHA512 ad7be0753549c6f82f6f9a8631cbb8c56526ef17eb0152298bb78365735d4454ec4efb44a6858d01f31cff2ae54ad6a11e0afff3277dde2b70415d58bfb81c86 DIST awscli-1.20.53.tar.gz 2081402 BLAKE2B 88d56df063ae6473122913e4713e17bfd8c32961477b8e723ed3c0c0b7dc72ccc4dfd8d897699e2060a2b65a198b96eccf77accdac9a21510aa56dba5423b76e SHA512 48576b535bdf6b9e6397eadd589c41eeec480d2eaf3035ca6e64bd86984aba9170a83b71c0f7f3f64cfaebaf5104fe3adcdaebace5166343fb3b772f5ad8ccfd DIST awscli-1.20.60.tar.gz 2090278 BLAKE2B 107d4d34730769fe18729cc2a42a574c8b66d0715eabc67c1a236d828ee7623387ece4dd8b3a80818b68be7439ffb74ba2c48bac74323b2a9e960f53c0508bf3 SHA512 7c4a1d79434ca2497d814dace68b537e5bc120f03d4f63cf74280d8c83d4c68273d9c0b16e90b477c91e49498468e1717ba6ba1b057590fd89c0c2cc82b90383 DIST awscli-1.20.61.tar.gz 2090747 BLAKE2B ddd0ca28f0f36a69e0d03a15bab142df35f4695a1e3f2c71f3507325050aceb088a53cb18dc17c80b7c90e8bba7aee377ab4bf336188ae19adb095df4cfd5bd2 SHA512 c0ed1fdd11022c897e31f83be97bddc2dbc8d53e6571ffb5c5592f406f88c30eeb36f7530b541a7102a4426b1bf14114db08667e3c03e3583f3130e3e50767e4 diff --git a/app-admin/awscli/awscli-1.20.28.ebuild b/app-admin/awscli/awscli-1.20.28.ebuild deleted file mode 100644 index 4221a0155f55..000000000000 --- a/app-admin/awscli/awscli-1.20.28.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_{8..10} ) - -inherit bash-completion-r1 distutils-r1 - -DESCRIPTION="Universal Command Line Environment for AWS" -HOMEPAGE="https://pypi.org/project/awscli/" -#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" -SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/aws-cli-${PV}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" - -# botocore is x.(y+1).z -BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)" -RDEPEND=" - >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}] - dev-python/colorama[${PYTHON_USEDEP}] - dev-python/docutils[${PYTHON_USEDEP}] - dev-python/rsa[${PYTHON_USEDEP}] - >=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/mock[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests --install nose - -PATCHES=( - "${FILESDIR}"/awscli-1.19.47-py39.patch -) - -python_test() { - distutils_install_for_testing - # integration tests require AWS credentials and Internet access - nosetests -v tests/{functional,unit} || - die "Tests failed for ${EPYTHON}" -} - -python_install_all() { - newbashcomp bin/aws_bash_completer aws - - insinto /usr/share/zsh/site-functions - newins bin/aws_zsh_completer.sh _aws - - distutils-r1_python_install_all - - rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die -} diff --git a/app-admin/awscli/awscli-1.20.40.ebuild b/app-admin/awscli/awscli-1.20.40.ebuild deleted file mode 100644 index ff429f8d3a3e..000000000000 --- a/app-admin/awscli/awscli-1.20.40.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_{8..10} ) - -inherit bash-completion-r1 distutils-r1 - -DESCRIPTION="Universal Command Line Environment for AWS" -HOMEPAGE="https://pypi.org/project/awscli/" -#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" -SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/aws-cli-${PV}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" - -# botocore is x.(y+1).z -BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)" -RDEPEND=" - >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}] - dev-python/colorama[${PYTHON_USEDEP}] - dev-python/docutils[${PYTHON_USEDEP}] - dev-python/rsa[${PYTHON_USEDEP}] - >=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/mock[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests --install nose - -PATCHES=( - "${FILESDIR}"/awscli-1.19.47-py39.patch -) - -python_test() { - distutils_install_for_testing - # integration tests require AWS credentials and Internet access - nosetests -v tests/{functional,unit} || - die "Tests failed for ${EPYTHON}" -} - -python_install_all() { - newbashcomp bin/aws_bash_completer aws - - insinto /usr/share/zsh/site-functions - newins bin/aws_zsh_completer.sh _aws - - distutils-r1_python_install_all - - rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die -} diff --git a/app-admin/awscli/awscli-1.20.47.ebuild b/app-admin/awscli/awscli-1.20.47.ebuild deleted file mode 100644 index 95a3e5aaa0df..000000000000 --- a/app-admin/awscli/awscli-1.20.47.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) -inherit bash-completion-r1 distutils-r1 - -DESCRIPTION="Universal Command Line Environment for AWS" -HOMEPAGE="https://pypi.org/project/awscli/" -#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" -SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/aws-cli-${PV}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" - -# botocore is x.(y+1).z -BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)" -RDEPEND=" - >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}] - dev-python/colorama[${PYTHON_USEDEP}] - dev-python/docutils[${PYTHON_USEDEP}] - dev-python/rsa[${PYTHON_USEDEP}] - >=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] -" - -distutils_enable_tests --install nose - -PATCHES=( - "${FILESDIR}"/awscli-1.19.47-py39.patch -) - -python_test() { - distutils_install_for_testing - # integration tests require AWS credentials and Internet access - nosetests -v tests/{functional,unit} || - die "Tests failed for ${EPYTHON}" -} - -python_install_all() { - newbashcomp bin/aws_bash_completer aws - - insinto /usr/share/zsh/site-functions - newins bin/aws_zsh_completer.sh _aws - - distutils-r1_python_install_all - - rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die -} diff --git a/app-admin/awscli/files/awscli-1.19.47-py39.patch b/app-admin/awscli/files/awscli-1.19.47-py39.patch deleted file mode 100644 index 4d1be8eab6d4..000000000000 --- a/app-admin/awscli/files/awscli-1.19.47-py39.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 85361123d2fa12eaedf912c046ffe39aebdd2bad Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Sat, 22 May 2021 19:42:14 +0200 -Subject: [PATCH] Replace use of deprecated base64.encodestring() - -Replace the uses of deprecated base64.encodestring() in favor -of botocore.compat.encodebytes(). This fixes incompatibility with -Python 3.9 where the former function has finally been removed. ---- - awscli/customizations/ec2/bundleinstance.py | 4 +++- - tests/functional/ec2/test_bundle_instance.py | 4 +++- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/awscli/customizations/ec2/bundleinstance.py b/awscli/customizations/ec2/bundleinstance.py -index f704ec301..775e75718 100644 ---- a/awscli/customizations/ec2/bundleinstance.py -+++ b/awscli/customizations/ec2/bundleinstance.py -@@ -17,6 +17,8 @@ import hmac - import base64 - import datetime - -+from botocore.compat import encodebytes -+ - from awscli.compat import six - - from awscli.arguments import CustomArgument -@@ -135,7 +137,7 @@ def _generate_signature(params): - policy = base64.b64encode(six.b(policy)).decode('utf-8') - new_hmac = hmac.new(sak.encode('utf-8'), digestmod=sha1) - new_hmac.update(six.b(policy)) -- ps = base64.encodestring(new_hmac.digest()).strip().decode('utf-8') -+ ps = encodebytes(new_hmac.digest()).strip().decode('utf-8') - params['UploadPolicySignature'] = ps - del params['_SAK'] - -diff --git a/tests/functional/ec2/test_bundle_instance.py b/tests/functional/ec2/test_bundle_instance.py -index 3eee363da..ca36d7cd5 100644 ---- a/tests/functional/ec2/test_bundle_instance.py -+++ b/tests/functional/ec2/test_bundle_instance.py -@@ -17,6 +17,8 @@ import datetime - import mock - from six.moves import cStringIO - -+from botocore.compat import encodebytes -+ - import awscli.customizations.ec2.bundleinstance - from awscli.compat import six - from awscli.testutils import BaseAWSCommandParamsTest -@@ -70,7 +72,7 @@ class TestBundleInstance(BaseAWSCommandParamsTest): - - def test_policy_provided(self): - policy = '{"notarealpolicy":true}' -- base64policy = base64.encodestring(six.b(policy)).strip().decode('utf-8') -+ base64policy = encodebytes(six.b(policy)).strip().decode('utf-8') - policy_signature = 'a5SmoLOxoM0MHpOdC25nE7KIafg=' - args = ' --instance-id i-12345678 --owner-akid AKIAIOSFODNN7EXAMPLE' - args += ' --owner-sak wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY' --- -2.31.1 - |