From 70c9f6226ccb5fc1950e6301d854c11dfa3df619 Mon Sep 17 00:00:00 2001 From: Miguel Caballer Date: Mon, 26 Jan 2026 08:40:26 +0100 Subject: [PATCH 1/4] Fix wheel extension in verify_checksums.sh --- dist/verify_checksums.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/verify_checksums.sh b/dist/verify_checksums.sh index af1e6b4261..b3e1b3ca78 100755 --- a/dist/verify_checksums.sh +++ b/dist/verify_checksums.sh @@ -30,7 +30,7 @@ TMP_DIR=$(mktemp -d) # TODO: Use json endpoint + jq to parse out the url # https://pypi.org/pypi/apache-libcloud/3.4.0/json EXTENSIONS[0]=".tar.gz" -EXTENSIONS[1]="-py3-none-any.whl" +EXTENSIONS[1]="-py2.py3-none-any.whl" APACHE_MIRROR_URL="http://www.apache.org/dist/libcloud" PYPI_MIRROR_URL_SOURCE="https://pypi.python.org/packages/source/a/apache-libcloud" @@ -69,7 +69,7 @@ do extension=${EXTENSIONS[$i]} file_name="${VERSION}${extension}" - if [ "${extension}" = "-py3-none-any.whl" ]; then + if [ "${extension}" = "-py2.py3-none-any.whl" ]; then # shellcheck disable=SC2001 file_name=$(echo "${file_name}" | sed "s/apache-libcloud/apache_libcloud/g") fi @@ -77,7 +77,7 @@ do apache_url="${APACHE_MIRROR_URL}/${file_name}" pypi_url="${PYPI_MIRROR_URL}/${file_name}" - if [ "${extension}" = "-py3-none-any.whl" ]; then + if [ "${extension}" = "-py2.py3-none-any.whl" ]; then pypi_url="${PYPI_MIRROR_URL_WHEEL}/${file_name}" else pypi_url="${PYPI_MIRROR_URL_SOURCE}/${file_name}" From 16d97b2f0fc53c8549f4425c1ae12c34ff8811ab Mon Sep 17 00:00:00 2001 From: Miguel Caballer Date: Mon, 26 Jan 2026 09:10:38 +0100 Subject: [PATCH 2/4] Fix get pypi wheel url --- dist/verify_checksums.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dist/verify_checksums.sh b/dist/verify_checksums.sh index b3e1b3ca78..2c6473b80b 100755 --- a/dist/verify_checksums.sh +++ b/dist/verify_checksums.sh @@ -34,7 +34,7 @@ EXTENSIONS[1]="-py2.py3-none-any.whl" APACHE_MIRROR_URL="http://www.apache.org/dist/libcloud" PYPI_MIRROR_URL_SOURCE="https://pypi.python.org/packages/source/a/apache-libcloud" -PYPI_MIRROR_URL_WHEEL="https://files.pythonhosted.org/packages/py3/a/apache-libcloud" +PYPI_SIMPLE_URL="https://pypi.org/simple/apache-libcloud/" # From http://tldp.org/LDP/abs/html/debugging.html#ASSERT function assert () # If condition false, @@ -78,7 +78,8 @@ do pypi_url="${PYPI_MIRROR_URL}/${file_name}" if [ "${extension}" = "-py2.py3-none-any.whl" ]; then - pypi_url="${PYPI_MIRROR_URL_WHEEL}/${file_name}" + # Get the wheel full URL from PyPi Simple index + pypi_url=$(curl -s ${PYPI_SIMPLE_URL} | grep ${file_name} | sed -n 's/.*href="\([^"]*\)".*/\1/p') else pypi_url="${PYPI_MIRROR_URL_SOURCE}/${file_name}" fi From 4699a2ab94d82640e516a5d88973452c3e31fc50 Mon Sep 17 00:00:00 2001 From: Miguel Caballer Date: Mon, 26 Jan 2026 09:17:14 +0100 Subject: [PATCH 3/4] Fix shellcheck --- dist/verify_checksums.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/verify_checksums.sh b/dist/verify_checksums.sh index 2c6473b80b..466076c036 100755 --- a/dist/verify_checksums.sh +++ b/dist/verify_checksums.sh @@ -79,7 +79,7 @@ do if [ "${extension}" = "-py2.py3-none-any.whl" ]; then # Get the wheel full URL from PyPi Simple index - pypi_url=$(curl -s ${PYPI_SIMPLE_URL} | grep ${file_name} | sed -n 's/.*href="\([^"]*\)".*/\1/p') + pypi_url=$(curl -s ${PYPI_SIMPLE_URL} | grep "${file_name}" | sed -n 's/.*href="\([^"]*\)".*/\1/p') else pypi_url="${PYPI_MIRROR_URL_SOURCE}/${file_name}" fi From 4a9f11c8aaf83049ff7a7099e59e036254fa55fe Mon Sep 17 00:00:00 2001 From: Miguel Caballer Date: Mon, 26 Jan 2026 09:51:55 +0100 Subject: [PATCH 4/4] Revert name change in required tests --- .asf.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index 89175d8dae..690081448f 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -48,8 +48,8 @@ github: - "Unit Tests (Python 3.12)" - "Unit Tests (Python 3.13)" - "Dependency Review" - - "Run Various Lint and Other Checks" - - "Build and upload Documentation" + - "Run Various Lint and Other Checks (3.10)" + - "Build and upload Documentation (3.10)" notifications: jobs: notifications@libcloud.apache.org