Chih-Hsuan Yen pushed to branch main at Arch Linux / Packaging / Packages /
aws-cli-v2
Commits:
4b757b57 by Chih-Hsuan Yen at 2023-11-15T20:57:32+08:00
upgpkg: 2.13.35-1; drop python-mock dependency
- - - - -
2 changed files:
- .SRCINFO
- PKGBUILD
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,6 +1,6 @@
pkgbase = aws-cli-v2
pkgdesc = Unified command line interface for Amazon Web Services
(version 2)
- pkgver = 2.13.33
+ pkgver = 2.13.35
pkgrel = 1
url = https://github.com/aws/aws-cli/tree/v2
install = aws-cli-v2.install
@@ -9,12 +9,12 @@ pkgbase = aws-cli-v2
checkdepends = python-pytest
checkdepends = python-pytest-xdist
checkdepends = python-jsonschema
- checkdepends = python-mock
checkdepends = procps-ng
makedepends = python-build
makedepends = python-wheel
makedepends = python-flit-core
makedepends = python-installer
+ makedepends = git
depends = python
depends = python-awscrt
depends = python-certifi
@@ -29,18 +29,20 @@ pkgbase = aws-cli-v2
depends = python-urllib3
provides = aws-cli
conflicts = aws-cli
- source = https://awscli.amazonaws.com/awscli-2.13.33.tar.gz
- source = https://awscli.amazonaws.com/awscli-2.13.33.tar.gz.sig
+ source = https://awscli.amazonaws.com/awscli-2.13.35.tar.gz
+ source = https://awscli.amazonaws.com/awscli-2.13.35.tar.gz.sig
source = build-ac.index-in-tmp.diff
source = fix-env.diff
source =
aws-cli-v2-tz-fix.patch::https://github.com/aws/aws-cli/commit/95aa5ccc7bfaeafc0373e8472c8459030ac18920.patch
source =
aws-cli-v2-ruamel-yaml-v4.patch::https://github.com/aws/aws-cli/commit/0331e399231b6cdb54b7b3bdd01a793647053cdd.patch
+ source =
aws-cli-v2-mock.patch::https://github.com/aws/aws-cli/commit/3201d4e4e6d22664cf89ac4624003fed38911dd1.patch
validpgpkeys = FB5DB77FD5C118B80511ADA8A6310ACC4672475C
- sha256sums =
71dcdeaef92fe7c3867c95243dced4c579d1bb290195329293576cb9602ff21e
+ sha256sums =
65df756c0da9a6a797c5cd0f29707e24de109335c199a31624a453e8a87fd98b
sha256sums = SKIP
sha256sums =
0267e41561ab2c46a97ebfb024f0b047aabc9e6b9866f204b2c1a84ee5810d63
sha256sums =
893d61d7e958c3c02bfa1e03bf58f6f6abd98849d248cc661f1c56423df9f312
sha256sums =
4fc614b8550d7363bb2d578c6b49326c9255203eb2f933fd0551f96ed5fb1f30
sha256sums =
20a9fcd5235bf606e86a6ec06ca30307ebbcfd36063d2ac561c1f9eff7243046
+ sha256sums =
67a2ea73ed2c09ccc8818983c6ba5f77d05102c4ba5188478955df310f69bb01
pkgname = aws-cli-v2
=====================================
PKGBUILD
=====================================
@@ -4,7 +4,7 @@
pkgname=aws-cli-v2
# https://github.com/aws/aws-cli/raw/v2/CHANGELOG.rst
-pkgver=2.13.33
+pkgver=2.13.35
pkgrel=1
pkgdesc='Unified command line interface for Amazon Web Services (version 2)'
arch=(any)
@@ -13,9 +13,9 @@ license=(Apache)
depends=(python python-awscrt python-certifi python-colorama
python-cryptography python-dateutil
python-distro python-docutils python-jmespath python-prompt_toolkit
python-ruamel-yaml
python-urllib3)
-makedepends=(python-build python-wheel python-flit-core python-installer)
+makedepends=(python-build python-wheel python-flit-core python-installer git)
# Tests need the 'ps' binary
-checkdepends=(python-pytest python-pytest-xdist python-jsonschema python-mock
procps-ng)
+checkdepends=(python-pytest python-pytest-xdist python-jsonschema procps-ng)
provides=(aws-cli)
conflicts=(aws-cli)
install=aws-cli-v2.install
@@ -23,13 +23,15 @@
source=("https://awscli.amazonaws.com/awscli-$pkgver.tar.gz"{,.sig}
build-ac.index-in-tmp.diff
fix-env.diff
"$pkgname-tz-fix.patch::https://github.com/aws/aws-cli/commit/95aa5ccc7bfaeafc0373e8472c8459030ac18920.patch";
-
"${pkgname}-ruamel-yaml-v4.patch::https://github.com/aws/aws-cli/commit/0331e399231b6cdb54b7b3bdd01a793647053cdd.patch";)
-sha256sums=('71dcdeaef92fe7c3867c95243dced4c579d1bb290195329293576cb9602ff21e'
+
"${pkgname}-ruamel-yaml-v4.patch::https://github.com/aws/aws-cli/commit/0331e399231b6cdb54b7b3bdd01a793647053cdd.patch";
+
"${pkgname}-mock.patch"::"https://github.com/aws/aws-cli/commit/3201d4e4e6d22664cf89ac4624003fed38911dd1.patch";)
+sha256sums=('65df756c0da9a6a797c5cd0f29707e24de109335c199a31624a453e8a87fd98b'
'SKIP'
'0267e41561ab2c46a97ebfb024f0b047aabc9e6b9866f204b2c1a84ee5810d63'
'893d61d7e958c3c02bfa1e03bf58f6f6abd98849d248cc661f1c56423df9f312'
'4fc614b8550d7363bb2d578c6b49326c9255203eb2f933fd0551f96ed5fb1f30'
- '20a9fcd5235bf606e86a6ec06ca30307ebbcfd36063d2ac561c1f9eff7243046')
+ '20a9fcd5235bf606e86a6ec06ca30307ebbcfd36063d2ac561c1f9eff7243046'
+ '67a2ea73ed2c09ccc8818983c6ba5f77d05102c4ba5188478955df310f69bb01')
validpgpkeys=(
'FB5DB77FD5C118B80511ADA8A6310ACC4672475C' # the key mentioned on
https://docs.aws.amazon.com/cli/latest/userguide/getting-started-install.html
)
@@ -40,6 +42,18 @@ prepare() {
# Don't treat warnings as errors
sed -i '/"error::/d' pyproject.toml
+ # [Use builtin mock](https://github.com/aws/aws-cli/pull/8221) (unmerged)
+ # Although an upstream dev prefers to keep v2 sources as close as v1,
+ # forward porting botocore-related changes requires significant
+ # efforts, so I simply pick the pull request in its current form.
+ # I use `git apply` so that I can exclude requirements-test.txt, which
+ # is not in the source tarball. And yes, `git apply` works outside git
+ # repos!
+ # This is applied first as `git apply` seems not supporting fuzzy
+ # patching, and a file (tests/functional/botocore/test_credentials.py)
+ # will be modified by both this patch and `$pkgname-tz-fix.patch`.
+ git apply -p1 --exclude=requirements-test.txt ../${pkgname}-mock.patch
+
# ac.index is an SQLite database, and building it on copy-on-write
filesystems (ex: BTRFS) takes ages
patch -Np1 -i ../build-ac.index-in-tmp.diff
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/aws-cli-v2/-/commit/4b757b57e5134aef37c7f59b9e2171e0dc9a71b2
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/aws-cli-v2/-/commit/4b757b57e5134aef37c7f59b9e2171e0dc9a71b2
You're receiving this email because of your account on gitlab.archlinux.org.
