Accepting request 1132525 from home:glaubitz:branches:Cloud:Tools

- Update to version 1.31.11
  + For detailed changes see
    https://github.com/aws/aws-cli/blob/1.31.11/CHANGELOG.rst
- Add patch to update docutils dependency (bsc#1217336)
  + ac_update-docutils.patch
- Update Requires in spec file from setup.py

OBS-URL: https://build.opensuse.org/request/show/1132525
OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/aws-cli?expand=0&rev=198
This commit is contained in:
John Paul Adrian Glaubitz 2023-12-20 09:37:44 +00:00 committed by Git OBS Bridge
parent fbe91c35aa
commit aa8f19b402
5 changed files with 72 additions and 11 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c92b43a5e7e5b44af05cfd3a57975a69478ae6cf61250fc3a45318328db06d63
size 2596217

BIN
1.31.11.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

48
ac_update-docutils.patch Normal file
View File

@ -0,0 +1,48 @@
From e2b4ba4e616cad6b9c4c3d4c999404ddda4261b2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Sep 2023 20:54:58 +0000
Subject: [PATCH] Update docutils requirement from <0.17,>=0.10 to >=0.10,<0.21
Updates the requirements on [docutils](https://docutils.sourceforge.io/) to permit the latest version.
---
updated-dependencies:
- dependency-name: docutils
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
---
requirements-docs.txt | 2 +-
setup.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/requirements-docs.txt b/requirements-docs.txt
index 2211707c5..68d63109d 100644
--- a/requirements-docs.txt
+++ b/requirements-docs.txt
@@ -3,7 +3,7 @@
jinja2<3.1
-docutils>=0.10,<0.17
+docutils>=0.10,<0.21
Sphinx==1.4.9
-e .
# alabaster version 0.7.13 requires Sphinx>1.6
diff --git a/setup.py b/setup.py
index 0dc82bf12..2e48a1a4e 100644
--- a/setup.py
+++ b/setup.py
@@ -25,7 +25,7 @@ def find_version(*file_paths):
install_requires = [
'botocore==1.33.11',
- 'docutils>=0.10,<0.17',
+ 'docutils>=0.10,<0.21',
's3transfer>=0.8.0,<0.9.0',
'PyYAML>=3.10,<6.1',
'colorama>=0.2.5,<0.4.5',
--
2.43.0

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Dec 11 14:59:37 UTC 2023 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
- Update to version 1.31.11
+ For detailed changes see
https://github.com/aws/aws-cli/blob/1.31.11/CHANGELOG.rst
- Add patch to update docutils dependency (bsc#1217336)
+ ac_update-docutils.patch
- Update Requires in spec file from setup.py
-------------------------------------------------------------------
Fri Nov 24 12:06:27 UTC 2023 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>

View File

@ -17,13 +17,14 @@
Name: aws-cli
Version: 1.30.6
Version: 1.31.11
Release: 0
Summary: Amazon Web Services Command Line Interface
License: Apache-2.0
Group: System/Management
URL: https://github.com/aws/aws-cli
Source0: https://github.com/aws/%{name}/archive/refs/tags/%{version}.tar.gz
Patch0: ac_update-docutils.patch
BuildRequires: fdupes
BuildRequires: python-rpm-macros
Requires: groff
@ -35,15 +36,15 @@ BuildRequires: python3-setuptools
Requires: python3
Requires: python3-PyYAML <= 6.1
Requires: python3-PyYAML >= 3.10
Requires: python3-botocore >= 1.32.6
Requires: python3-botocore >= 1.33.11
Requires: python3-colorama <= 0.5.0
Requires: python3-colorama >= 0.2.5
Requires: python3-docutils < 0.20
Requires: python3-docutils < 0.21
Requires: python3-docutils >= 0.10
Requires: python3-rsa < 5.0.0
Requires: python3-rsa >= 3.1.2
Requires: python3-s3transfer < 0.8.0
Requires: python3-s3transfer >= 0.7.0
Requires: python3-s3transfer < 0.9.0
Requires: python3-s3transfer >= 0.8.0
Requires: python3-six
%else
BuildRequires: bash-completion
@ -52,14 +53,15 @@ BuildRequires: python-setuptools
Requires: python
Requires: python-PyYAML <= 6.1
Requires: python-PyYAML >= 3.10
Requires: python-botocore >= 1.32.6
Requires: python-botocore >= 1.33.11
Requires: python-colorama <= 0.5.0
Requires: python-colorama >= 0.2.5
Requires: python-docutils < 0.21
Requires: python-docutils >= 0.10
Requires: python-rsa <= 4.5.0
Requires: python-rsa >= 3.1.2
Requires: python-s3transfer < 0.8.0
Requires: python-s3transfer >= 0.7.0
Requires: python-s3transfer < 0.9.0
Requires: python-s3transfer >= 0.8.0
Requires: python-six
%endif
@ -70,6 +72,7 @@ from the command line and automated through scripts.
%prep
%setup -q
%patch0 -p1
sed -i 's/from botocore\.vendored //' awscli/customizations/awslambda.py
sed -i 's/botocore\.vendored\.//' awscli/customizations/configure/__init__.py