Skip to content

Commit e731277

Browse files
frenzymadnessphracek
frenzymadness
authored and
phracek
committed
Remove support for Python 3.11 (EOL in May 2026)
1 parent 8c0a639 commit e731277

14 files changed

Lines changed: 14 additions & 377 deletions

File tree

‎.github/workflows/build-and-push.yml‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -30,30 +30,6 @@ jobs:
3030
tag: "c9s"
3131
image_name: "python-39-minimal-c9s"
3232

33-
- dockerfile: "3.11-minimal/Dockerfile.rhel8"
34-
docker_context: "3.11-minimal"
35-
registry_namespace: "sclorg"
36-
quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME"
37-
quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN"
38-
tag: "el8"
39-
image_name: "python-311-minimal-el8"
40-
41-
- dockerfile: "3.11-minimal/Dockerfile.c9s"
42-
docker_context: "3.11-minimal"
43-
registry_namespace: "sclorg"
44-
quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME"
45-
quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN"
46-
tag: "c9s"
47-
image_name: "python-311-minimal-c9s"
48-
49-
- dockerfile: "3.11/Dockerfile.c9s"
50-
docker_context: "3.11"
51-
registry_namespace: "sclorg"
52-
quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME"
53-
quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN"
54-
tag: "c9s"
55-
image_name: "python-311-c9s"
56-
5733
- dockerfile: "3.12-minimal/Dockerfile.rhel8"
5834
docker_context: "3.12-minimal"
5935
registry_namespace: "sclorg"

‎.github/workflows/container-tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ jobs:
1414
uses: "sclorg/ci-actions/.github/workflows/container-tests.yml@main"
1515
with:
1616
enabled-tests: '["container","container-pytest","openshift-pytest"]'
17-
versions: '[ "3.9", "3.9-minimal", "3.11", "3.11-minimal", "3.12", "3.12-minimal", "3.13", "3.13-minimal", "3.14", "3.14-minimal" ]'
18-
openshift-versions: '[ "3.8", "3.9", "3.11", "3.12", "3.12-minimal" ]'
17+
versions: '[ "3.9", "3.9-minimal", "3.12", "3.12-minimal", "3.13", "3.13-minimal", "3.14", "3.14-minimal" ]'
18+
openshift-versions: '[ "3.8", "3.9", "3.12", "3.12-minimal" ]'
1919
secrets: inherit

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Variables are documented in common/build.sh.
22
BASE_IMAGE_NAME = python
3-
VERSIONS = 3.6 3.9 3.9-minimal 3.11 3.11-minimal 3.12 3.12-minimal 3.13 3.13-minimal 3.14 3.14-minimal
3+
VERSIONS = 3.6 3.9 3.9-minimal 3.12 3.12-minimal 3.13 3.13-minimal 3.14 3.14-minimal
44
OPENSHIFT_NAMESPACES =
55
DOCKER_BUILD_CONTEXT = ..
66

‎README.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ Table start
4646
|3.6||||<details><summary>✓</summary>`registry.redhat.io/rhel8/python-36`</details>|||
4747
|3.9|<details><summary>✓</summary>`quay.io/sclorg/python-39-c9s`</details>||||<details><summary>✓</summary>`registry.redhat.io/rhel9/python-39`</details>||
4848
|3.9-minimal|<details><summary>✓</summary>`quay.io/sclorg/python-39-minimal-c9s`</details>||||||
49-
|3.11|<details><summary>✓</summary>`quay.io/sclorg/python-311-c9s`</details>|||<details><summary>✓</summary>`registry.redhat.io/rhel8/python-311`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel9/python-311`</details>||
50-
|3.11-minimal|<details><summary>✓</summary>`quay.io/sclorg/python-311-minimal-c9s`</details>|||<details><summary>✓</summary>`registry.redhat.io/rhel8/python-311-minimal`</details>|||
5149
|3.12|<details><summary>✓</summary>`quay.io/sclorg/python-312-c9s`</details>|<details><summary>✓</summary>`quay.io/sclorg/python-312-c10s`</details>||<details><summary>✓</summary>`registry.redhat.io/rhel8/python-312`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel9/python-312`</details>||
5250
|3.12-minimal|<details><summary>✓</summary>`quay.io/sclorg/python-312-minimal-c9s`</details>|<details><summary>✓</summary>`quay.io/sclorg/python-312-minimal-c10s`</details>||<details><summary>✓</summary>`registry.redhat.io/rhel8/python-312-minimal`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel9/python-312-minimal`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel10/python-312-minimal`</details>|
5351
|3.13||<details><summary>✓</summary>`quay.io/sclorg/python-313-c10s`</details>|<details><summary>✓</summary>`quay.io/fedora/python-313`</details>||||

