diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 54d6672..9c70000 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -29,7 +29,7 @@ jobs: echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY echo "> External trigger running off of alpine322 branch. To disable this trigger, add \`python_alpine322\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY - EXT_RELEASE=$(echo 3.13.11) + EXT_RELEASE=$(curl -u ${{ secrets.CR_USER }}:${{ secrets.CR_PAT }} -sX GET https://api.github.com/repos/python/cpython/tags | jq -r '.[] | select(.name | contains("rc") or contains("a") or contains("b") | not) | .name' | sed 's|^v||g' | sort -rV | head -1) echo "Type is \`custom_version_command\`" >> $GITHUB_STEP_SUMMARY if grep -q "^python_alpine322_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY diff --git a/Jenkinsfile b/Jenkinsfile index 7600f1c..3a07a2c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -147,7 +147,7 @@ pipeline { steps{ script{ env.EXT_RELEASE = sh( - script: ''' echo 3.13.11 ''', + script: ''' curl -sX GET https://api.github.com/repos/python/cpython/tags | jq -r '.[] | select(.name | contains("rc") or contains("a") or contains("b") | not) | .name' | sed 's|^v||g' | sort -rV | head -1 ''', returnStdout: true).trim() env.RELEASE_LINK = 'custom_command' } diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 66cf2fa..696b694 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -3,7 +3,7 @@ # jenkins variables project_name: docker-python external_type: na -custom_version_command: "echo 3.13.11" +custom_version_command: "curl -sX GET https://api.github.com/repos/python/cpython/tags | jq -r '.[] | select(.name | contains(\"rc\") or contains(\"a\") or contains(\"b\") | not) | .name' | sed 's|^v||g' | sort -rV | head -1" release_type: stable release_tag: alpine322 ls_branch: alpine322 diff --git a/patches/gh-126156-Improve-performance-of-creating-Morsel-obj.patch b/patches/gh-126156-Improve-performance-of-creating-Morsel-obj.patch deleted file mode 100644 index d80cc33..0000000 --- a/patches/gh-126156-Improve-performance-of-creating-Morsel-obj.patch +++ /dev/null @@ -1,38 +0,0 @@ -From dd3c0fa3fd2795326dae0e0ed63c668f5506cf32 Mon Sep 17 00:00:00 2001 -From: "J. Nick Koston" -Date: Thu, 31 Oct 2024 14:05:40 -0500 -Subject: [PATCH] gh-126156: Improve performance of creating `Morsel` objects - (#126157) - -Replaces the manually constructed loop with a call to `dict.update` ---- - Lib/http/cookies.py | 5 +++-- - .../Library/2024-10-30-00-12-22.gh-issue-126156.BOSqv0.rst | 1 + - 2 files changed, 4 insertions(+), 2 deletions(-) - create mode 100644 Misc/NEWS.d/next/Library/2024-10-30-00-12-22.gh-issue-126156.BOSqv0.rst - -diff --git a/Lib/http/cookies.py b/Lib/http/cookies.py -index 6b9ed24ad8e..d7e8d08b2d9 100644 ---- a/Lib/http/cookies.py -+++ b/Lib/http/cookies.py -@@ -266,6 +266,8 @@ class Morsel(dict): - "samesite" : "SameSite", - } - -+ _reserved_defaults = dict.fromkeys(_reserved, "") -+ - _flags = {'secure', 'httponly'} - - def __init__(self): -@@ -273,8 +275,7 @@ def __init__(self): - self._key = self._value = self._coded_value = None - - # Set default attributes -- for key in self._reserved: -- dict.__setitem__(self, key, "") -+ dict.update(self, self._reserved_defaults) - - @property - def key(self): --- -2.39.3 (Apple Git-145) diff --git a/patches/musl-skip_failing_tests.patch b/patches/musl-skip_failing_tests.patch deleted file mode 100644 index ab19aab..0000000 --- a/patches/musl-skip_failing_tests.patch +++ /dev/null @@ -1,39 +0,0 @@ -From c4355fe059aad95122cae9747ec9e34b934a2a3a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= -Date: Fri, 11 Apr 2025 13:20:37 +0200 -Subject: [PATCH] Skip test_re tests failing on musl - ---- - Lib/test/test_re.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py -index 813cb4a..0b5877a 100644 ---- a/Lib/test/test_re.py -+++ b/Lib/test/test_re.py -@@ -1,6 +1,6 @@ - from test.support import (gc_collect, bigmemtest, _2G, - cpython_only, captured_stdout, -- check_disallow_instantiation, is_emscripten, is_wasi, -+ check_disallow_instantiation, is_emscripten, is_wasi, linked_to_musl, - warnings_helper, SHORT_TIMEOUT, CPUStopwatch, requires_resource) - import locale - import re -@@ -2177,7 +2177,7 @@ class ReTests(unittest.TestCase): - self.assertEqual(re.fullmatch('[a-c]+', 'ABC', re.I).span(), (0, 3)) - - @unittest.skipIf( -- is_emscripten or is_wasi, -+ is_emscripten or is_wasi or linked_to_musl, - "musl libc issue on Emscripten/WASI, bpo-46390" - ) - def test_locale_caching(self): -@@ -2217,7 +2217,7 @@ class ReTests(unittest.TestCase): - self.assertIsNone(re.match(b'(?Li)\xe5', b'\xc5')) - - @unittest.skipIf( -- is_emscripten or is_wasi, -+ is_emscripten or is_wasi or linked_to_musl, - "musl libc issue on Emscripten/WASI, bpo-46390" - ) - def test_locale_compiled(self):