Skip to content

Commit

Permalink
sagemathgh-36534: CI Linux: Fix centos-7 after sagemath#36435, remo…
Browse files Browse the repository at this point in the history
…ve `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
  • Loading branch information
Release Manager committed Nov 6, 2023
2 parents ebef87a + 1d2231b commit 999c295
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 2 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,13 @@ on:
"almalinux-9-python3.11",
"gentoo-python3.10",
"gentoo-python3.11",
"gentoo-python3.12",
"archlinux-latest",
"opensuse-15.3-gcc_11-python3.9",
"opensuse-15.4-gcc_11-python3.10",
"opensuse-15.5-gcc_11-python3.11",
"opensuse-tumbleweed-python3.10",
"opensuse-tumbleweed",
"conda-forge",
"conda-forge-python3.11",
"ubuntu-bionic-gcc_8-i386",
"debian-bullseye-i386",
]
Expand Down
1 change: 1 addition & 0 deletions build/pkgs/_python3.10/distros/conda.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python==3.10
1 change: 1 addition & 0 deletions build/pkgs/_python3.11/distros/conda.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python==3.11
1 change: 1 addition & 0 deletions build/pkgs/_python3.12/distros/conda.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python==3.12
1 change: 1 addition & 0 deletions build/pkgs/_python3.9/distros/conda.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python==3.9
1 change: 1 addition & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,7 @@ setenv =
centos: BASE_IMAGE=centos
centos: IGNORE_MISSING_SYSTEM_PACKAGES=yes
centos-7: BASE_TAG=centos7
centos-7: BOOTSTRAP=sed -i.bak s/https/http/ .upstream.d/*mirror_list; ./bootstrap
centos-stream: BASE_IMAGE=quay.io/centos/centos
centos-stream: BASE_TAG=stream
centos-stream-8: BASE_TAG=stream8
Expand Down

0 comments on commit 999c295

Please sign in to comment.