‎imagestreams/imagestreams.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
latest: "3.12-ubi9"
1414
distros:
1515
- name: UBI 8
16-
app_versions: ["3.6", "3.9", "3.11", "3.12"]
16+
app_versions: ["3.6", "3.9"]
1717

1818
- name: UBI 9
19-
app_versions: ["3.9", "3.11", "3.12", "3.12-minimal"]
19+
app_versions: ["3.9", "3.12-minimal"]
2020

2121
- name: UBI 10
2222
app_versions: ["3.12-minimal"]
@@ -25,10 +25,10 @@
2525
latest: "3.12-ubi8"
2626
distros:
2727
- name: UBI 8
28-
app_versions: ["3.6", "3.9", "3.11", "3.12"]
28+
app_versions: ["3.6", "3.9"]
2929

3030
- name: UBI 9
31-
app_versions: ["3.9", "3.11", "3.12", "3.12-minimal"]
31+
app_versions: ["3.9", "3.12-minimal"]
3232

3333
- name: UBI 10
3434
app_versions: ["3.12-minimal"]
@@ -37,10 +37,10 @@
3737
latest: "3.12-ubi8"
3838
distros:
3939
- name: UBI 8
40-
app_versions: ["3.6", "3.9", "3.11", "3.12"]
40+
app_versions: ["3.6", "3.9"]
4141

4242
- name: UBI 9
43-
app_versions: ["3.9", "3.11", "3.12", "3.12-minimal"]
43+
app_versions: ["3.9", "3.12-minimal"]
4444

4545
- name: UBI 10
4646
app_versions: ["3.12-minimal"]

