Skip to content

Commit a2d4d8e

Browse files
mkoeppemkoeppe
committed
tox.ini, .github/workflows, .devcontainer: Add fedora-41
1 parent aba18a9 commit a2d4d8e

File tree

7 files changed

+121
-2
lines changed

7 files changed

+121
-2
lines changed

‎.devcontainer/portability-fedora-41-minimal/devcontainer.json

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// The command "tox -e update_docker_platforms"
2+
// creates .devcontainer/portability-*-*/devcontainer.json
3+
// from .devcontainer/portability-devcontainer.json.in
4+
// See https://aka.ms/devcontainer.json for format details.
5+
{
6+
"name": "fedora-41-minimal (≥ 8-core)",
7+
"build": {
8+
"dockerfile": "portability-Dockerfile",
9+
// See tox.ini for definitions
10+
"args": {
11+
"SYSTEM_FACTOR": "fedora-41",
12+
"PACKAGE_FACTOR": "minimal",
13+
"DOCKER_TARGET": "with-targets",
14+
"DOCKER_TAG": "dev"
15+
}
16+
},
17+
"containerEnv": {
18+
"MAKE": "make -j4"
19+
},
20+
"onCreateCommand": ".devcontainer/onCreate.sh",
21+
"updateContentCommand": ".devcontainer/portability-updateContent.sh",
22+
"extensions": [
23+
"ms-python.python"
24+
]
25+
}

‎.devcontainer/portability-fedora-41-minimal/portability-Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../portability-Dockerfile

‎.devcontainer/portability-fedora-41-standard/devcontainer.json

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// The command "tox -e update_docker_platforms"
2+
// creates .devcontainer/portability-*-*/devcontainer.json
3+
// from .devcontainer/portability-devcontainer.json.in
4+
// See https://aka.ms/devcontainer.json for format details.
5+
{
6+
"name": "fedora-41-standard (≥ 8-core)",
7+
"build": {
8+
"dockerfile": "portability-Dockerfile",
9+
// See tox.ini for definitions
10+
"args": {
11+
"SYSTEM_FACTOR": "fedora-41",
12+
"PACKAGE_FACTOR": "standard",
13+
"DOCKER_TARGET": "with-targets",
14+
"DOCKER_TAG": "dev"
15+
}
16+
},
17+
"containerEnv": {
18+
"MAKE": "make -j4"
19+
},
20+
"onCreateCommand": ".devcontainer/onCreate.sh",
21+
"updateContentCommand": ".devcontainer/portability-updateContent.sh",
22+
"extensions": [
23+
"ms-python.python"
24+
]
25+
}

‎.devcontainer/portability-fedora-41-standard/portability-Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../portability-Dockerfile

‎.github/workflows/docker.yml

+1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ on:
4747
"fedora-38",
4848
"fedora-39",
4949
"fedora-40",
50+
"fedora-41",
5051
"centos-stream-9",
5152
"centos-stream-9-python3.12",
5253
"almalinux-8-python3.9",

‎src/doc/en/developer/portability_platform_table.rst

+65
Original file line numberDiff line numberDiff line change
@@ -1564,6 +1564,60 @@
15641564
.. |codespace-fedora-40-maximal| image:: https://github.com/codespaces/badge.svg
15651565
:target: https://codespaces.new/sagemath/sage?devcontainer_path=.devcontainer%2Fportability-fedora-40-maximal%2Fdevcontainer.json
15661566

