From 74af336f6c88f6b2e71ff62307e2cb0bb2402715 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 21 May 2023 10:27:12 -0700 Subject: [PATCH 1/7] tox.ini: In config factor -python3.x-minimal, include zlib in EXTRA_SAGE_PACKAGES --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 80b9c18cff5..cc9641a755d 100644 --- a/tox.ini +++ b/tox.ini @@ -522,7 +522,7 @@ setenv = CONFIG_CONFIGURE_ARGS_1=--with-system-python3=yes python3_spkg: CONFIG_CONFIGURE_ARGS_1=--without-system-python3 python3.8,python3.9,python3.10,python3.11,python3.12: CONFIG_CONFIGURE_ARGS_1=--with-system-python3=force --with-python=python{env:PYTHON_MAJOR}.{env:PYTHON_MINOR} - python3.8,python3.9,python3.10,python3.11,python3.12: EXTRA_SAGE_PACKAGES_5=_python{env:PYTHON_MAJOR}.{env:PYTHON_MINOR} _bootstrap liblzma bzip2 libffi libpng + python3.8,python3.9,python3.10,python3.11,python3.12: EXTRA_SAGE_PACKAGES_5=_python{env:PYTHON_MAJOR}.{env:PYTHON_MINOR} _bootstrap liblzma bzip2 libffi libpng zlib macos-python3_xcode: CONFIG_CONFIGURE_ARGS_1=--with-system-python3=force --with-python=/usr/bin/python3 macos-{python3_xcode,nohomebrew}-{python3.8}: CONFIG_CONFIGURE_ARGS_1=--with-system-python3=force --with-python=/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/{env:PYTHON_MAJOR}.{env:PYTHON_MINOR}/bin/python3 # Homebrew keg installs From 4943b7b9bd4bcb1c3a71e9d00f45407b2a9e6c66 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 21 May 2023 10:28:43 -0700 Subject: [PATCH 2/7] tox.ini: Add config factors -gcc_13, -gcc_14 --- tox.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tox.ini b/tox.ini index cc9641a755d..61717e777e7 100644 --- a/tox.ini +++ b/tox.ini @@ -547,6 +547,10 @@ setenv = gcc_11: EXTRA_SAGE_PACKAGES_2=_gcc11 gcc_12: CONFIG_CONFIGURE_ARGS_2=--with-system-gcc=force CC=gcc-12 CXX=g++-12 FC=gfortran-12 gcc_12: EXTRA_SAGE_PACKAGES_2=_gcc12 + gcc_13: CONFIG_CONFIGURE_ARGS_2=--with-system-gcc=force CC=gcc-13 CXX=g++-13 FC=gfortran-13 + gcc_13: EXTRA_SAGE_PACKAGES_2=_gcc13 + gcc_14: CONFIG_CONFIGURE_ARGS_2=--with-system-gcc=force CC=gcc-14 CXX=g++-14 FC=gfortran-14 + gcc_14: EXTRA_SAGE_PACKAGES_2=_gcc14 centos-7-devtoolset: CONFIG_CONFIGURE_ARGS_2=--with-system-gcc=force centos-7-devtoolset-gcc_9: DEVTOOLSET=9 centos-7-devtoolset-gcc_10: DEVTOOLSET=10 From 667248457ab63ad73790f6cb8c39e203618ebf07 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 21 May 2023 10:31:26 -0700 Subject: [PATCH 3/7] tox.ini: Add config factors -macos-12.3, -macos-13.3 --- tox.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tox.ini b/tox.ini index 61717e777e7..657d6ed6766 100644 --- a/tox.ini +++ b/tox.ini @@ -581,6 +581,10 @@ setenv = macos-11.3: MACOSX_DEPLOYMENT_TARGET=11.3 macos-12.1: MACOS_SDK=/Library/Developer/CommandLineTools/SDKs/MacOSX12.1.sdk macos-12.1: MACOSX_DEPLOYMENT_TARGET=12.1 + macos-12.3: MACOS_SDK=/Library/Developer/CommandLineTools/SDKs/MacOSX12.3.sdk + macos-12.3: MACOSX_DEPLOYMENT_TARGET=12.3 + macos-13.3: MACOS_SDK=/Library/Developer/CommandLineTools/SDKs/MacOSX13.3.sdk + macos-13.3: MACOSX_DEPLOYMENT_TARGET=13.3 # # Resulting full configuration args, including EXTRA_CONFIGURE_ARGS from the user environment # From b89d7d0bda8a4b6741f398ce60e447c13d339638 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 21 May 2023 10:43:36 -0700 Subject: [PATCH 4/7] tox.ini: Add ubuntu-mantic, linuxmint-21.2, fedora-39, slackware-15.0, opensuse-15.5 --- tox.ini | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index 657d6ed6766..fe8ae3efd1c 100644 --- a/tox.ini +++ b/tox.ini @@ -201,7 +201,7 @@ setenv = docker: BASE_TAG=latest # # https://hub.docker.com/_/ubuntu?tab=description - # as of 2023-01, latest=jammy=22.04, rolling=kinetic=22.10, devel=lunar=23.04 + # as of 2023-05, latest=jammy=22.04, rolling=lunar=23.04, devel=mantic=23.10 # ubuntu: SYSTEM=debian ubuntu: BASE_IMAGE=ubuntu @@ -222,6 +222,8 @@ setenv = ubuntu-kinetic: IGNORE_MISSING_SYSTEM_PACKAGES=yes ubuntu-lunar: BASE_TAG=lunar ubuntu-lunar: IGNORE_MISSING_SYSTEM_PACKAGES=yes + ubuntu-mantic: BASE_TAG=mantic + ubuntu-mantic: IGNORE_MISSING_SYSTEM_PACKAGES=yes # # https://hub.docker.com/_/debian # debian-bullseye does not have libgiac-dev @@ -254,9 +256,10 @@ setenv = linuxmint-20.3: BASE_IMAGE=linuxmintd/mint20.3 linuxmint-21: BASE_IMAGE=linuxmintd/mint21 linuxmint-21.1: BASE_IMAGE=linuxmintd/mint21.1 + linuxmint-21.2: BASE_IMAGE=linuxmintd/mint21.2 # # https://hub.docker.com/_/fedora - # as of 2023-01, latest=37, rawhide=38 + # as of 2023-05, latest=38, rawhide=39 fedora: SYSTEM=fedora fedora: BASE_IMAGE=fedora fedora-26: BASE_TAG=26 @@ -282,6 +285,8 @@ setenv = fedora-37: IGNORE_MISSING_SYSTEM_PACKAGES=yes fedora-38: BASE_TAG=38 fedora-38: IGNORE_MISSING_SYSTEM_PACKAGES=yes + fedora-39: BASE_TAG=39 + fedora-39: IGNORE_MISSING_SYSTEM_PACKAGES=yes # # https://hub.docker.com/r/scientificlinux/sl # @@ -323,6 +328,7 @@ setenv = slackware: SYSTEM=slackware slackware: BASE_IMAGE=vbatts/slackware slackware-14.2: BASE_TAG=14.2 + slackware-15.0: BASE_TAG=15.0 slackware-current: BASE_TAG=current slackware: IGNORE_MISSING_SYSTEM_PACKAGES=no # @@ -350,7 +356,7 @@ setenv = # # https://hub.docker.com/r/opensuse/leap # - OpenSUSE Leap 42 was superseded by the Leap 15 series. - # - As of 2022-07, latest = 15 = 15.4 + # - As of 2023-05, latest = 15 = 15.4 # https://hub.docker.com/r/opensuse/tumbleweed # - Rolling distribution # @@ -363,6 +369,7 @@ setenv = opensuse-15.2: BASE_TAG=15.2 opensuse-15.3: BASE_TAG=15.3 opensuse-15.4: BASE_TAG=15.4 + opensuse-15.5: BASE_TAG=15.5 opensuse-15: BASE_TAG=15 opensuse-tumbleweed: BASE_IMAGE=opensuse/tumbleweed opensuse-tumbleweed: IGNORE_MISSING_SYSTEM_PACKAGES=no From 5aa31016b248c469f1cad5e562594aa3f4795c28 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 21 May 2023 10:52:06 -0700 Subject: [PATCH 5/7] .github/workflows/docker.yml: Add ubuntu-mantic, linuxmint-21.2, fedora-39, opensuse-15.5-gcc_11-python3.10, debian-bullseye-i386; increase max_parallel to 30 --- .github/workflows/docker.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 04c74659c1d..af225b31aa0 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -23,6 +23,7 @@ on: "ubuntu-jammy", "ubuntu-kinetic", "ubuntu-lunar", + "ubuntu-mantic", "debian-buster", "debian-bullseye", "debian-bookworm", @@ -34,6 +35,7 @@ on: "linuxmint-20.3", "linuxmint-21", "linuxmint-21.1", + "linuxmint-21.2", "fedora-29-python3.8", "fedora-30-python3.8", "fedora-31", @@ -44,6 +46,7 @@ on: "fedora-36", "fedora-37", "fedora-38", + "fedora-39", "centos-7-devtoolset-gcc_11", "centos-stream-8-python3.9", "centos-stream-9-python3.9", @@ -53,10 +56,12 @@ on: "archlinux-latest", "opensuse-15.3-gcc_11-python3.9", "opensuse-15.4-gcc_11-python3.10", + "opensuse-15.5-gcc_11-python3.10", "opensuse-tumbleweed-python3.10", "conda-forge", "ubuntu-bionic-gcc_8-i386", "debian-buster-i386", + "debian-bullseye-i386", ] tox_packages_factors: description: 'Stringified JSON object listing tox packages factors' @@ -71,7 +76,7 @@ on: default: "" max_parallel: type: number - default: 24 + default: 30 free_disk_space: default: false type: boolean From 73f62a2fe6f643f1911c893d17ac7f9f33ad1cbd Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 21 May 2023 16:18:29 -0700 Subject: [PATCH 6/7] .github/workflows/docker.yml: Fix up opensuse-15.5 --- .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 af225b31aa0..c5c19f9097f 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -56,7 +56,7 @@ on: "archlinux-latest", "opensuse-15.3-gcc_11-python3.9", "opensuse-15.4-gcc_11-python3.10", - "opensuse-15.5-gcc_11-python3.10", + "opensuse-15.5-gcc_11-python3.11", "opensuse-tumbleweed-python3.10", "conda-forge", "ubuntu-bionic-gcc_8-i386", From 00e9d18d9a9727a6cc87ad1b1cef118b530a7ba2 Mon Sep 17 00:00:00 2001 From: Dima Pasechnik Date: Tue, 23 May 2023 13:25:18 +0100 Subject: [PATCH 7/7] correct lastest version in comment --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index fe8ae3efd1c..b125789ed78 100644 --- a/tox.ini +++ b/tox.ini @@ -356,7 +356,7 @@ setenv = # # https://hub.docker.com/r/opensuse/leap # - OpenSUSE Leap 42 was superseded by the Leap 15 series. - # - As of 2023-05, latest = 15 = 15.4 + # - As of 2023-05, latest = 15 = 15.5 # https://hub.docker.com/r/opensuse/tumbleweed # - Rolling distribution #