‎imagestreams/python-centos.json‎

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -47,44 +47,6 @@
4747
"type": "Local"
4848
}
4949
},
50-
{
51-
"name": "3.11-ubi8",
52-
"annotations": {
53-
"openshift.io/display-name": "Python 3.11 (UBI 8)",
54-
"openshift.io/provider-display-name": "Red Hat, Inc.",
55-
"description": "Build and run Python 3.11 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-python-container/blob/master/3.11/README.md.",
56-
"iconClass": "icon-python",
57-
"tags": "builder,python",
58-
"version": "3.11",
59-
"sampleRepo": "https://github.com/sclorg/django-ex.git"
60-
},
61-
"from": {
62-
"kind": "DockerImage",
63-
"name": "registry.access.redhat.com/ubi8/python-311:latest"
64-
},
65-
"referencePolicy": {
66-
"type": "Local"
67-
}
68-
},
69-
{
70-
"name": "3.12-ubi8",
71-
"annotations": {
72-
"openshift.io/display-name": "Python 3.12 (UBI 8)",
73-
"openshift.io/provider-display-name": "Red Hat, Inc.",
74-
"description": "Build and run Python 3.12 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-python-container/blob/master/3.12/README.md.",
75-
"iconClass": "icon-python",
76-
"tags": "builder,python",
77-
"version": "3.12",
78-
"sampleRepo": "https://github.com/sclorg/django-ex.git"
79-
},
80-
"from": {
81-
"kind": "DockerImage",
82-
"name": "registry.access.redhat.com/ubi8/python-312:latest"
83-
},
84-
"referencePolicy": {
85-
"type": "Local"
86-
}
87-
},
8850
{
8951
"name": "3.9-ubi9",
9052
"annotations": {
@@ -104,25 +66,6 @@
10466
"type": "Local"
10567
}
10668
},
107-
{
108-
"name": "3.11-ubi9",
109-
"annotations": {
110-
"openshift.io/display-name": "Python 3.11 (UBI 9)",
111-
"openshift.io/provider-display-name": "Red Hat, Inc.",
112-
"description": "Build and run Python 3.11 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-python-container/blob/master/3.11/README.md.",
113-
"iconClass": "icon-python",
114-
"tags": "builder,python",
115-
"version": "3.11",
116-
"sampleRepo": "https://github.com/sclorg/django-ex.git"
117-
},
118-
"from": {
119-
"kind": "DockerImage",
120-
"name": "registry.access.redhat.com/ubi9/python-311:latest"
121-
},
122-
"referencePolicy": {
123-
"type": "Local"
124-
}
125-
},
12669
{
12770
"name": "3.12-ubi9",
12871
"annotations": {

‎imagestreams/python-rhel-aarch64.json‎

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -47,44 +47,6 @@
4747
"type": "Local"
4848
}
4949
},
50-
{
51-
"name": "3.11-ubi8",
52-
"annotations": {
53-
"openshift.io/display-name": "Python 3.11 (UBI 8)",
54-
"openshift.io/provider-display-name": "Red Hat, Inc.",
55-
"description": "Build and run Python 3.11 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-python-container/blob/master/3.11/README.md.",
56-
"iconClass": "icon-python",
57-
"tags": "builder,python",
58-
"version": "3.11",
59-
"sampleRepo": "https://github.com/sclorg/django-ex.git"
60-
},
61-
"from": {
62-
"kind": "DockerImage",
63-
"name": "registry.redhat.io/ubi8/python-311:latest"
64-
},
65-
"referencePolicy": {
66-
"type": "Local"
67-
}
68-
},
69-
{
70-
"name": "3.12-ubi8",
71-
"annotations": {
72-
"openshift.io/display-name": "Python 3.12 (UBI 8)",
73-
"openshift.io/provider-display-name": "Red Hat, Inc.",
74-
"description": "Build and run Python 3.12 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-python-container/blob/master/3.12/README.md.",
75-
"iconClass": "icon-python",
76-
"tags": "builder,python",
77-
"version": "3.12",
78-
"sampleRepo": "https://github.com/sclorg/django-ex.git"
79-
},
80-
"from": {
81-
"kind": "DockerImage",
82-
"name": "registry.redhat.io/ubi8/python-312:latest"
83-
},
84-
"referencePolicy": {
85-
"type": "Local"
86-
}
87-
},
8850
{
8951
"name": "3.9-ubi9",
9052
"annotations": {
@@ -104,25 +66,6 @@
10466
"type": "Local"
10567
}
10668
},
107-
{
108-
"name": "3.11-ubi9",
109-
"annotations": {
110-
"openshift.io/display-name": "Python 3.11 (UBI 9)",
111-
"openshift.io/provider-display-name": "Red Hat, Inc.",
112-
"description": "Build and run Python 3.11 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-python-container/blob/master/3.11/README.md.",
113-
"iconClass": "icon-python",
114-
"tags": "builder,python",
115-
"version": "3.11",
116-
"sampleRepo": "https://github.com/sclorg/django-ex.git"
117-
},
118-
"from": {
119-
"kind": "DockerImage",
120-
"name": "registry.redhat.io/ubi9/python-311:latest"
121-
},
122-
"referencePolicy": {
123-
"type": "Local"
124-
}
125-
},
12669
{
12770
"name": "3.12-ubi9",
12871
"annotations": {

‎imagestreams/python-rhel.json‎

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -47,44 +47,6 @@
4747
"type": "Local"
4848
}
4949
},
50-
{
51-
"name": "3.11-ubi8",
52-
"annotations": {
53-
"openshift.io/display-name": "Python 3.11 (UBI 8)",
54-
"openshift.io/provider-display-name": "Red Hat, Inc.",
55-
"description": "Build and run Python 3.11 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-python-container/blob/master/3.11/README.md.",
56-
"iconClass": "icon-python",
57-
"tags": "builder,python",
58-
"version": "3.11",
59-
"sampleRepo": "https://github.com/sclorg/django-ex.git"
60-
},
61-
"from": {
62-
"kind": "DockerImage",
63-
"name": "registry.redhat.io/ubi8/python-311:latest"
64-
},
65-
"referencePolicy": {
66-
"type": "Local"
67-
}
68-
},
69-
{
70-
"name": "3.12-ubi8",
71-
"annotations": {
72-
"openshift.io/display-name": "Python 3.12 (UBI 8)",
73-
"openshift.io/provider-display-name": "Red Hat, Inc.",
74-
"description": "Build and run Python 3.12 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-python-container/blob/master/3.12/README.md.",
75-
"iconClass": "icon-python",
76-
"tags": "builder,python",
77-
"version": "3.12",
78-
"sampleRepo": "https://github.com/sclorg/django-ex.git"
79-
},
80-
"from": {
81-
"kind": "DockerImage",
82-
"name": "registry.redhat.io/ubi8/python-312:latest"
83-
},
84-
"referencePolicy": {
85-
"type": "Local"
86-
}
87-
},
8850
{
8951
"name": "3.9-ubi9",
9052
"annotations": {
@@ -104,25 +66,6 @@
10466
"type": "Local"
10567
}
10668
},
107-
{
108-
"name": "3.11-ubi9",
109-
"annotations": {
110-
"openshift.io/display-name": "Python 3.11 (UBI 9)",
111-
"openshift.io/provider-display-name": "Red Hat, Inc.",
112-
"description": "Build and run Python 3.11 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-python-container/blob/master/3.11/README.md.",
113-
"iconClass": "icon-python",
114-
"tags": "builder,python",
115-
"version": "3.11",
116-
"sampleRepo": "https://github.com/sclorg/django-ex.git"
117-
},
118-
"from": {
119-
"kind": "DockerImage",
120-
"name": "registry.redhat.io/ubi9/python-311:latest"
121-
},
122-
"referencePolicy": {
123-
"type": "Local"
124-
}
125-
},
12669
{
12770
"name": "3.12-ubi9",
12871
"annotations": {

‎specs/multispec.yml‎

Lines changed: 2 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,9 @@ specs:
2323
'{{ spec.pkg_prefix }}-setuptools', '{{ spec.pkg_prefix }}-pip']
2424
"default": ['{{ spec.pkg_prefix }}', '{{ spec.pkg_prefix }}-devel',
2525
'{{ spec.pkg_prefix }}-setuptools', '{{ spec.pkg_prefix }}-pip']
26-
"3.11": ['{{ spec.pkg_prefix }}', '{{ spec.pkg_prefix }}-devel',
27-
'{{ spec.pkg_prefix }}-setuptools', '{{ spec.pkg_prefix }}-pip']
2826
"3.12": ['{{ spec.pkg_prefix }}', '{{ spec.pkg_prefix }}-devel',
2927
'{{ spec.pkg_prefix }}-setuptools', '{{ spec.pkg_prefix }}-pip']
30-
ubi_versions: ['3.6', '3.9', '3.11', '3.12']
28+
ubi_versions: ['3.6', '3.9', '3.12']
3129

3230
rhel9:
3331
distros:
@@ -44,10 +42,9 @@ specs:
4442
'mod_auth_gssapi', 'mod_ldap', 'mod_session',
4543
'atlas-devel', 'gcc-gfortran', 'libffi-devel', 'libtool-ltdl', 'enchant',
4644
'krb5-devel']
47-
ubi_versions: ['3.9', '3.11', '3.12', '3.14']
45+
ubi_versions: ['3.9', '3.12', '3.14']
4846
extra_pkgs:
4947
"3.9": ['python3', 'python3-devel', 'python3-setuptools', 'python3-pip']
50-
"3.11": ['python3.11', 'python3.11-devel', 'python3.11-pip']
5148
"3.12": ['python3.12', 'python3.12-devel', 'python3.12-pip']
5249
"3.14": ['python3.14', 'python3.14-devel', 'python3.14-pip']
5350