1567+
.. |image-fedora-41-minimal-with-system-packages| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-fedora-41-minimal-with-system-packages/size?tag=dev&label=with-system-packages&color=%23696969
1568+
:target: https://ghcr.io/sagemath/sage/sage-fedora-41-minimal-with-system-packages
1569+
1570+
.. |image-fedora-41-minimal-configured| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-fedora-41-minimal-configured/latest_tag?ignore=latest,dev,*-failed&label=configured&color=%23696969
1571+
:target: https://ghcr.io/sagemath/sage/sage-fedora-41-minimal-configured
1572+
1573+
.. |image-fedora-41-minimal-with-targets-pre| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-fedora-41-minimal-with-targets-pre/latest_tag?ignore=latest,dev,*-failed&label=with-targets-pre&color=%23677895
1574+
:target: https://ghcr.io/sagemath/sage/sage-fedora-41-minimal-with-targets-pre
1575+
1576+
.. |image-fedora-41-minimal-with-targets| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-fedora-41-minimal-with-targets/latest_tag?ignore=latest,dev,*-failed&label=with-targets&color=%236686c1
1577+
:target: https://ghcr.io/sagemath/sage/sage-fedora-41-minimal-with-targets
1578+
1579+
.. |image-fedora-41-minimal-with-targets-optional| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-fedora-41-minimal-with-targets-optional/latest_tag?ignore=latest,dev,*-failed&label=with-targets-optional&color=%236495ed
1580+
:target: https://ghcr.io/sagemath/sage/sage-fedora-41-minimal-with-targets-optional
1581+
1582+
.. |codespace-fedora-41-minimal| image:: https://github.com/codespaces/badge.svg
1583+
:target: https://codespaces.new/sagemath/sage?devcontainer_path=.devcontainer%2Fportability-fedora-41-minimal%2Fdevcontainer.json
1584+
1585+
.. |image-fedora-41-standard-with-system-packages| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-fedora-41-standard-with-system-packages/size?tag=dev&label=with-system-packages&color=%23696969
1586+
:target: https://ghcr.io/sagemath/sage/sage-fedora-41-standard-with-system-packages
1587+
1588+
.. |image-fedora-41-standard-configured| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-fedora-41-standard-configured/latest_tag?ignore=latest,dev,*-failed&label=configured&color=%23696969
1589+
:target: https://ghcr.io/sagemath/sage/sage-fedora-41-standard-configured
1590+
1591+
.. |image-fedora-41-standard-with-targets-pre| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-fedora-41-standard-with-targets-pre/latest_tag?ignore=latest,dev,*-failed&label=with-targets-pre&color=%235d8a4c
1592+
:target: https://ghcr.io/sagemath/sage/sage-fedora-41-standard-with-targets-pre
1593+
1594+
.. |image-fedora-41-standard-with-targets| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-fedora-41-standard-with-targets/latest_tag?ignore=latest,dev,*-failed&label=with-targets&color=%2350ab2e
1595+
:target: https://ghcr.io/sagemath/sage/sage-fedora-41-standard-with-targets
1596+
1597+
.. |image-fedora-41-standard-with-targets-optional| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-fedora-41-standard-with-targets-optional/latest_tag?ignore=latest,dev,*-failed&label=with-targets-optional&color=%2344cc11
1598+
:target: https://ghcr.io/sagemath/sage/sage-fedora-41-standard-with-targets-optional
1599+
1600+
.. |codespace-fedora-41-standard| image:: https://github.com/codespaces/badge.svg
1601+
:target: https://codespaces.new/sagemath/sage?devcontainer_path=.devcontainer%2Fportability-fedora-41-standard%2Fdevcontainer.json
1602+
1603+
.. |image-fedora-41-maximal-with-system-packages| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-fedora-41-maximal-with-system-packages/size?tag=dev&label=with-system-packages&color=%23696969
1604+
:target: https://ghcr.io/sagemath/sage/sage-fedora-41-maximal-with-system-packages
1605+
1606+
.. |image-fedora-41-maximal-configured| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-fedora-41-maximal-configured/latest_tag?ignore=latest,dev,*-failed&label=configured&color=%23696969
1607+
:target: https://ghcr.io/sagemath/sage/sage-fedora-41-maximal-configured
1608+
1609+
.. |image-fedora-41-maximal-with-targets-pre| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-fedora-41-maximal-with-targets-pre/latest_tag?ignore=latest,dev,*-failed&label=with-targets-pre&color=%238f6b8d
1610+
:target: https://ghcr.io/sagemath/sage/sage-fedora-41-maximal-with-targets-pre
1611+
1612+
.. |image-fedora-41-maximal-with-targets| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-fedora-41-maximal-with-targets/latest_tag?ignore=latest,dev,*-failed&label=with-targets&color=%23b46eb2
1613+
:target: https://ghcr.io/sagemath/sage/sage-fedora-41-maximal-with-targets
1614+
1615+
.. |image-fedora-41-maximal-with-targets-optional| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-fedora-41-maximal-with-targets-optional/latest_tag?ignore=latest,dev,*-failed&label=with-targets-optional&color=%23da70d6
1616+
:target: https://ghcr.io/sagemath/sage/sage-fedora-41-maximal-with-targets-optional
1617+
1618+
.. |codespace-fedora-41-maximal| image:: https://github.com/codespaces/badge.svg
1619+
:target: https://codespaces.new/sagemath/sage?devcontainer_path=.devcontainer%2Fportability-fedora-41-maximal%2Fdevcontainer.json
1620+
15671621
.. |image-centos-stream-9-minimal-with-system-packages| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-centos-stream-9-minimal-with-system-packages/size?tag=dev&label=with-system-packages&color=%23696969
15681622
:target: https://ghcr.io/sagemath/sage/sage-centos-stream-9-minimal-with-system-packages
15691623

