Fix Python version for Ubuntu 24.04 and Docker build

montanalow · montanalow · commit caed62939fdc · 2025-04-14T21:12:02.000-07:00
- Updates Ubuntu 24.04 Python version from 3.11 to 3.12
- Adds Python 3.12 to Docker image prerequisites
- Removes deb-s3 lock in postgresml-python release script
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -8,7 +8,10 @@ RUN apt update && \
 		gnupg \
 		coreutils \
 		sudo \
-		openssl
+		openssl \
+		python3.12 \
+		python3.12-dev \
+		python3-pip
 RUN echo "deb [trusted=yes] https://apt.postgresml.org $(lsb_release -cs) main" > /etc/apt/sources.list.d/postgresml.list
 RUN echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list
 RUN curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/apt.postgresql.org.gpg >/dev/null
diff --git a/packages/postgresml-python/build.sh b/packages/postgresml-python/build.sh
@@ -21,7 +21,7 @@ fi
 declare -A ubuntu_python_versions=(
   ["20.04"]="3.8"
   ["22.04"]="3.10"
-  ["24.04"]="3.11"
+  ["24.04"]="3.12"
 )
 
 if [[ -z "$3" ]]; then
diff --git a/packages/postgresml-python/release.sh b/packages/postgresml-python/release.sh
@@ -60,14 +60,12 @@ build_package() {
     exit 1
   fi
 
-  # Upload to S3 with a unique ID to avoid lock contention
+  # Upload to S3
   deb-s3 upload \
-    --lock \
     --visibility=public \
     --bucket apt.postgresml.org \
     $(package_name ${ubuntu_version} ${ARCH}) \
-    --codename ${codename} \
-    --lock-name="${ARCH}-${ubuntu_version}-$(date +%s)"
+    --codename ${codename}
 
   # Clean up the package file
   rm $(package_name ${ubuntu_version} ${ARCH})

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ fi`
`21`	`21`	`declare -A ubuntu_python_versions=(`
`22`	`22`	`["20.04"]="3.8"`
`23`	`23`	`["22.04"]="3.10"`
`24`		`- ["24.04"]="3.11"`
	`24`	`+ ["24.04"]="3.12"`
`25`	`25`	`)`
`26`	`26`
`27`	`27`	`if [[ -z "$3" ]]; then`