Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport styhead-next] 2024-10-17_01-34-56_master-next_aws-cli-v2 #10029

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1debc1593104ded7e88b0ac5659af552"

PYPI_PACKAGE = "ruamel.yaml.clib"

inherit pypi setuptools3
inherit pypi setuptools3 native

SRC_URI[sha256sum] = "beb2e0404003de9a4cab9753a8805a8fe9320ee6673136ed7f04255fe60bb512"

Expand All @@ -20,5 +20,3 @@ RDEPENDS:${PN} += "\
do_install:prepend() {
export RUAMEL_NO_PIP_INSTALL_CHECK=1
}

BBCLASSEXTEND = "native nativesdk"
Original file line number Diff line number Diff line change
@@ -1,52 +1,34 @@
From 0912a31b6338ffa1e9463bf4ca0435016e479d14 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
requirements.

Signed-off-by: Thomas Roos <[email protected]>
requirements.

Upstream-Status: Inappropriate [OE specific]
---
pyproject.toml | 27 +++++++++++----------------
requirements/bootstrap.txt | 2 +-
2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 2bc94a4ba..a41cfba35 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
[build-system]
requires = [
-"flit_core>=3.7.1,<3.9.1",
+"flit_core>=3.7.1",
]
build-backend = "pep517"
backend-path = ["backends"]
@@ -30,21 +30,16 @@ classifiers = [
Index: git/pyproject.toml
===================================================================
--- git.orig/pyproject.toml
+++ git/pyproject.toml
@@ -30,21 +30,20 @@ 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",
- # 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.
+ "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.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.21.2",
- "awscrt>=0.19.18,<=0.22.0",
- "python-dateutil>=2.1,<=2.9.0",
- "jmespath>=0.7.1,<1.1.0",
- "urllib3>=1.25.4,<1.27",
+ "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",
Expand All @@ -55,11 +37,11 @@ index 2bc94a4ba..a41cfba35 100644
+ "urllib3>=1.25.4",
]
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
-flit_core>=3.7.1,<3.9.1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ SRC_URI = "\
file://run-ptest \
"

SRCREV = "9675bee41da9abf567779ba05ec0e612e63ae268"
SRCREV = "670e45354681016f1c3ecd9cf5797be4b338c96e"

# version 2.x
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>2\.\d+(\.\d+)+)"
Expand Down
Loading