Chih-Hsuan Yen pushed to branch main at Arch Linux / Packaging / Packages /
aws-cli-v2
Commits:
c7bfd51c by Chih-Hsuan Yen at 2023-12-23T22:37:58+08:00
upgpkg: 2.15.4-1; retry unittest.mock via Fedora's patch
- - - - -
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.15.2
+ pkgver = 2.15.4
pkgrel = 1
url = https://github.com/aws/aws-cli/tree/v2
install = aws-cli-v2.install
@@ -9,7 +9,6 @@ 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
@@ -29,14 +28,14 @@ pkgbase = aws-cli-v2
depends = python-urllib3
provides = aws-cli
conflicts = aws-cli
- source = https://awscli.amazonaws.com/awscli-2.15.2.tar.gz
- source = https://awscli.amazonaws.com/awscli-2.15.2.tar.gz.sig
+ source = https://awscli.amazonaws.com/awscli-2.15.4.tar.gz
+ source = https://awscli.amazonaws.com/awscli-2.15.4.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
validpgpkeys = FB5DB77FD5C118B80511ADA8A6310ACC4672475C
- sha256sums =
279daffc11d4e0ec5ce2b05d9eea2167e484d747ee76096b125cc4198da3ed92
+ sha256sums =
0ac61007556657be2c696afda9f2af198b423d4193d0447c7c8a4a659f949ba6
sha256sums = SKIP
sha256sums =
0267e41561ab2c46a97ebfb024f0b047aabc9e6b9866f204b2c1a84ee5810d63
sha256sums =
893d61d7e958c3c02bfa1e03bf58f6f6abd98849d248cc661f1c56423df9f312
=====================================
PKGBUILD
=====================================
@@ -4,7 +4,7 @@
pkgname=aws-cli-v2
# https://github.com/aws/aws-cli/raw/v2/CHANGELOG.rst
-pkgver=2.15.2
+pkgver=2.15.4
pkgrel=1
pkgdesc='Unified command line interface for Amazon Web Services (version 2)'
arch=(any)
@@ -15,7 +15,7 @@ depends=(python python-awscrt python-certifi python-colorama
python-cryptography
python-urllib3)
makedepends=(python-build python-wheel python-flit-core python-installer)
# 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
@@ -24,7 +24,7 @@
source=("https://awscli.amazonaws.com/awscli-$pkgver.tar.gz"{,.sig}
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=('279daffc11d4e0ec5ce2b05d9eea2167e484d747ee76096b125cc4198da3ed92'
+sha256sums=('0ac61007556657be2c696afda9f2af198b423d4193d0447c7c8a4a659f949ba6'
'SKIP'
'0267e41561ab2c46a97ebfb024f0b047aabc9e6b9866f204b2c1a84ee5810d63'
'893d61d7e958c3c02bfa1e03bf58f6f6abd98849d248cc661f1c56423df9f312'
@@ -52,6 +52,14 @@ prepare() {
# Fix tests with newer ruamel.yaml
# https://github.com/aws/aws-cli/pull/8072 (unmerged)
patch -Np1 -i ../${pkgname}-ruamel-yaml-v4.patch
+
+ # use unittest.mock
+ # https://src.fedoraproject.org/rpms/awscli2/blob/rawhide/f/awscli2.spec
+ find -type f -name '*.py' -exec sed \
+ -e 's/^\( *\)import mock$/\1from unittest import mock/' \
+ -e 's/^\( *\)from mock import mock/\1from unittest import mock/' \
+ -e 's/^\( *\)from mock import/\1from unittest.mock import/' \
+ -i '{}' +
}
build() {
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/aws-cli-v2/-/commit/c7bfd51c634ff3b0ebc47dfb6420fc79b4429c3f
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/aws-cli-v2/-/commit/c7bfd51c634ff3b0ebc47dfb6420fc79b4429c3f
You're receiving this email because of your account on gitlab.archlinux.org.
