From fe7cbf4b5b8eba9d4fec4a9f785d563685ffe197 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 9 Jun 2024 13:05:29 -0700 Subject: [PATCH] tox.ini, .github/workflows, .devcontainer: Remove centos-stream-8 (EOL) --- .../devcontainer.json | 25 ------- .../portability-Dockerfile | 1 - .../devcontainer.json | 25 ------- .../portability-Dockerfile | 1 - .github/workflows/ci-linux.yml | 1 - .github/workflows/docker.yml | 1 - .../developer/portability_platform_table.rst | 65 ------------------- tox.ini | 2 +- 8 files changed, 1 insertion(+), 120 deletions(-) delete mode 100644 .devcontainer/portability-centos-stream-8-python3.9-minimal/devcontainer.json delete mode 120000 .devcontainer/portability-centos-stream-8-python3.9-minimal/portability-Dockerfile delete mode 100644 .devcontainer/portability-centos-stream-8-python3.9-standard/devcontainer.json delete mode 120000 .devcontainer/portability-centos-stream-8-python3.9-standard/portability-Dockerfile diff --git a/.devcontainer/portability-centos-stream-8-python3.9-minimal/devcontainer.json b/.devcontainer/portability-centos-stream-8-python3.9-minimal/devcontainer.json deleted file mode 100644 index 5fa562346cb..00000000000 --- a/.devcontainer/portability-centos-stream-8-python3.9-minimal/devcontainer.json +++ /dev/null @@ -1,25 +0,0 @@ -// The command "tox -e update_docker_platforms" -// creates .devcontainer/portability-*-*/devcontainer.json -// from .devcontainer/portability-devcontainer.json.in -// See https://aka.ms/devcontainer.json for format details. -{ - "name": "centos-stream-8-python3.9-minimal (≥ 8-core)", - "build": { - "dockerfile": "portability-Dockerfile", - // See tox.ini for definitions - "args": { - "SYSTEM_FACTOR": "centos-stream-8-python3.9", - "PACKAGE_FACTOR": "minimal", - "DOCKER_TARGET": "with-targets", - "DOCKER_TAG": "dev" - } - }, - "containerEnv": { - "MAKE": "make -j4" - }, - "onCreateCommand": ".devcontainer/onCreate.sh", - "updateContentCommand": ".devcontainer/portability-updateContent.sh", - "extensions": [ - "ms-python.python" - ] -} diff --git a/.devcontainer/portability-centos-stream-8-python3.9-minimal/portability-Dockerfile b/.devcontainer/portability-centos-stream-8-python3.9-minimal/portability-Dockerfile deleted file mode 120000 index 692e2a79d64..00000000000 --- a/.devcontainer/portability-centos-stream-8-python3.9-minimal/portability-Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../portability-Dockerfile \ No newline at end of file diff --git a/.devcontainer/portability-centos-stream-8-python3.9-standard/devcontainer.json b/.devcontainer/portability-centos-stream-8-python3.9-standard/devcontainer.json deleted file mode 100644 index 0c76ce86244..00000000000 --- a/.devcontainer/portability-centos-stream-8-python3.9-standard/devcontainer.json +++ /dev/null @@ -1,25 +0,0 @@ -// The command "tox -e update_docker_platforms" -// creates .devcontainer/portability-*-*/devcontainer.json -// from .devcontainer/portability-devcontainer.json.in -// See https://aka.ms/devcontainer.json for format details. -{ - "name": "centos-stream-8-python3.9-standard (≥ 8-core)", - "build": { - "dockerfile": "portability-Dockerfile", - // See tox.ini for definitions - "args": { - "SYSTEM_FACTOR": "centos-stream-8-python3.9", - "PACKAGE_FACTOR": "standard", - "DOCKER_TARGET": "with-targets", - "DOCKER_TAG": "dev" - } - }, - "containerEnv": { - "MAKE": "make -j4" - }, - "onCreateCommand": ".devcontainer/onCreate.sh", - "updateContentCommand": ".devcontainer/portability-updateContent.sh", - "extensions": [ - "ms-python.python" - ] -} diff --git a/.devcontainer/portability-centos-stream-8-python3.9-standard/portability-Dockerfile b/.devcontainer/portability-centos-stream-8-python3.9-standard/portability-Dockerfile deleted file mode 120000 index 692e2a79d64..00000000000 --- a/.devcontainer/portability-centos-stream-8-python3.9-standard/portability-Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../portability-Dockerfile \ No newline at end of file diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml index 6860bd6e460..0ce9a1f142b 100644 --- a/.github/workflows/ci-linux.yml +++ b/.github/workflows/ci-linux.yml @@ -118,7 +118,6 @@ jobs: "linuxmint-21.2", "fedora-38", "fedora-39", - "centos-stream-8-python3.9", "centos-stream-9-python3.9", "almalinux-8-python3.9", "gentoo-python3.10", diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 544971c5cd5..ebde1bfde8e 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -48,7 +48,6 @@ on: "fedora-39", "fedora-40", "centos-7-devtoolset-gcc_11", - "centos-stream-8-python3.9", "centos-stream-9-python3.9", "almalinux-8-python3.9", "almalinux-9-python3.11", diff --git a/src/doc/en/developer/portability_platform_table.rst b/src/doc/en/developer/portability_platform_table.rst index 6b8c0724001..67ebb9f7c0b 100644 --- a/src/doc/en/developer/portability_platform_table.rst +++ b/src/doc/en/developer/portability_platform_table.rst @@ -1618,60 +1618,6 @@ .. |codespace-centos-7-devtoolset-gcc_11-maximal| image:: https://github.com/codespaces/badge.svg :target: https://codespaces.new/sagemath/sage?devcontainer_path=.devcontainer%2Fportability-centos-7-devtoolset-gcc_11-maximal%2Fdevcontainer.json -.. |image-centos-stream-8-python3.9-minimal-with-system-packages| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-centos-stream-8-python3.9-minimal-with-system-packages/size?tag=dev&label=with-system-packages&color=%23696969 - :target: https://ghcr.io/sagemath/sage/sage-centos-stream-8-python3.9-minimal-with-system-packages - -.. |image-centos-stream-8-python3.9-minimal-configured| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-centos-stream-8-python3.9-minimal-configured/latest_tag?ignore=latest,dev,*-failed&label=configured&color=%23696969 - :target: https://ghcr.io/sagemath/sage/sage-centos-stream-8-python3.9-minimal-configured - -.. |image-centos-stream-8-python3.9-minimal-with-targets-pre| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-centos-stream-8-python3.9-minimal-with-targets-pre/latest_tag?ignore=latest,dev,*-failed&label=with-targets-pre&color=%23677895 - :target: https://ghcr.io/sagemath/sage/sage-centos-stream-8-python3.9-minimal-with-targets-pre - -.. |image-centos-stream-8-python3.9-minimal-with-targets| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-centos-stream-8-python3.9-minimal-with-targets/latest_tag?ignore=latest,dev,*-failed&label=with-targets&color=%236686c1 - :target: https://ghcr.io/sagemath/sage/sage-centos-stream-8-python3.9-minimal-with-targets - -.. |image-centos-stream-8-python3.9-minimal-with-targets-optional| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-centos-stream-8-python3.9-minimal-with-targets-optional/latest_tag?ignore=latest,dev,*-failed&label=with-targets-optional&color=%236495ed - :target: https://ghcr.io/sagemath/sage/sage-centos-stream-8-python3.9-minimal-with-targets-optional - -.. |codespace-centos-stream-8-python3.9-minimal| image:: https://github.com/codespaces/badge.svg - :target: https://codespaces.new/sagemath/sage?devcontainer_path=.devcontainer%2Fportability-centos-stream-8-python3.9-minimal%2Fdevcontainer.json - -.. |image-centos-stream-8-python3.9-standard-with-system-packages| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-centos-stream-8-python3.9-standard-with-system-packages/size?tag=dev&label=with-system-packages&color=%23696969 - :target: https://ghcr.io/sagemath/sage/sage-centos-stream-8-python3.9-standard-with-system-packages - -.. |image-centos-stream-8-python3.9-standard-configured| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-centos-stream-8-python3.9-standard-configured/latest_tag?ignore=latest,dev,*-failed&label=configured&color=%23696969 - :target: https://ghcr.io/sagemath/sage/sage-centos-stream-8-python3.9-standard-configured - -.. |image-centos-stream-8-python3.9-standard-with-targets-pre| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-centos-stream-8-python3.9-standard-with-targets-pre/latest_tag?ignore=latest,dev,*-failed&label=with-targets-pre&color=%235d8a4c - :target: https://ghcr.io/sagemath/sage/sage-centos-stream-8-python3.9-standard-with-targets-pre - -.. |image-centos-stream-8-python3.9-standard-with-targets| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-centos-stream-8-python3.9-standard-with-targets/latest_tag?ignore=latest,dev,*-failed&label=with-targets&color=%2350ab2e - :target: https://ghcr.io/sagemath/sage/sage-centos-stream-8-python3.9-standard-with-targets - -.. |image-centos-stream-8-python3.9-standard-with-targets-optional| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-centos-stream-8-python3.9-standard-with-targets-optional/latest_tag?ignore=latest,dev,*-failed&label=with-targets-optional&color=%2344cc11 - :target: https://ghcr.io/sagemath/sage/sage-centos-stream-8-python3.9-standard-with-targets-optional - -.. |codespace-centos-stream-8-python3.9-standard| image:: https://github.com/codespaces/badge.svg - :target: https://codespaces.new/sagemath/sage?devcontainer_path=.devcontainer%2Fportability-centos-stream-8-python3.9-standard%2Fdevcontainer.json - -.. |image-centos-stream-8-python3.9-maximal-with-system-packages| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-centos-stream-8-python3.9-maximal-with-system-packages/size?tag=dev&label=with-system-packages&color=%23696969 - :target: https://ghcr.io/sagemath/sage/sage-centos-stream-8-python3.9-maximal-with-system-packages - -.. |image-centos-stream-8-python3.9-maximal-configured| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-centos-stream-8-python3.9-maximal-configured/latest_tag?ignore=latest,dev,*-failed&label=configured&color=%23696969 - :target: https://ghcr.io/sagemath/sage/sage-centos-stream-8-python3.9-maximal-configured - -.. |image-centos-stream-8-python3.9-maximal-with-targets-pre| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-centos-stream-8-python3.9-maximal-with-targets-pre/latest_tag?ignore=latest,dev,*-failed&label=with-targets-pre&color=%238f6b8d - :target: https://ghcr.io/sagemath/sage/sage-centos-stream-8-python3.9-maximal-with-targets-pre - -.. |image-centos-stream-8-python3.9-maximal-with-targets| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-centos-stream-8-python3.9-maximal-with-targets/latest_tag?ignore=latest,dev,*-failed&label=with-targets&color=%23b46eb2 - :target: https://ghcr.io/sagemath/sage/sage-centos-stream-8-python3.9-maximal-with-targets - -.. |image-centos-stream-8-python3.9-maximal-with-targets-optional| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-centos-stream-8-python3.9-maximal-with-targets-optional/latest_tag?ignore=latest,dev,*-failed&label=with-targets-optional&color=%23da70d6 - :target: https://ghcr.io/sagemath/sage/sage-centos-stream-8-python3.9-maximal-with-targets-optional - -.. |codespace-centos-stream-8-python3.9-maximal| image:: https://github.com/codespaces/badge.svg - :target: https://codespaces.new/sagemath/sage?devcontainer_path=.devcontainer%2Fportability-centos-stream-8-python3.9-maximal%2Fdevcontainer.json - .. |image-centos-stream-9-python3.9-minimal-with-system-packages| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-centos-stream-9-python3.9-minimal-with-system-packages/size?tag=dev&label=with-system-packages&color=%23696969 :target: https://ghcr.io/sagemath/sage/sage-centos-stream-9-python3.9-minimal-with-system-packages @@ -2712,17 +2658,6 @@ * -    ‑*maximal* - |image-centos-7-devtoolset-gcc_11-maximal-with-system-packages| |image-centos-7-devtoolset-gcc_11-maximal-with-targets-pre| - - * - **centos**-stream-8-python3.9 - -    ‑*minimal* - - |image-centos-stream-8-python3.9-minimal-with-system-packages| |image-centos-stream-8-python3.9-minimal-with-targets-pre| |image-centos-stream-8-python3.9-minimal-with-targets| |image-centos-stream-8-python3.9-minimal-with-targets-optional| - - |codespace-centos-stream-8-python3.9-minimal| - * -    ‑*standard* - - |image-centos-stream-8-python3.9-standard-with-system-packages| |image-centos-stream-8-python3.9-standard-with-targets-pre| |image-centos-stream-8-python3.9-standard-with-targets| |image-centos-stream-8-python3.9-standard-with-targets-optional| - - |codespace-centos-stream-8-python3.9-standard| - * -    ‑*maximal* - - |image-centos-stream-8-python3.9-maximal-with-system-packages| |image-centos-stream-8-python3.9-maximal-with-targets-pre| - - * - **centos**-stream-9-python3.9    ‑*minimal* diff --git a/tox.ini b/tox.ini index ad1dc38d11b..798f2286d14 100644 --- a/tox.ini +++ b/tox.ini @@ -864,7 +864,7 @@ setenv = linuxmint-{20.1,20.2,20.3,21,21.1,21.2,21.3} \ fedora-{30,31,32,33,34,35,36,37,38,39,40} \ centos-7-devtoolset-gcc_11 \ - centos-stream-{8,9}-python3.9 \ + centos-stream-9-python3.9 \ almalinux-{8-python3.9,9-python3.11} \ gentoo-python{3.10,3.11,3.12} \ archlinux-latest \