Update python #16983
Merged
Update python #16983
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Changes: - docker-library/python@676a087: Merge pull request docker-library/python#931 from infosiftr/riscv-speedup - docker-library/python@2d4fb58: Attempt to speed up riscv64 builds
Diff for ebc85c5:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 69dd0fc..c5362b9 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -66,12 +66,12 @@ Directory: 3.9/slim-bullseye
Tags: 3.10.14-alpine3.19, 3.10-alpine3.19
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 1b7a1106674a21e699b155cbd53bf39387284cca
+GitCommit: 2d4fb586c48b067b432cf56653ee2541d94fdd7d
Directory: 3.10/alpine3.19
Tags: 3.10.14-alpine3.20, 3.10-alpine3.20, 3.10.14-alpine, 3.10-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: f93fe0bd5c6649cc821ab7f8e959a322054fe798
+GitCommit: 2d4fb586c48b067b432cf56653ee2541d94fdd7d
Directory: 3.10/alpine3.20
Tags: 3.10.14-bookworm, 3.10-bookworm
@@ -97,12 +97,12 @@ Directory: 3.10/slim-bullseye
Tags: 3.11.9-alpine3.19, 3.11-alpine3.19
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 89b2500cd1255b1be5f57c1bce598f031172bb0a
+GitCommit: 2d4fb586c48b067b432cf56653ee2541d94fdd7d
Directory: 3.11/alpine3.19
Tags: 3.11.9-alpine3.20, 3.11-alpine3.20, 3.11.9-alpine, 3.11-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: f93fe0bd5c6649cc821ab7f8e959a322054fe798
+GitCommit: 2d4fb586c48b067b432cf56653ee2541d94fdd7d
Directory: 3.11/alpine3.20
Tags: 3.11.9-bookworm, 3.11-bookworm
@@ -144,12 +144,12 @@ Constraints: windowsservercore-ltsc2022
Tags: 3.12.4-alpine3.19, 3.12-alpine3.19, 3-alpine3.19, alpine3.19
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: b968d488efc09fd34672fc6238182e1222ae005e
+GitCommit: 2d4fb586c48b067b432cf56653ee2541d94fdd7d
Directory: 3.12/alpine3.19
Tags: 3.12.4-alpine3.20, 3.12-alpine3.20, 3-alpine3.20, alpine3.20, 3.12.4-alpine, 3.12-alpine, 3-alpine, alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: b968d488efc09fd34672fc6238182e1222ae005e
+GitCommit: 2d4fb586c48b067b432cf56653ee2541d94fdd7d
Directory: 3.12/alpine3.20
Tags: 3.12.4-bookworm, 3.12-bookworm, 3-bookworm, bookworm
@@ -191,12 +191,12 @@ Constraints: windowsservercore-ltsc2022
Tags: 3.13.0b2-alpine3.19, 3.13-rc-alpine3.19
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 748d6e9b44c0ee63e766a7c601d471e0763383d6
+GitCommit: 2d4fb586c48b067b432cf56653ee2541d94fdd7d
Directory: 3.13-rc/alpine3.19
Tags: 3.13.0b2-alpine3.20, 3.13-rc-alpine3.20, 3.13.0b2-alpine, 3.13-rc-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 748d6e9b44c0ee63e766a7c601d471e0763383d6
+GitCommit: 2d4fb586c48b067b432cf56653ee2541d94fdd7d
Directory: 3.13-rc/alpine3.20
Tags: 3.13.0b2-bookworm, 3.13-rc-bookworm
diff --git a/python_3.10-alpine/Dockerfile b/python_3.10-alpine/Dockerfile
index 6a97864..3e64dc5 100644
--- a/python_3.10-alpine/Dockerfile
+++ b/python_3.10-alpine/Dockerfile
@@ -73,7 +73,7 @@ RUN set -eux; \
./configure \
--build="$gnuArch" \
--enable-loadable-sqlite-extensions \
- --enable-optimizations \
+ $(test "$gnuArch" != 'riscv64-linux-musl' && echo '--enable-optimizations') \
--enable-option-checking=fatal \
--enable-shared \
--with-lto \
diff --git a/python_3.10-alpine3.19/Dockerfile b/python_3.10-alpine3.19/Dockerfile
index bd3ebc8..9ea2eba 100644
--- a/python_3.10-alpine3.19/Dockerfile
+++ b/python_3.10-alpine3.19/Dockerfile
@@ -73,7 +73,7 @@ RUN set -eux; \
./configure \
--build="$gnuArch" \
--enable-loadable-sqlite-extensions \
- --enable-optimizations \
+ $(test "$gnuArch" != 'riscv64-linux-musl' && echo '--enable-optimizations') \
--enable-option-checking=fatal \
--enable-shared \
--with-lto \
diff --git a/python_3.11-alpine/Dockerfile b/python_3.11-alpine/Dockerfile
index 287a21d..fc7db0f 100644
--- a/python_3.11-alpine/Dockerfile
+++ b/python_3.11-alpine/Dockerfile
@@ -73,7 +73,7 @@ RUN set -eux; \
./configure \
--build="$gnuArch" \
--enable-loadable-sqlite-extensions \
- --enable-optimizations \
+ $(test "$gnuArch" != 'riscv64-linux-musl' && echo '--enable-optimizations') \
--enable-option-checking=fatal \
--enable-shared \
--with-lto \
diff --git a/python_3.11-alpine3.19/Dockerfile b/python_3.11-alpine3.19/Dockerfile
index 56c4811..38eea9f 100644
--- a/python_3.11-alpine3.19/Dockerfile
+++ b/python_3.11-alpine3.19/Dockerfile
@@ -73,7 +73,7 @@ RUN set -eux; \
./configure \
--build="$gnuArch" \
--enable-loadable-sqlite-extensions \
- --enable-optimizations \
+ $(test "$gnuArch" != 'riscv64-linux-musl' && echo '--enable-optimizations') \
--enable-option-checking=fatal \
--enable-shared \
--with-lto \
diff --git a/python_3.13-rc-alpine/Dockerfile b/python_3.13-rc-alpine/Dockerfile
index 8a6dfd4..dcb7d8b 100644
--- a/python_3.13-rc-alpine/Dockerfile
+++ b/python_3.13-rc-alpine/Dockerfile
@@ -68,7 +68,7 @@ RUN set -eux; \
./configure \
--build="$gnuArch" \
--enable-loadable-sqlite-extensions \
- --enable-optimizations \
+ $(test "$gnuArch" != 'riscv64-linux-musl' && echo '--enable-optimizations') \
--enable-option-checking=fatal \
--enable-shared \
--with-lto \
diff --git a/python_3.13-rc-alpine3.19/Dockerfile b/python_3.13-rc-alpine3.19/Dockerfile
index b123742..183b02b 100644
--- a/python_3.13-rc-alpine3.19/Dockerfile
+++ b/python_3.13-rc-alpine3.19/Dockerfile
@@ -68,7 +68,7 @@ RUN set -eux; \
./configure \
--build="$gnuArch" \
--enable-loadable-sqlite-extensions \
- --enable-optimizations \
+ $(test "$gnuArch" != 'riscv64-linux-musl' && echo '--enable-optimizations') \
--enable-option-checking=fatal \
--enable-shared \
--with-lto \
diff --git a/python_alpine/Dockerfile b/python_alpine/Dockerfile
index 0abbbec..a9d082f 100644
--- a/python_alpine/Dockerfile
+++ b/python_alpine/Dockerfile
@@ -73,7 +73,7 @@ RUN set -eux; \
./configure \
--build="$gnuArch" \
--enable-loadable-sqlite-extensions \
- --enable-optimizations \
+ $(test "$gnuArch" != 'riscv64-linux-musl' && echo '--enable-optimizations') \
--enable-option-checking=fatal \
--enable-shared \
--with-lto \
diff --git a/python_alpine3.19/Dockerfile b/python_alpine3.19/Dockerfile
index bf46329..0d81e75 100644
--- a/python_alpine3.19/Dockerfile
+++ b/python_alpine3.19/Dockerfile
@@ -73,7 +73,7 @@ RUN set -eux; \
./configure \
--build="$gnuArch" \
--enable-loadable-sqlite-extensions \
- --enable-optimizations \
+ $(test "$gnuArch" != 'riscv64-linux-musl' && echo '--enable-optimizations') \
--enable-option-checking=fatal \
--enable-shared \
--with-lto \Relevant Maintainers: |
yosifkit
approved these changes
Jun 14, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes: