[Backport styhead-next] 2024-12-17_01-36-47_master-next_aws-cli-v2

recipes-support/aws-cli-v2/aws-cli-v2/0001-remove_exact_python_version_requirements.patch

@@ -1,4 +1,4 @@
-From 58b256a42a307e887977a1fc216f34c15f7bf933 Mon Sep 17 00:00:00 2001
+From fa0b2b89aa7c82eefdc9ce047d2a9d6c25406063 Mon Sep 17 00:00:00 2001
 From: Thomas Roos <[email protected]>
 Date: Fri, 12 Jan 2024 13:24:54 +0000
 Subject: [PATCH] This patch is removing exact python version dependency
@@ -10,11 +10,10 @@ Upstream-Status: Inappropriate [OE specific]
  pyproject.toml             | 23 +++++++++++------------
  requirements/bootstrap.txt |  2 +-
  2 files changed, 12 insertions(+), 13 deletions(-)
-
-diff --git a/pyproject.toml b/pyproject.toml
-index 58ba14278..800a9c538 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
+Index: git/pyproject.toml
+===================================================================
+--- git.orig/pyproject.toml
++++ git/pyproject.toml
 @@ -1,6 +1,6 @@
  [build-system]
  requires = [
@@ -23,44 +22,50 @@ index 58ba14278..800a9c538 100644
  ]
  build-backend = "pep517"
  backend-path = ["backends"]
-@@ -30,21 +30,20 @@ classifiers = [
+@@ -30,25 +30,17 @@ classifiers = [
      'Programming Language :: Python :: 3.12',
  ]
  dependencies = [
 -    "colorama>=0.2.5,<0.4.7",
 -    "docutils>=0.10,<0.20",
 -    "cryptography>=40.0.0,<43.0.2",
 -    "ruamel.yaml>=0.15.0,<=0.17.21",
-+    "colorama>=0.2.5",
-+    "docutils>=0.10",
-+    "cryptography>=40.0.0",
-+    "ruamel.yaml>=0.15.0",
-     # ruamel.yaml only requires ruamel.yaml.clib for Python versions
-     # less than or equal to Python 3.10. In order to ensure we have
-     # a consistent dependency closure across all Python versions,
-     # we explicitly include ruamel.yaml.clib as a dependency.
+-    # ruamel.yaml only requires ruamel.yaml.clib for Python versions
+-    # less than or equal to Python 3.10. In order to ensure we have
+-    # a consistent dependency closure across all Python versions,
+-    # we explicitly include ruamel.yaml.clib as a dependency.
 -    "ruamel.yaml.clib>=0.2.0,<=0.2.8",
 -    "prompt-toolkit>=3.0.24,<3.0.39",
 -    "distro>=1.5.0,<1.9.0",
--    "awscrt>=0.19.18,<=0.22.0",
+-    "awscrt==0.23.4",
 -    "python-dateutil>=2.1,<=2.9.0",
 -    "jmespath>=0.7.1,<1.1.0",
 -    "urllib3>=1.25.4,<1.27",
+-    # zipp>=3.21.0 dropped support for Python 3.8. In order to ensure
+-    # we have a consistent dependency closure across all Python
+-    # versions, we explicitly include zipp as a dependency.
+-    "zipp<3.21.0",
++    "colorama>=0.2.5",
++    "docutils>=0.10",
++    "cryptography>=40.0.0",
++    "ruamel.yaml>=0.15.0",
 +    "prompt-toolkit>=3.0.24",
 +    "distro>=1.5.0",
-+    "awscrt>=0.19.18",
++    "awscrt>=0.23.4",
 +    "python-dateutil>=2.1",
 +    "jmespath>=0.7.1",
 +    "urllib3>=1.25.4",
++    "zipp",
  ]
  dynamic = ["version"]
 
-diff --git a/requirements/bootstrap.txt b/requirements/bootstrap.txt
-index fcc7ca534..98265db90 100644
---- a/requirements/bootstrap.txt
-+++ b/requirements/bootstrap.txt
+Index: git/requirements/bootstrap.txt
+===================================================================
+--- git.orig/requirements/bootstrap.txt
++++ git/requirements/bootstrap.txt
 @@ -1,2 +1,2 @@
- pip>=22.0.0,<25.0.0
+-pip>=22.0.0,<25.0.0
 -flit_core>=3.7.1,<3.9.1
 \ No newline at end of file
++pip>=22.0.0
 +flit_core>=3.7.1

recipes-support/aws-cli-v2/aws-cli-v2_2.22.18.bb

@@ -0,0 +1,98 @@
+SUMMARY = "Universal Command Line Interface for Amazon Web Services v2"
+DESCRIPTION = "Universal Command Line Interface for Amazon Web Services and ptest scripts v2"
+HOMEPAGE = "https://github.com/aws/aws-cli/tree/v2"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7970352423db76abb33cbe303884afbf"
+
+DEPENDS += "\
+    aws-crt-python-native \
+    groff \
+    openssl-native \
+    python3-botocore \
+    python3-colorama-native \
+    python3-cryptography-native \
+    python3-dateutil-native \
+    python3-distro-native \
+    python3-docutils-native \
+    python3-flit-core \
+    python3-jmespath-native \
+    python3-native \
+    python3-prompt-toolkit-native \
+    python3-pyyaml-native \
+    python3-rsa \
+    python3-ruamel-yaml-clib-native \
+    python3-ruamel-yaml-native \
+    python3-s3transfer \
+    python3-urllib3-1.x-native \
+    python3-zipp-native \
+"
+
+SRC_URI = "\
+    git://github.com/aws/aws-cli.git;protocol=https;branch=v2 \
+    file://0001-remove_exact_python_version_requirements.patch \
+    file://run-ptest \
+"
+
+SRCREV = "4f42c0921fde873f16a947bc306dc88528ae19b3"
+
+# version 2.x
+UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>2\.\d+(\.\d+)+)"
+
+inherit python_pep517 python3native python3-dir setuptools3-base ptest
+
+export CRYPTOGRAPHY_OPENSSL_NO_LEGACY="true"
+
+S = "${WORKDIR}/git"
+
+# this package also contains aws help
+PACKAGES += "${PN}-examples"
+
+FILES:${PN}-examples += "${libdir}/${PYTHON_DIR}/site-packages/awscli/examples"
+
+RDEPENDS:${PN} += "\
+    aws-crt-python \
+    openssl \
+    python3-botocore \
+    python3-colorama \
+    python3-compression \
+    python3-core \
+    python3-dateutil \
+    python3-distro \
+    python3-docutils \
+    python3-elementpath \
+    python3-io \
+    python3-ipaddress \
+    python3-jmespath \
+    python3-json \
+    python3-logging \
+    python3-misc \
+    python3-prompt-toolkit \
+    python3-rsa \
+    python3-ruamel-yaml \
+    python3-sqlite3 \
+    python3-unixadmin \
+    python3-urllib3-1.x \
+    python3-zipp \
+"
+
+do_install_ptest() {
+        install -d ${D}${PTEST_PATH}/tests
+        # just install some tests with low memory (less than 4GB) consumption
+        cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/
+}
+
+RDEPENDS:${PN}-ptest += "\
+        bash \
+        python3-mock \
+        python3-pytest \
+        python3-venv \
+"
+
+RDEPENDS:${PN}-examples += "\
+        groff \
+        less \
+"
+
+RRECOMMENDS:${PN} = "${PN}-examples"
+
+RCONFLICTS:${PN} = "awscli"