@@ -88,7 +85,6 @@ specs:
8885
'krb5-devel']
8986
extra_pkgs:
9087
"3.9": ['python3', 'python3-devel', 'python3-setuptools', 'python3-pip']
91-
"3.11": ['python3.11', 'python3.11-devel', 'python3.11-pip']
9288
"3.12": ['python3.12', 'python3.12-devel', 'python3.12-pip']
9389
"3.14": ['python3.14', 'python3.14-devel', 'python3.14-pip']
9490

@@ -201,26 +197,6 @@ specs:
201197
pkg_prefix: "python3.12"
202198
main_image: "registry.access.redhat.com/ubi9/python-312"
203199

204-
"3.11":
205-
version: "3.11"
206-
short_ver: "311"
207-
minimal: false
208-
base_img_version: "1"
209-
# Python 3.11 doesn't come as a module
210-
module_stream: ""
211-
pkg_prefix: "python3.11"
212-
main_image: "registry.access.redhat.com/ubi9/python-311"
213-
214-
"3.11-minimal":
215-
version: "3.11"
216-
short_ver: "311"
217-
minimal: true
218-
base_img_version: "1"
219-
# Python 3.11 doesn't come as a module
220-
module_stream: ""
221-
pkg_prefix: "python3.11"
222-
main_image: "quay.io/sclorg/python-311-minimal-c9s"
223-
224200
"3.9":
225201
version: "3.9"
226202
short_ver: "39"
@@ -260,15 +236,6 @@ matrix:
260236
- distros:
261237
- centos-stream-9-x86_64
262238
version: "3.9-minimal"
263-
- distros:
264-
- centos-stream-9-x86_64
265-
- rhel-9-x86_64
266-
- rhel-8-x86_64
267-
version: "3.11"
268-
- distros:
269-
- centos-stream-9-x86_64
270-
- rhel-8-x86_64
271-
version: "3.11-minimal"
272239
- distros:
273240
- centos-stream-10-x86_64
274241
- centos-stream-9-x86_64

‎src/test/pin-pipenv-version-test-app/.s2i/environment‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ENABLE_PIPENV=1
2-
{% if spec.version in ["3.6", "3.8", "3.9", "3.10", "3.11"] %}
2+
{% if spec.version in ["3.6", "3.8", "3.9", "3.10"] %}
33
PIN_PIPENV_VERSION=2021.5.29
44
{% elif spec.version in ["3.12", "3.13"] %}
55
PIN_PIPENV_VERSION=2023.11.14

0 commit comments

Comments
 (0)