@@ -2647,6 +2701,17 @@
26472701
* -    ‑*maximal*
26482702
- |image-fedora-40-maximal-with-system-packages| |image-fedora-40-maximal-with-targets-pre|
26492703
-
2704+
* - **fedora**-41
2705+
2706+
   ‑*minimal*
2707+
- |image-fedora-41-minimal-with-system-packages| |image-fedora-41-minimal-with-targets-pre| |image-fedora-41-minimal-with-targets| |image-fedora-41-minimal-with-targets-optional|
2708+
- |codespace-fedora-41-minimal|
2709+
* -    ‑*standard*
2710+
- |image-fedora-41-standard-with-system-packages| |image-fedora-41-standard-with-targets-pre| |image-fedora-41-standard-with-targets| |image-fedora-41-standard-with-targets-optional|
2711+
- |codespace-fedora-41-standard|
2712+
* -    ‑*maximal*
2713+
- |image-fedora-41-maximal-with-system-packages| |image-fedora-41-maximal-with-targets-pre|
2714+
-
26502715
* - **centos**-stream-9
26512716

26522717
   ‑*minimal*

‎tox.ini

+3-2
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ setenv =
280280
linuxmint-21.3: BASE_IMAGE=linuxmintd/mint21.3
281281
#
282282
# https://hub.docker.com/_/fedora
283-
# as of 2024-01, latest=39, rawhide=40
283+
# as of 2024-08, latest=40, rawhide=41
284284
fedora: SYSTEM=fedora
285285
fedora: BASE_IMAGE=fedora
286286
fedora: IGNORE_MISSING_SYSTEM_PACKAGES=yes
@@ -299,6 +299,7 @@ setenv =
299299
fedora-38: BASE_TAG=38
300300
fedora-39: BASE_TAG=39
301301
fedora-40: BASE_TAG=40
302+
fedora-41: BASE_TAG=41
302303
#
303304
# https://hub.docker.com/r/scientificlinux/sl
304305
#
@@ -855,7 +856,7 @@ setenv =
855856
ubuntu-{xenial-toolchain-gcc_9,bionic-gcc_8,focal,jammy,lunar,mantic,noble} \
856857
debian-{bullseye,bookworm,trixie,sid} \
857858
linuxmint-{20.1,20.2,20.3,21,21.1,21.2,21.3} \
858-
fedora-{30,31,32,33,34,35,36,37,38,39,40} \
859+
fedora-{30,31,32,33,34,35,36,37,38,39,40,41} \
859860
centos-stream-{9,9-python3.12} \
860861
almalinux-{8-python3.9,9-python3.11} \
861862
gentoo-python{3.10,3.11,3.12} \

0 commit comments

Comments
 (0)