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

Add python-3.13 rc build. #28616

Merged
merged 1 commit into from
Sep 23, 2024
Merged

Add python-3.13 rc build. #28616

merged 1 commit into from
Sep 23, 2024

Conversation

smoser
Copy link
Member

@smoser smoser commented Sep 17, 2024

here is a diff against current python-3.12.yaml:

diff --git a/python-3.12.yaml b/python-3.13.yaml
index 10b30250e..be8ade5e4 100644
--- a/python-3.12.yaml
+++ b/python-3.13.yaml
@@ -1,6 +1,6 @@
 package:
-  name: python-3.12
-  version: 3.12.6
+  name: python-3.13
+  version: 3.13.0_rc2
   epoch: 0
   description: "the Python programming language"
   copyright:
@@ -10,8 +10,8 @@ package:
     memory: 8Gi
   dependencies:
     provides:
-      - python3=${{package.full-version}}
-      - python-3=${{package.full-version}}
+      - python3=0
+      - python-3=0
     runtime:
       - ${{package.name}}-base=${{package.full-version}}

@@ -28,6 +28,7 @@ environment:
       - linux-headers
       - mpdecimal-dev
       - ncurses-dev
+      - openssf-compiler-options
       - openssl-dev
       - readline-dev
       - sqlite-dev
@@ -41,16 +42,24 @@ var-transforms:
     replace: ''
     to: python
   - from: ${{package.version}}
-    match: (\d).(\d+).(\d+)
+    match: (\d).(\d+).(\d+).*
     replace: '$1.$2'
     to: pyversion
+  - from: ${{package.version}}
+    match: '_'
+    replace: ''
+    to: tagname
+  - from: ${{package.version}}
+    match: (\d).(\d+).(\d+).*
+    replace: '$1.$2.$3'
+    to: versionMajMinMic

 pipeline:
   - uses: git-checkout
     with:
-      expected-commit: a4a2d2b0d85273f746c3834ce2753e19c898949d
+      expected-commit: ec610069637d56101896803a70d418a89afe0b4b
       repository: https://github.com/python/cpython.git
-      tag: v${{package.version}}
+      tag: v${{vars.tagname}}

   - name: Force use of system libraries
     runs: |
@@ -150,7 +159,7 @@ subpackages:
     test:
       pipeline:
         - runs: |
-            ${{vars.python}} version-check.py ${{package.version}}
+            ${{vars.python}} version-check.py ${{vars.versionMajMinMic}}
         - name: Verify venv installs expected packages
           runs: |
             set +x
@@ -195,8 +204,8 @@ subpackages:
     description: "python3 development headers"
     dependencies:
       provides:
-        - python3-dev=${{package.full-version}}
-        - python-3-dev=${{package.full-version}}
+        - python3-dev=0
+        - python-3-dev=0
       runtime:
         - ${{package.name}}=${{package.full-version}}
         - ${{package.name}}-base-dev=${{package.full-version}}
@@ -231,8 +240,8 @@ test:
   pipeline:
     - runs: |
         # main package should provide 'python' and 'python3'.
-        python version-check.py ${{package.version}}
-        python3 version-check.py ${{package.version}}
+        python version-check.py ${{vars.versionMajMinMic}}
+        python3 version-check.py ${{vars.versionMajMinMic}}
     - name: Verify working python3 -m venv
       runs: |
         d=$(mktemp -d)

python-3.13.yaml Outdated Show resolved Hide resolved
python-3.13.yaml Outdated Show resolved Hide resolved
@smoser smoser force-pushed the new/python-3.13-rc branch 2 times, most recently from 99f3987 to 3dbf17d Compare September 18, 2024 15:33
@smoser smoser marked this pull request as ready for review September 18, 2024 15:37
Differences versus the python-3.12:
1. 3.12 -> 3.13[_rc2]
2. set provides to 0 for python3, python-3, python3-dev, python-3-dev
   python3=0 rather than python3=${{package.full-version}}
3. add openssf-compiler-options
4. change pyversion var match to get 3.13 out of 3.13.0_rc2
5. add versionMajMinMic var for use in the test, as version
   will be reported as 3.13.3, not including the _rc2.

3, 4, 5 should be acceptable for python-3.*.yaml
@xnox xnox force-pushed the new/python-3.13-rc branch from 3dbf17d to da67a68 Compare September 20, 2024 16:52
@xnox xnox merged commit cfdb7cb into wolfi-dev:main Sep 23, 2024
8 of 9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants