Skip to content

Commit be76659

Browse files
committed
aws-cli-v2: upgrade, remove python3-urllib3-1.x, upgrade python3-ruamel-yaml-clib
aws-cli-v2: upgrade 2.32.26 -> 2.32.32 python3-urllib3-1.x: is not necessary anymore python3-ruamel-yaml-clib: upgrade 0.2.12 -> 0.2.15
1 parent f945fcf commit be76659

File tree

5 files changed

+77
-64
lines changed

5 files changed

+77
-64
lines changed
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#!/bin/sh
2+
3+
# Simple test to verify ruamel.yaml.clib can be imported and basic functionality works
4+
python3 -c "
5+
import sys
6+
try:
7+
import ruamel.yaml.clib
8+
print('PASS: ruamel.yaml.clib import successful')
9+
10+
# Test basic functionality if available
11+
if hasattr(ruamel.yaml.clib, 'version_info'):
12+
version = ruamel.yaml.clib.version_info
13+
print('PASS: ruamel.yaml.clib version info accessible:', version)
14+
else:
15+
print('PASS: ruamel.yaml.clib basic functionality verified')
16+
17+
except ImportError as e:
18+
print('FAIL: ruamel.yaml.clib import failed:', str(e))
19+
sys.exit(1)
20+
except Exception as e:
21+
print('FAIL: ruamel.yaml.clib test failed:', str(e))
22+
sys.exit(1)
23+
"

recipes-devtools/python/python3-ruamel-yaml-clib_0.2.12.bb

Lines changed: 0 additions & 24 deletions
This file was deleted.
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
SUMMARY = "YAML parser/emitter"
2+
DESCRIPTION = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order."
3+
HOMEPAGE = "https://pypi.org/project/ruamel.yaml.clib/"
4+
5+
LICENSE = "MIT"
6+
LIC_FILES_CHKSUM = "file://LICENSE;md5=40323d21fb440c36bfd8e28c280977de"
7+
8+
SRC_URI = "https://files.pythonhosted.org/packages/ea/97/60fda20e2fb54b83a61ae14648b0817c8f5d84a3821e40bfbdae1437026a/ruamel_yaml_clib-0.2.15.tar.gz"
9+
SRC_URI[sha256sum] = "46e4cc8c43ef6a94885f72512094e482114a8a706d3c555a34ed4b0d20200600"
10+
11+
S = "${UNPACKDIR}/ruamel.yaml.clib-${PV}"
12+
13+
inherit setuptools3 ptest
14+
15+
SRC_URI += "file://run-ptest"
16+
17+
# Build dependencies for C extension
18+
DEPENDS += "python3-setuptools-native"
19+
20+
RDEPENDS:${PN} += "\
21+
${PYTHON_PN}-shell \
22+
${PYTHON_PN}-datetime \
23+
${PYTHON_PN}-netclient \
24+
${PYTHON_PN}-ruamel-yaml \
25+
"
26+
27+
RDEPENDS:${PN}-ptest += "\
28+
${PYTHON_PN}-unittest \
29+
"
30+
31+
FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}/ruamel/yaml/clib/ ${PYTHON_SITEPACKAGES_DIR}/_ruamel_yaml*.so"
32+
33+
do_install_ptest() {
34+
install -d ${D}${PTEST_PATH}
35+
}
36+
37+
do_install:prepend() {
38+
export RUAMEL_NO_PIP_INSTALL_CHECK=1
39+
# Ensure C extension is built
40+
export RUAMEL_YAML_CLIB_BUILD_EXTENSION=1
41+
}
42+
43+
do_install:append() {
44+
# Install the ruamel.yaml.clib namespace package structure
45+
install -d ${D}${PYTHON_SITEPACKAGES_DIR}/ruamel/yaml/clib
46+
cp -r ${S}/build/lib.linux-*/ruamel/yaml/clib/* ${D}${PYTHON_SITEPACKAGES_DIR}/ruamel/yaml/clib/
47+
}
48+
49+
BBCLASSEXTEND = "native"

recipes-devtools/python/python3-urllib3-1.x_1.26.20.bb

Lines changed: 0 additions & 35 deletions
This file was deleted.

recipes-support/aws-cli-v2/aws-cli-v2_2.32.26.bb renamed to recipes-support/aws-cli-v2/aws-cli-v2_2.32.32.bb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ DEPENDS += "\
2323
python3-ruamel-yaml-clib-native \
2424
python3-ruamel-yaml-native \
2525
python3-s3transfer \
26-
python3-urllib3-1.x-native \
26+
python3-urllib3-native \
2727
python3-zipp-native \
2828
"
2929

@@ -32,7 +32,7 @@ SRC_URI = "\
3232
file://run-ptest \
3333
"
3434

35-
SRCREV = "0adb0502f47da9388709a024040ad4df3122fd79"
35+
SRCREV = "275856fc64ee5f16a0149049cd844f0496e38ca7"
3636

3737
# version 2.x
3838
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>2\.\d+(\.\d+)+)"
@@ -68,19 +68,19 @@ RDEPENDS:${PN} += "\
6868
python3-ruamel-yaml \
6969
python3-sqlite3 \
7070
python3-unixadmin \
71-
python3-urllib3-1.x \
71+
python3-urllib3 \
7272
python3-zipp \
7373
"
7474

7575
do_patch() {
7676
sed -i -E 's/(([a-zA-Z0-9_.-]+)(>=?[0-9.]+)?(,)?(<[0-9.]+\*|<=?[0-9.]+)?|([a-zA-Z0-9_.-]+)==[0-9.]+)/\2\3\6/' ${S}/pyproject.toml ${S}/requirements/bootstrap.txt
77-
77+
7878
# Patch awscli logger to handle CRT initialization errors
7979
sed -i '/def enable_crt_logging():/,/awscrt.io.init_logging/ {
8080
s/awscrt.io.init_logging/try:\n awscrt.io.init_logging/
8181
/awscrt.io.init_logging/a\ except RuntimeError:\n pass
8282
}' ${S}/awscli/logger.py
83-
83+
8484
sed -i '/def disable_crt_logging():/,/awscrt.io.init_logging/ {
8585
s/awscrt.io.init_logging/try:\n awscrt.io.init_logging/
8686
/awscrt.io.init_logging/a\ except RuntimeError:\n pass

0 commit comments

Comments
 (0)