Date: Saturday, March 11, 2023 @ 15:53:17
Author: yan12125
Revision: 1418703
archrelease: copy trunk to community-any
Added:
aws-cli-v2/repos/community-any/PKGBUILD
(from rev 1418702, aws-cli-v2/trunk/PKGBUILD)
aws-cli-v2/repos/community-any/build-ac.index-in-tmp.diff
(from rev 1418702, aws-cli-v2/trunk/build-ac.index-in-tmp.diff)
aws-cli-v2/repos/community-any/fix-env.diff
(from rev 1418702, aws-cli-v2/trunk/fix-env.diff)
aws-cli-v2/repos/community-any/keys/
aws-cli-v2/repos/community-any/prompt-toolkit-3.0.29.diff
(from rev 1418702, aws-cli-v2/trunk/prompt-toolkit-3.0.29.diff)
Deleted:
aws-cli-v2/repos/community-any/PKGBUILD
aws-cli-v2/repos/community-any/build-ac.index-in-tmp.diff
aws-cli-v2/repos/community-any/fix-env.diff
aws-cli-v2/repos/community-any/keys/
aws-cli-v2/repos/community-any/prompt-toolkit-3.0.29.diff
----------------------------+
PKGBUILD | 162 ++++++++++++++++++++++---------------------
build-ac.index-in-tmp.diff | 58 +++++++--------
fix-env.diff | 20 ++---
prompt-toolkit-3.0.29.diff | 32 ++++----
4 files changed, 138 insertions(+), 134 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-03-11 15:52:47 UTC (rev 1418702)
+++ PKGBUILD 2023-03-11 15:53:17 UTC (rev 1418703)
@@ -1,79 +0,0 @@
-# Maintainer: Chih-Hsuan Yen <[email protected]>
-# Contributor: Marcel Campello <[email protected]>
-# Contributor: David Birks <[email protected]>
-
-pkgname=aws-cli-v2
-pkgver=2.10.2
-pkgrel=1
-pkgdesc='Unified command line interface for Amazon Web Services (version 2)'
-arch=(any)
-url='https://github.com/aws/aws-cli/tree/v2'
-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)
-# Tests need the 'ps' binary
-checkdepends=(python-pytest python-pytest-xdist python-jsonschema python-mock
procps-ng)
-provides=(aws-cli)
-conflicts=(aws-cli)
-source=("https://awscli.amazonaws.com/awscli-$pkgver.tar.gz"{,.sig}
- prompt-toolkit-3.0.29.diff
- build-ac.index-in-tmp.diff
- fix-env.diff)
-sha256sums=('4447bd85822a11dfc6bc1c7af5c7cf208ac923612f1104719be85d4fa1130b32'
- 'SKIP'
- 'c4f0bfe21bef89934137c57ee4771db57e8dad0f995634ee4de0890dcf45a636'
- '0267e41561ab2c46a97ebfb024f0b047aabc9e6b9866f204b2c1a84ee5810d63'
- '893d61d7e958c3c02bfa1e03bf58f6f6abd98849d248cc661f1c56423df9f312')
-validpgpkeys=(
- 'FB5DB77FD5C118B80511ADA8A6310ACC4672475C' # the key mentioned on
https://docs.aws.amazon.com/cli/latest/userguide/getting-started-install.html
-)
-
-prepare() {
- cd awscli-$pkgver
-
- # Don't treat warnings as errors
- sed -i '/"error::/d' pyproject.toml
-
- # See:
https://github.com/prompt-toolkit/python-prompt-toolkit/commit/97ac51413f8d412599233fc3da44d4c7fc456f8c
- patch -Np1 -i ../prompt-toolkit-3.0.29.diff
-
- # 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
-
- # Fix conflicts between tests/functional/test_clidriver.py::TestSession and
tests/functional/botocore/leak/test_resource_leaks.py
- patch -Np1 -i ../fix-env.diff
-}
-
-build() {
- cd awscli-$pkgver
-
- # flit-core adds runtime dependencies to reported build-time dependencies
[1],
- # and upstream often lags behind the latest dependencies [2], thus
--skip-dependency-check
- # [1] https://github.com/pypa/flit/issues/354
- # [2] https://github.com/aws/aws-cli/issues/5943
- python -m build --wheel --no-isolation --skip-dependency-check
- # Copy the built ac.index for tests
- cp -v build/unpacked_wheel/awscli/data/ac.index awscli/data/ac.index
-}
-
-check() {
- cd awscli-$pkgver
-
- export AWS_SECRET_ACCESS_KEY=fake_key
- export AWS_ACCESS_KEY_ID=fake_id
-
- export PYTHONPATH="$PWD"
-
- # Use --dist=loadfile following upstream. The default --dist=load may cause
test failures and is not faster
- # Disable backend tests - those tests check if aws-cli can be installed or
not, and are not compatible with all kinds of environments
- pytest tests -n auto --dist loadfile --ignore=tests/backends
--ignore=tests/integration
-}
-
-package() {
- cd awscli-$pkgver
- python -m installer --destdir="$pkgdir" dist/*.whl
- install -Dm 644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
- install -Dm 644 bin/aws_bash_completer
"$pkgdir/usr/share/bash-completion/completions/aws"
-}
Copied: aws-cli-v2/repos/community-any/PKGBUILD (from rev 1418702,
aws-cli-v2/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-03-11 15:53:17 UTC (rev 1418703)
@@ -0,0 +1,83 @@
+# Maintainer: Chih-Hsuan Yen <[email protected]>
+# Contributor: Marcel Campello <[email protected]>
+# Contributor: David Birks <[email protected]>
+
+pkgname=aws-cli-v2
+pkgver=2.11.2
+pkgrel=1
+pkgdesc='Unified command line interface for Amazon Web Services (version 2)'
+arch=(any)
+url='https://github.com/aws/aws-cli/tree/v2'
+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)
+# Tests need the 'ps' binary
+checkdepends=(python-pytest python-pytest-xdist python-jsonschema python-mock
procps-ng)
+provides=(aws-cli)
+conflicts=(aws-cli)
+source=("https://awscli.amazonaws.com/awscli-$pkgver.tar.gz"{,.sig}
+ prompt-toolkit-3.0.29.diff
+ build-ac.index-in-tmp.diff
+ fix-env.diff)
+sha256sums=('8e475b69476253241db287ad6c76e440b13b8a8dc5c401382b4def7862166421'
+ 'SKIP'
+ 'c4f0bfe21bef89934137c57ee4771db57e8dad0f995634ee4de0890dcf45a636'
+ '0267e41561ab2c46a97ebfb024f0b047aabc9e6b9866f204b2c1a84ee5810d63'
+ '893d61d7e958c3c02bfa1e03bf58f6f6abd98849d248cc661f1c56423df9f312')
+validpgpkeys=(
+ 'FB5DB77FD5C118B80511ADA8A6310ACC4672475C' # the key mentioned on
https://docs.aws.amazon.com/cli/latest/userguide/getting-started-install.html
+)
+
+prepare() {
+ cd awscli-$pkgver
+
+ # Don't treat warnings as errors
+ sed -i '/"error::/d' pyproject.toml
+
+ # See:
https://github.com/prompt-toolkit/python-prompt-toolkit/commit/97ac51413f8d412599233fc3da44d4c7fc456f8c
+ patch -Np1 -i ../prompt-toolkit-3.0.29.diff
+
+ # 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
+
+ # Fix conflicts between tests/functional/test_clidriver.py::TestSession and
tests/functional/botocore/leak/test_resource_leaks.py
+ patch -Np1 -i ../fix-env.diff
+}
+
+build() {
+ cd awscli-$pkgver
+
+ # flit-core adds runtime dependencies to reported build-time dependencies
[1],
+ # and upstream often lags behind the latest dependencies [2], thus
--skip-dependency-check
+ # [1] https://github.com/pypa/flit/issues/354
+ # [2] https://github.com/aws/aws-cli/issues/5943
+ python -m build --wheel --no-isolation --skip-dependency-check
+ # Copy the built ac.index for tests
+ cp -v build/unpacked_wheel/awscli/data/ac.index awscli/data/ac.index
+}
+
+check() {
+ cd awscli-$pkgver
+
+ export AWS_SECRET_ACCESS_KEY=fake_key
+ export AWS_ACCESS_KEY_ID=fake_id
+
+ export PYTHONPATH="$PWD"
+
+ # * Use --dist=loadfile following upstream. The default --dist=load may
cause test failures and is not faster
+ # * Disable backend tests - those tests check if aws-cli can be installed or
not, and are not compatible with all kinds of environments
+ # * Some tests use prompt-toolkit functions without running a prompt-toolkit
app, and such a usage is not compatible
+ # with prompt-toolkit >= 3.0.37 [1]. In aws-cli program the prompter is
always run inside an app.
+ # [1]
https://github.com/prompt-toolkit/python-prompt-toolkit/issues/1726#issuecomment-1445196977
+ pytest tests -n auto --dist loadfile --ignore=tests/backends
--ignore=tests/integration \
+ -k 'not test_input_buffer_initialization and not
test_doc_panel_content and not test_history_mode_switching'
+}
+
+package() {
+ cd awscli-$pkgver
+ python -m installer --destdir="$pkgdir" dist/*.whl
+ install -Dm 644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+ install -Dm 644 bin/aws_bash_completer
"$pkgdir/usr/share/bash-completion/completions/aws"
+}
Deleted: build-ac.index-in-tmp.diff
===================================================================
--- build-ac.index-in-tmp.diff 2023-03-11 15:52:47 UTC (rev 1418702)
+++ build-ac.index-in-tmp.diff 2023-03-11 15:53:17 UTC (rev 1418703)
@@ -1,29 +0,0 @@
---- a/backends/pep517.py 2023-02-16 02:15:30.000000000 +0800
-+++ b/backends/pep517.py 2023-02-18 01:31:54.245328767 +0800
-@@ -30,6 +30,7 @@
- import os
- import glob
- import tarfile
-+import tempfile
- import shutil
- import sys
- import zipfile
-@@ -214,14 +215,16 @@
-
-
- def _build_and_inject_ac_index(build_dir, extracted_wheel_dir):
-- ac_index_build_name = _build_ac_index(build_dir)
-+ ac_index_dir = tempfile.mkdtemp()
-+ ac_index_build_name = _build_ac_index(ac_index_dir)
- extracted_ac_index = os.path.join(extracted_wheel_dir, AC_INDEX_REL_PATH)
- _remove_file_if_exists(extracted_ac_index)
- print("Adding auto-complete index into wheel")
-- os.rename(
-+ shutil.copy2(
- ac_index_build_name,
- extracted_ac_index,
- )
-+ shutil.rmtree(ac_index_dir)
-
-
- def _build_ac_index(build_dir, rebuild=True):
Copied: aws-cli-v2/repos/community-any/build-ac.index-in-tmp.diff (from rev
1418702, aws-cli-v2/trunk/build-ac.index-in-tmp.diff)
===================================================================
--- build-ac.index-in-tmp.diff (rev 0)
+++ build-ac.index-in-tmp.diff 2023-03-11 15:53:17 UTC (rev 1418703)
@@ -0,0 +1,29 @@
+--- a/backends/pep517.py 2023-02-16 02:15:30.000000000 +0800
++++ b/backends/pep517.py 2023-02-18 01:31:54.245328767 +0800
+@@ -30,6 +30,7 @@
+ import os
+ import glob
+ import tarfile
++import tempfile
+ import shutil
+ import sys
+ import zipfile
+@@ -214,14 +215,16 @@
+
+
+ def _build_and_inject_ac_index(build_dir, extracted_wheel_dir):
+- ac_index_build_name = _build_ac_index(build_dir)
++ ac_index_dir = tempfile.mkdtemp()
++ ac_index_build_name = _build_ac_index(ac_index_dir)
+ extracted_ac_index = os.path.join(extracted_wheel_dir, AC_INDEX_REL_PATH)
+ _remove_file_if_exists(extracted_ac_index)
+ print("Adding auto-complete index into wheel")
+- os.rename(
++ shutil.copy2(
+ ac_index_build_name,
+ extracted_ac_index,
+ )
++ shutil.rmtree(ac_index_dir)
+
+
+ def _build_ac_index(build_dir, rebuild=True):
Deleted: fix-env.diff
===================================================================
--- fix-env.diff 2023-03-11 15:52:47 UTC (rev 1418702)
+++ fix-env.diff 2023-03-11 15:53:17 UTC (rev 1418703)
@@ -1,10 +0,0 @@
---- a/tests/functional/test_clidriver.py
-+++ b/tests/functional/test_clidriver.py
-@@ -46,6 +46,7 @@ class TestSession(BaseCLIDriverTest):
- self._responses = []
-
- def tearDown(self):
-+ super(TestSession, self).tearDown()
- self._urllib3_patch.stop()
-
- def get_response(self, request):
Copied: aws-cli-v2/repos/community-any/fix-env.diff (from rev 1418702,
aws-cli-v2/trunk/fix-env.diff)
===================================================================
--- fix-env.diff (rev 0)
+++ fix-env.diff 2023-03-11 15:53:17 UTC (rev 1418703)
@@ -0,0 +1,10 @@
+--- a/tests/functional/test_clidriver.py
++++ b/tests/functional/test_clidriver.py
+@@ -46,6 +46,7 @@ class TestSession(BaseCLIDriverTest):
+ self._responses = []
+
+ def tearDown(self):
++ super(TestSession, self).tearDown()
+ self._urllib3_patch.stop()
+
+ def get_response(self, request):
Deleted: prompt-toolkit-3.0.29.diff
===================================================================
--- prompt-toolkit-3.0.29.diff 2023-03-11 15:52:47 UTC (rev 1418702)
+++ prompt-toolkit-3.0.29.diff 2023-03-11 15:53:17 UTC (rev 1418703)
@@ -1,16 +0,0 @@
-diff --git a/tests/conftest.py b/tests/conftest.py
-index 4bd573144..8a9e1530b 100644
---- a/tests/conftest.py
-+++ b/tests/conftest.py
-@@ -40,10 +40,7 @@ def clear_loggers():
-
- @pytest.fixture
- def ptk_app_session():
-- pipe_input = create_pipe_input()
- output = DummyOutput()
-- try:
-+ with create_pipe_input() as pipe_input:
- with create_app_session(input=pipe_input, output=output) as session:
- yield session
-- finally:
-- pipe_input.close()
Copied: aws-cli-v2/repos/community-any/prompt-toolkit-3.0.29.diff (from rev
1418702, aws-cli-v2/trunk/prompt-toolkit-3.0.29.diff)
===================================================================
--- prompt-toolkit-3.0.29.diff (rev 0)
+++ prompt-toolkit-3.0.29.diff 2023-03-11 15:53:17 UTC (rev 1418703)
@@ -0,0 +1,16 @@
+diff --git a/tests/conftest.py b/tests/conftest.py
+index 4bd573144..8a9e1530b 100644
+--- a/tests/conftest.py
++++ b/tests/conftest.py
+@@ -40,10 +40,7 @@ def clear_loggers():
+
+ @pytest.fixture
+ def ptk_app_session():
+- pipe_input = create_pipe_input()
+ output = DummyOutput()
+- try:
++ with create_pipe_input() as pipe_input:
+ with create_app_session(input=pipe_input, output=output) as session:
+ yield session
+- finally:
+- pipe_input.close()
