From 0d47115ef51b312b8dbdda9d1df657b838580ade Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 24 Oct 2023 20:52:40 -0700 Subject: [PATCH 1/5] tox.ini (centos-7): Download mirror_list using http, not https --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 6293831c44f..ad3d833eeef 100644 --- a/tox.ini +++ b/tox.ini @@ -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 From 5f29842a5a57fafb3338277683518dc31a95e03c Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 24 Oct 2023 20:53:12 -0700 Subject: [PATCH 2/5] .github/workflows/docker.yml: Remove gentoo-python3.12 for now --- .github/workflows/docker.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index c12ec820f83..a3986899a7d 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -51,7 +51,6 @@ 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", From fc7427d67be7efae323852ef49bcb9a525d53966 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 24 Oct 2023 21:04:15 -0700 Subject: [PATCH 3/5] tox.ini (centos-7): Download mirror_list using http, not https (fixup) --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index ad3d833eeef..c039103f422 100644 --- a/tox.ini +++ b/tox.ini @@ -308,7 +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-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 From d862f7c71f68edf5b176ada4211e0a67a5731837 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Wed, 1 Nov 2023 22:53:39 -0700 Subject: [PATCH 4/5] build/pkgs/_python3.*/distros/conda.txt: New --- build/pkgs/_python3.10/distros/conda.txt | 1 + build/pkgs/_python3.11/distros/conda.txt | 1 + build/pkgs/_python3.12/distros/conda.txt | 1 + build/pkgs/_python3.9/distros/conda.txt | 1 + 4 files changed, 4 insertions(+) create mode 100644 build/pkgs/_python3.10/distros/conda.txt create mode 100644 build/pkgs/_python3.11/distros/conda.txt create mode 100644 build/pkgs/_python3.12/distros/conda.txt create mode 100644 build/pkgs/_python3.9/distros/conda.txt diff --git a/build/pkgs/_python3.10/distros/conda.txt b/build/pkgs/_python3.10/distros/conda.txt new file mode 100644 index 00000000000..0e2312f6abf --- /dev/null +++ b/build/pkgs/_python3.10/distros/conda.txt @@ -0,0 +1 @@ +python==3.10 diff --git a/build/pkgs/_python3.11/distros/conda.txt b/build/pkgs/_python3.11/distros/conda.txt new file mode 100644 index 00000000000..875818d94e8 --- /dev/null +++ b/build/pkgs/_python3.11/distros/conda.txt @@ -0,0 +1 @@ +python==3.11 diff --git a/build/pkgs/_python3.12/distros/conda.txt b/build/pkgs/_python3.12/distros/conda.txt new file mode 100644 index 00000000000..08c4473f336 --- /dev/null +++ b/build/pkgs/_python3.12/distros/conda.txt @@ -0,0 +1 @@ +python==3.12 diff --git a/build/pkgs/_python3.9/distros/conda.txt b/build/pkgs/_python3.9/distros/conda.txt new file mode 100644 index 00000000000..ca224649651 --- /dev/null +++ b/build/pkgs/_python3.9/distros/conda.txt @@ -0,0 +1 @@ +python==3.9 From 1d2231b9f77ce9bf09a5eddd6bc7c88756ef7678 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Wed, 1 Nov 2023 22:54:27 -0700 Subject: [PATCH 5/5] CI Linux: Switch conda-forge to conda-forge-python3.11 --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index a3986899a7d..4b579562876 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -57,7 +57,7 @@ on: "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", ]