Skip to content

Commit 31a1ae5

Browse files
author
Release Manager
committed
sagemathgh-36534: CI Linux: Fix `centos-7` after sagemath#36435, remove `gentoo-python3.12` for now, use `conda-forge` with `-python3.11` <!-- ^^^^^ Please provide a concise, informative and self-explanatory title. Don't put issue numbers in there, do this in the PR body below. For example, instead of "Fixes sagemath#1234" use "Introduce new method to calculate 1+1" --> <!-- Describe your changes here in detail --> As part of the changes in sagemath#36435, we switched from http to https for downloading mirror_list. This broke centos-7; here we fix it. gentoo-python3.12 was activated a little bit too early. We remove it to clean up the portability CI workflow. conda-forge defaults to 3.12 already, and we're not ready for it. <!-- Why is this change required? What problem does it solve? --> <!-- If this PR resolves an open issue, please link to it here. For example "Fixes sagemath#12345". --> <!-- If your change requires a documentation PR, please link it appropriately. --> ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> <!-- If your change requires a documentation PR, please link it appropriately --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> <!-- Feel free to remove irrelevant items. --> - [x] The title is concise, informative, and self-explanatory. - [ ] The description explains in detail what this PR is about. - [ ] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation accordingly. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on - sagemath#12345: short description why this is a dependency - sagemath#34567: ... --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> URL: sagemath#36534 Reported by: Matthias Köppe Reviewer(s): Kwankyu Lee
2 parents b7d3401 + 1d2231b commit 31a1ae5

File tree

6 files changed

+6
-2
lines changed

6 files changed

+6
-2
lines changed

.github/workflows/docker.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,13 @@ on:
5151
"almalinux-9-python3.11",
5252
"gentoo-python3.10",
5353
"gentoo-python3.11",
54-
"gentoo-python3.12",
5554
"archlinux-latest",
5655
"opensuse-15.3-gcc_11-python3.9",
5756
"opensuse-15.4-gcc_11-python3.10",
5857
"opensuse-15.5-gcc_11-python3.11",
5958
"opensuse-tumbleweed-python3.10",
6059
"opensuse-tumbleweed",
61-
"conda-forge",
60+
"conda-forge-python3.11",
6261
"ubuntu-bionic-gcc_8-i386",
6362
"debian-bullseye-i386",
6463
]
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
python==3.10
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
python==3.11
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
python==3.12
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
python==3.9

tox.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,7 @@ setenv =
308308
centos: BASE_IMAGE=centos
309309
centos: IGNORE_MISSING_SYSTEM_PACKAGES=yes
310310
centos-7: BASE_TAG=centos7
311+
centos-7: BOOTSTRAP=sed -i.bak s/https/http/ .upstream.d/*mirror_list; ./bootstrap
311312
centos-stream: BASE_IMAGE=quay.io/centos/centos
312313
centos-stream: BASE_TAG=stream
313314
centos-stream-8: BASE_TAG=stream8

0 commit comments

Comments
 (0)