Add Support for PYTHON|3.12.2 and PYTHON|3.11.8 (#2359)

* Add support for Python 3.12.2 and 3.11.8 * add python|3.12.2 and 3.11.8 * update base tag for python|3.12.2 and python|3.11.8 * refactor * refactor * refactor * update dockerfile path * test pipeline * update python version in dockerfiles * Update base tag for runtime images --------- Co-authored-by: root <[email protected]>
microsoft · Mar 12, 2024 · 65fa32e · 65fa32e
1 parent 9de9485
commit 65fa32e
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 17 deletions.
diff --git a/build/__pythonVersions.sh b/build/__pythonVersions.sh
@@ -1,12 +1,12 @@
 # This file was auto-generated from 'constants.yaml'. Changes may be overridden.
 
-PYTHON_RUNTIME_BASE_TAG='20240110.3'
+PYTHON_RUNTIME_BASE_TAG='20240227.1'
 PIP_VERSION='21.2.4'
 PYTHON27_VERSION='2.7.18'
 PYTHON36_VERSION='3.6.15'
 PYTHON37_VERSION='3.7.15'
 PYTHON38_VERSION='3.8.18'
 PYTHON39_VERSION='3.9.18'
 PYTHON310_VERSION='3.10.13'
-PYTHON311_VERSION='3.11.7'
-PYTHON312_VERSION='3.12.1'
+PYTHON311_VERSION='3.11.8'
+PYTHON312_VERSION='3.12.2'
diff --git a/build/constants.yaml b/build/constants.yaml
@@ -149,16 +149,16 @@
       file-name-prefix: __
 - name: python-versions
   constants:
-    python-runtime-base-tag: 20240110.3
+    python-runtime-base-tag: 20240227.1
     pip-version: 21.2.4
     python27-version: 2.7.18
     python36-version: 3.6.15
     python37-version: 3.7.15
     python38-version: 3.8.18
     python39-version: 3.9.18
     python310-version: 3.10.13
-    python311-version: 3.11.7
-    python312-version: 3.12.1
+    python311-version: 3.11.8
+    python312-version: 3.12.2
     runtime-versions:
       - 3.7-debian-bullseye
       - 3.7-debian-buster

diff --git a/doc/supportedPlatformVersions.md b/doc/supportedPlatformVersions.md
@@ -1246,7 +1246,9 @@
 - 3.9.18
 - 3.10.13
 - 3.11.7
+- 3.11.8
 - 3.12.1
+- 3.12.2
 
 ### bullseye
 
@@ -1272,8 +1274,10 @@
 - 3.11.0
 - 3.11.6
 - 3.11.7
+- 3.11.8
 - 3.12.0
 - 3.12.1
+- 3.12.2
 
 ### buster
 
@@ -1299,7 +1303,9 @@
 - 3.10.13
 - 3.11.6
 - 3.11.7
+- 3.11.8
 - 3.12.1
+- 3.12.2
 
 ### focal-scm
 

diff --git a/images/runtime/python/3.11/base.bookworm.Dockerfile b/images/runtime/python/3.11/base.bookworm.Dockerfile
@@ -29,7 +29,7 @@ ADD build ${BUILD_DIR}
 RUN find ${IMAGES_DIR} -type f -iname "*.sh" -exec chmod +x {} \;
 RUN find ${BUILD_DIR} -type f -iname "*.sh" -exec chmod +x {} \;
 
-ENV PYTHON_VERSION 3.11.7
+ENV PYTHON_VERSION 3.11.8
 RUN true
 COPY build/__pythonVersions.sh ${BUILD_DIR}
 RUN true
@@ -58,7 +58,7 @@ RUN --mount=type=secret,id=oryx_sdk_storage_account_access_token \
 
 RUN set -ex \
  && cd /opt/python/ \
- && ln -s 3.11.7 3.11 \
+ && ln -s 3.11.8 3.11 \
  && ln -s 3.11 3 \
  && echo /opt/python/3/lib >> /etc/ld.so.conf.d/python.conf \
  && ldconfig \

diff --git a/images/runtime/python/3.11/base.bullseye.Dockerfile b/images/runtime/python/3.11/base.bullseye.Dockerfile
@@ -29,7 +29,7 @@ ADD build ${BUILD_DIR}
 RUN find ${IMAGES_DIR} -type f -iname "*.sh" -exec chmod +x {} \;
 RUN find ${BUILD_DIR} -type f -iname "*.sh" -exec chmod +x {} \;
 
-ENV PYTHON_VERSION 3.11.0
+ENV PYTHON_VERSION 3.11.8
 RUN true
 COPY build/__pythonVersions.sh ${BUILD_DIR}
 RUN true
@@ -58,7 +58,7 @@ RUN --mount=type=secret,id=oryx_sdk_storage_account_access_token \
 
 RUN set -ex \
  && cd /opt/python/ \
- && ln -s 3.11.0 3.11 \
+ && ln -s 3.11.8 3.11 \
  && ln -s 3.11 3 \
  && echo /opt/python/3/lib >> /etc/ld.so.conf.d/python.conf \
  && ldconfig \

diff --git a/images/runtime/python/3.12/base.bookworm.Dockerfile b/images/runtime/python/3.12/base.bookworm.Dockerfile
@@ -29,7 +29,7 @@ ADD build ${BUILD_DIR}
 RUN find ${IMAGES_DIR} -type f -iname "*.sh" -exec chmod +x {} \;
 RUN find ${BUILD_DIR} -type f -iname "*.sh" -exec chmod +x {} \;
 
-ENV PYTHON_VERSION 3.12.1
+ENV PYTHON_VERSION 3.12.2
 RUN true
 COPY build/__pythonVersions.sh ${BUILD_DIR}
 RUN true
@@ -58,7 +58,7 @@ RUN --mount=type=secret,id=oryx_sdk_storage_account_access_token \
 
 RUN set -ex \
  && cd /opt/python/ \
- && ln -s 3.12.1 3.12 \
+ && ln -s 3.12.2 3.12 \
  && ln -s 3.12 3 \
  && echo /opt/python/3/lib >> /etc/ld.so.conf.d/python.conf \
  && ldconfig \

diff --git a/images/runtime/python/3.12/base.bullseye.Dockerfile b/images/runtime/python/3.12/base.bullseye.Dockerfile
@@ -29,7 +29,7 @@ ADD build ${BUILD_DIR}
 RUN find ${IMAGES_DIR} -type f -iname "*.sh" -exec chmod +x {} \;
 RUN find ${BUILD_DIR} -type f -iname "*.sh" -exec chmod +x {} \;
 
-ENV PYTHON_VERSION 3.12.0
+ENV PYTHON_VERSION 3.12.2
 RUN true
 COPY build/__pythonVersions.sh ${BUILD_DIR}
 RUN true
@@ -58,7 +58,7 @@ RUN --mount=type=secret,id=oryx_sdk_storage_account_access_token \
 
 RUN set -ex \
  && cd /opt/python/ \
- && ln -s 3.12.0 3.12 \
+ && ln -s 3.12.2 3.12 \
  && ln -s 3.12 3 \
  && echo /opt/python/3/lib >> /etc/ld.so.conf.d/python.conf \
  && ldconfig \

diff --git a/platforms/python/versions/bookworm/versionsToBuild.txt b/platforms/python/versions/bookworm/versionsToBuild.txt
@@ -5,4 +5,6 @@
 3.9.18, E3FF2839C048B25C084DEBE9B26995E310250568,
 3.10.13, A035C8C19219BA821ECEA86B64E628F8D684696D,
 3.11.7, A035C8C19219BA821ECEA86B64E628F8D684696D,
+3.11.8, A035C8C19219BA821ECEA86B64E628F8D684696D,
 3.12.1, 7169605F62C751356D054A26A821E680E5FA6305,
+3.12.2, 7169605F62C751356D054A26A821E680E5FA6305,
diff --git a/platforms/python/versions/bullseye/versionsToBuild.txt b/platforms/python/versions/bullseye/versionsToBuild.txt
@@ -10,8 +10,10 @@
 3.11.0b1, A035C8C19219BA821ECEA86B64E628F8D684696D,
 3.11.6, A035C8C19219BA821ECEA86B64E628F8D684696D,
 3.11.7, A035C8C19219BA821ECEA86B64E628F8D684696D,
+3.11.8, A035C8C19219BA821ECEA86B64E628F8D684696D,
 3.12.0, 7169605F62C751356D054A26A821E680E5FA6305,
 3.12.1, 7169605F62C751356D054A26A821E680E5FA6305,
+3.12.2, 7169605F62C751356D054A26A821E680E5FA6305,
 3.7.12, 0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D,
 3.7.15, 0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D,
 3.7.9, 0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D,

diff --git a/platforms/python/versions/buster/versionsToBuild.txt b/platforms/python/versions/buster/versionsToBuild.txt
@@ -8,7 +8,9 @@
 3.10.8, A035C8C19219BA821ECEA86B64E628F8D684696D,
 3.11.6, A035C8C19219BA821ECEA86B64E628F8D684696D,
 3.11.7, A035C8C19219BA821ECEA86B64E628F8D684696D,
+3.11.8, A035C8C19219BA821ECEA86B64E628F8D684696D,
 3.12.1, 7169605F62C751356D054A26A821E680E5FA6305,
+3.12.2, 7169605F62C751356D054A26A821E680E5FA6305,
 3.6.12, 0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D,
 3.6.15, 0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D,
 3.7.12, 0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D,

diff --git a/src/BuildScriptGenerator/PythonVersions.cs b/src/BuildScriptGenerator/PythonVersions.cs
@@ -6,16 +6,16 @@ namespace Microsoft.Oryx.BuildScriptGenerator.Common
 {
     public static class PythonVersions
     {
-        public const string PythonRuntimeBaseTag = "20240110.3";
+        public const string PythonRuntimeBaseTag = "20240227.1";
         public const string PipVersion = "21.2.4";
         public const string Python27Version = "2.7.18";
         public const string Python36Version = "3.6.15";
         public const string Python37Version = "3.7.15";
         public const string Python38Version = "3.8.18";
         public const string Python39Version = "3.9.18";
         public const string Python310Version = "3.10.13";
-        public const string Python311Version = "3.11.7";
-        public const string Python312Version = "3.12.1";
+        public const string Python311Version = "3.11.8";
+        public const string Python312Version = "3.12.2";
         public static readonly List<string> RuntimeVersions = new List<string> { "3.7-debian-bullseye", "3.7-debian-buster", "3.8-debian-bookworm", "3.8-debian-bullseye", "3.8-debian-buster", "3.9-debian-bookworm", "3.9-debian-bullseye", "3.9-debian-buster", "3.10-debian-bookworm", "3.10-debian-bullseye", "3.10-debian-buster", "3.11-debian-bookworm", "3.11-debian-bullseye", "3.12-debian-bookworm", "3.12-debian-bullseye", "dynamic-debian-buster" };
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -1246,7 +1246,9 @@ @@
     - 3.9.18
     - 3.10.13
     - 3.11.7
+    - 3.11.8
     - 3.12.1
+    - 3.12.2
     ### bullseye
@@ Expand All / @@ -1272,8 +1274,10 @@ @@
     - 3.11.0
     - 3.11.6
     - 3.11.7
+    - 3.11.8
     - 3.12.0
     - 3.12.1
+    - 3.12.2
     ### buster
@@ Expand All / @@ -1299,7 +1303,9 @@ @@
     - 3.10.13
     - 3.11.6
     - 3.11.7
+    - 3.11.8
     - 3.12.1
+    - 3.12.2
     ### focal-scm
@@ Expand Down @@