import CS awscli2-2.33.0-1.el9
This commit is contained in:
parent
ccca74d635
commit
ac701b4cf7
1
.awscli2.metadata
Normal file
1
.awscli2.metadata
Normal file
@ -0,0 +1 @@
|
||||
d9081309b58433dcf516fce05a6b531e05cbf120 SOURCES/aws-cli-2.33.0.tar.gz
|
||||
44
.gitignore
vendored
44
.gitignore
vendored
@ -1,43 +1 @@
|
||||
/aws-cli-2.11.16.tar.gz
|
||||
/aws-cli-2.11.17.tar.gz
|
||||
/aws-cli-2.11.18.tar.gz
|
||||
/aws-cli-2.11.19.tar.gz
|
||||
/aws-cli-2.11.20.tar.gz
|
||||
/aws-cli-2.11.21.tar.gz
|
||||
/aws-cli-2.11.22.tar.gz
|
||||
/aws-cli-2.11.23.tar.gz
|
||||
/aws-cli-2.11.24.tar.gz
|
||||
/aws-cli-2.11.25.tar.gz
|
||||
/aws-cli-2.11.26.tar.gz
|
||||
/aws-cli-2.11.27.tar.gz
|
||||
/aws-cli-2.12.0.tar.gz
|
||||
/aws-cli-2.13.3.tar.gz
|
||||
/aws-cli-2.13.4.tar.gz
|
||||
/aws-cli-2.13.6.tar.gz
|
||||
/aws-cli-2.13.7.tar.gz
|
||||
/aws-cli-2.13.9.tar.gz
|
||||
/aws-cli-2.13.11.tar.gz
|
||||
/aws-cli-2.13.12.tar.gz
|
||||
/aws-cli-2.13.17.tar.gz
|
||||
/aws-cli-2.13.23.tar.gz
|
||||
/aws-cli-2.13.26.tar.gz
|
||||
/aws-cli-2.13.28.tar.gz
|
||||
/aws-cli-2.13.30.tar.gz
|
||||
/aws-cli-2.13.36.tar.gz
|
||||
/aws-cli-2.13.37.tar.gz
|
||||
/aws-cli-2.15.1.tar.gz
|
||||
/aws-cli-2.15.2.tar.gz
|
||||
/aws-cli-2.15.10.tar.gz
|
||||
/aws-cli-2.15.31.tar.gz
|
||||
/aws-cli-2.15.30.tar.gz
|
||||
/aws-cli-2.15.31.tar.gz
|
||||
/aws-cli-2.16.8.tar.gz
|
||||
/aws-cli-2.17.0.tar.gz
|
||||
/aws-cli-2.17.1.tar.gz
|
||||
/aws-cli-2.17.2.tar.gz
|
||||
/aws-cli-2.17.6.tar.gz
|
||||
/aws-cli-2.17.13.tar.gz
|
||||
/aws-cli-2.17.18.tar.gz
|
||||
/aws-cli-2.22.9.tar.gz
|
||||
/aws-cli-2.27.0.tar.gz
|
||||
/aws-cli-2.33.0.tar.gz
|
||||
SOURCES/aws-cli-2.33.0.tar.gz
|
||||
|
||||
20
.packit.yaml
20
.packit.yaml
@ -1,20 +0,0 @@
|
||||
upstream_package_name: awscli
|
||||
downstream_package_name: awscli2
|
||||
|
||||
upstream_project_url: https://github.com/aws/aws-cli
|
||||
|
||||
# react only to v2 tags
|
||||
upstream_tag_include: "^2\\..+"
|
||||
|
||||
specfile_path: awscli2.spec
|
||||
|
||||
jobs:
|
||||
- job: pull_from_upstream
|
||||
trigger: release
|
||||
dist_git_branches:
|
||||
- fedora-rawhide
|
||||
|
||||
- job: koji_build
|
||||
trigger: commit
|
||||
dist_git_branches:
|
||||
- fedora-rawhide
|
||||
@ -1,3 +0,0 @@
|
||||
This repository is maintained by packit.
|
||||
https://packit.dev/
|
||||
The file was generated using packit 0.99.0.post1.dev18+g4850a935.
|
||||
76
SOURCES/prompt-toolkit.patch
Normal file
76
SOURCES/prompt-toolkit.patch
Normal file
@ -0,0 +1,76 @@
|
||||
--- a/awscli/customizations/wizard/ui/layout.py
|
||||
+++ b/awscli/customizations/wizard/ui/layout.py
|
||||
@@ -284,6 +284,7 @@ class ToolbarView(BaseToolbarView):
|
||||
|
||||
def __init__(self):
|
||||
self.content = to_container(self.create_window(self.help_text))
|
||||
+ self.alternative_content = None
|
||||
self.filter = to_filter(self.CONDITION)
|
||||
|
||||
def create_window(self, help_text):
|
||||
|
||||
|
||||
--- a/awscli/autoprompt/factory.py
|
||||
+++ b/awscli/autoprompt/factory.py
|
||||
@@ -271,7 +271,7 @@
|
||||
buffer.switch_history_mode()
|
||||
buffer.insert_text(' ')
|
||||
|
||||
- @self._kb.add(Keys.F3)
|
||||
+ @self._kb.add(Keys.F3, is_global=True)
|
||||
def _(event):
|
||||
current_buffer = event.app.current_buffer
|
||||
if current_buffer.name == 'doc_buffer':
|
||||
@@ -280,11 +280,11 @@
|
||||
layout.focus(input_buffer)
|
||||
event.app.show_doc = not getattr(event.app, 'show_doc')
|
||||
|
||||
- @self._kb.add(Keys.F4)
|
||||
+ @self._kb.add(Keys.F4, is_global=True)
|
||||
def _(event):
|
||||
event.app.multi_column = not event.app.multi_column
|
||||
|
||||
- @self._kb.add(Keys.F5)
|
||||
+ @self._kb.add(Keys.F5, is_global=True)
|
||||
def _(event):
|
||||
event.app.show_output = not event.app.show_output
|
||||
if event.app.current_buffer.name == 'output_buffer':
|
||||
@@ -292,7 +292,7 @@
|
||||
input_buffer = layout.get_buffer_by_name('input_buffer')
|
||||
layout.focus(input_buffer)
|
||||
|
||||
- @self._kb.add(Keys.F1)
|
||||
+ @self._kb.add(Keys.F1, is_global=True)
|
||||
def _(event):
|
||||
event.app.show_help = not event.app.show_help
|
||||
|
||||
@@ -310,7 +310,7 @@
|
||||
text = f'> aws {input_buffer.document.text}'
|
||||
event.app.exit(exception=PrompterKeyboardInterrupt(text))
|
||||
|
||||
- @self._kb.add(Keys.F2)
|
||||
+ @self._kb.add(Keys.F2, is_global=True)
|
||||
def _(event):
|
||||
focus_next(event)
|
||||
|
||||
--- a/awscli/autoprompt/widgets.py
|
||||
+++ b/awscli/autoprompt/widgets.py
|
||||
@@ -96,6 +96,7 @@
|
||||
def __init__(self):
|
||||
window = self.create_window(self.create_buffer())
|
||||
super().__init__(window, self.CONDITION)
|
||||
+ self.alternative_content = None
|
||||
|
||||
@property
|
||||
def help_text(self):
|
||||
|
||||
--- a/tests/__init__.py
|
||||
+++ b/tests/__init__.py
|
||||
@@ -472,6 +472,7 @@
|
||||
self._done_rendering_event.clear()
|
||||
self.app.input.send_text(self._convert_key_to_vt100_data(key))
|
||||
self._wait_until_app_is_done_updating()
|
||||
+ time.sleep(0.01)
|
||||
|
||||
def wait_for_completions_on_current_buffer(self):
|
||||
if self._current_buffer_has_completions():
|
||||
@ -1,8 +1,13 @@
|
||||
%bcond tests 1
|
||||
|
||||
%global pkgname aws-cli
|
||||
|
||||
%global bash_completions_dir %{_datadir}/bash-completion/completions
|
||||
%global zsh_completions_dir %{_datadir}/zsh/site-functions
|
||||
|
||||
Name: awscli2
|
||||
Version: 2.33.0
|
||||
Release: %autorelease
|
||||
Release: 1%{?dist}
|
||||
|
||||
Summary: Universal Command Line Environment for AWS, version 2
|
||||
# all files are licensed under Apache-2.0, except:
|
||||
# - awscli/topictags.py is MIT
|
||||
@ -26,8 +31,9 @@ Patch3: 0001-Bump-the-ceiling-for-botocore-memory-leak-tests-to-1.pa
|
||||
Patch4: urllib3-v2.patch
|
||||
# fix Python 3.14 incompatibilities
|
||||
Patch5: python314.patch
|
||||
# https://github.com/aws/aws-cli/pull/9684#issuecomment-3804078566
|
||||
Patch6: prompt-toolkit-3.0.52.patch
|
||||
# python-prompt-toolkit compatibility fixes
|
||||
# incl. https://github.com/aws/aws-cli/pull/9684#issuecomment-3804078566
|
||||
Patch6: prompt-toolkit.patch
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
@ -60,13 +66,10 @@ interface to Amazon Web Services.
|
||||
|
||||
# fix permissions
|
||||
find awscli/examples/ -type f -name '*.rst' -executable -exec chmod -x '{}' +
|
||||
|
||||
# remove version caps on dependencies
|
||||
sed -i 's/,<=\?[^"]*"/"/' pyproject.toml
|
||||
|
||||
# loosen awscrt version requirement
|
||||
sed -i 's/awscrt==/awscrt>=/' pyproject.toml
|
||||
|
||||
# remove zipp dependency
|
||||
sed -i "/zipp<3.21.0/d" pyproject.toml
|
||||
|
||||
@ -77,8 +80,8 @@ find -type f -name '*.py' -exec sed \
|
||||
-e 's/^\( *\)from mock import/\1from unittest.mock import/' \
|
||||
-i '{}' +
|
||||
|
||||
# Fedora does not run coverage tests.
|
||||
# mock is deprecated in Fedora. We use unittest.mock.
|
||||
# RHEL does not run coverage tests.
|
||||
# mock is deprecated in RHEL. We use unittest.mock.
|
||||
# pip-tools is not used directly by the unit tests.
|
||||
# pytest-xdist is unwanted in RHEL.
|
||||
sed \
|
||||
@ -123,7 +126,8 @@ export TESTS_REMOVE_REPO_ROOT_FROM_PATH=1 TZ=UTC
|
||||
export OPENSSL_ENABLE_SHA1_SIGNATURES=yes
|
||||
# the 'which' tests in tests/unit/customizations/emr/test_emr_utils.py are failing if they run after tests that change the environment and remove PATH
|
||||
%pytest --verbose %{!?rhel:--numprocesses=auto --dist=loadfile --maxprocesses=4 -k 'not test_which'} -k \
|
||||
'not test_error_with_case_conflicts_in_s3 and not test_return_focus_on_input_buffer and not test_multiple_connection_mode and not test_input_buffer_initialization' \
|
||||
'not test_error_with_case_conflicts_in_s3 and not test_return_focus_on_input_buffer and not test_multiple_connection_mode and not test_input_buffer_initialization and not TestHelpPanel and not TestOutputPanel' \
|
||||
--ignore tests/unit/customizations/wizard/test_app.py \
|
||||
tests/unit tests/functional
|
||||
|
||||
|
||||
@ -137,4 +141,16 @@ export OPENSSL_ENABLE_SHA1_SIGNATURES=yes
|
||||
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
* Mon Apr 13 2026 Kseniia Nivnia <knivnia@redhat.com> - 2.33.0-1
|
||||
- Update to v2.33.0
|
||||
Resolves RHEL-157870
|
||||
|
||||
* Fri May 31 2024 Major Hayden <major@redhat.com> - 2.15.31-3
|
||||
- Add less to install requirements for paging output. Resolves RHEL-14523.
|
||||
|
||||
* Thu May 09 2024 Major Hayden <major@redhat.com> - 2.15.31-2
|
||||
- Remove colorama patches
|
||||
- Bring in the latest updates from Fedora
|
||||
|
||||
* Wed Jan 31 2024 Major Hayden <major@redhat.com> - 2.15.31-1
|
||||
- Initial RHEL 9 package.
|
||||
@ -1,6 +0,0 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-10
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
|
||||
@ -1,12 +0,0 @@
|
||||
diff --git a/awscli/customizations/wizard/ui/layout.py b/awscli/customizations/wizard/ui/layout.py
|
||||
index 1bb069d..57b556b 100644
|
||||
--- a/awscli/customizations/wizard/ui/layout.py
|
||||
+++ b/awscli/customizations/wizard/ui/layout.py
|
||||
@@ -284,6 +284,7 @@ class ToolbarView(BaseToolbarView):
|
||||
|
||||
def __init__(self):
|
||||
self.content = to_container(self.create_window(self.help_text))
|
||||
+ self.alternative_content = None
|
||||
self.filter = to_filter(self.CONDITION)
|
||||
|
||||
def create_window(self, help_text):
|
||||
Loading…
Reference in New Issue
Block a user