Trac sagemath#33306: tox.ini: Linux platform updates

New: - `tox -e docker-slackware-current-standard` - `tox -e docker-opensuse-15.4-standard` We remove `centos-8`, which can no longer be tested because the packages are no longer available (first noted in pypa/setuptools#2923 (comment)) URL: https://trac.sagemath.org/33306 Reported by: mkoeppe Ticket author(s): Matthias Koeppe Reviewer(s): Dima Pasechnik
dimpase · Feb 14, 2022 · 959ff7a · 959ff7a
2 parents 10a3cd9 + e26283a
commit 959ff7a
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 12 deletions.
diff --git a/.github/workflows/tox-experimental.yml b/.github/workflows/tox-experimental.yml
@@ -41,7 +41,7 @@ jobs:
         # This list is different from the one in tox.yml:
         # Trac #31526 switches gcc 4.x-based distributions to using the gcc_spkg configuration factor
         # Trac #32281 removes gcc 4.x-based distributions whose binutils are unusable
-        tox_system_factor: [ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-hirsute, ubuntu-impish, ubuntu-jammy, debian-stretch, debian-buster, debian-bullseye, debian-bookworm, debian-sid, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, linuxmint-20.2. linuxmint-20.3, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, fedora-35, fedora-36,  centos-7-gcc_spkg, centos-8, gentoo-python3.9, gentoo-python3.10, archlinux-latest, opensuse-15, opensuse-15.3, opensuse-tumbleweed, slackware-14.2, conda-forge, ubuntu-bionic-i386, manylinux-2_24-i686, debian-buster-i386, centos-7-i386-gcc_spkg]
+        tox_system_factor: [ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-hirsute, ubuntu-impish, ubuntu-jammy, debian-stretch, debian-buster, debian-bullseye, debian-bookworm, debian-sid, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, linuxmint-20.2. linuxmint-20.3, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, fedora-35, fedora-36,  centos-7-gcc_spkg, centos-stream-8, gentoo-python3.9, gentoo-python3.10, archlinux-latest, opensuse-15.2.1, opensuse-15.3, opensuse-tumbleweed, slackware-14.2, conda-forge, ubuntu-bionic-i386, manylinux-2_24-i686, debian-buster-i386, centos-7-i386-gcc_spkg]
         tox_packages_factor: [maximal]
         targets_pattern: [0-g, h-o, p, q-z]
     env:

diff --git a/.github/workflows/tox-optional.yml b/.github/workflows/tox-optional.yml
@@ -41,7 +41,7 @@ jobs:
         # This list is different from the one in tox.yml:
         # Trac #31526 switches gcc 4.x-based distributions to using the gcc_spkg configuration factor
         # Trac #32281 removes gcc 4.x-based distributions whose binutils are unusable
-        tox_system_factor: [ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-hirsute, ubuntu-impish, ubuntu-jammy, debian-stretch, debian-buster, debian-bullseye, debian-bookworm, debian-sid, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, linuxmint-20.2. linuxmint-20.3, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, fedora-35, fedora-36,  centos-7-gcc_spkg, centos-8, gentoo-python3.9, gentoo-python3.10, archlinux-latest, opensuse-15, opensuse-15.3, opensuse-tumbleweed, slackware-14.2, conda-forge, ubuntu-bionic-i386, manylinux-2_24-i686, debian-buster-i386, centos-7-i386-gcc_spkg]
+        tox_system_factor: [ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-hirsute, ubuntu-impish, ubuntu-jammy, debian-stretch, debian-buster, debian-bullseye, debian-bookworm, debian-sid, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, linuxmint-20.2. linuxmint-20.3, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, fedora-35, fedora-36,  centos-7-gcc_spkg, centos-stream-8, gentoo-python3.9, gentoo-python3.10, archlinux-latest, opensuse-15.2.1, opensuse-15.3, opensuse-tumbleweed, slackware-14.2, conda-forge, ubuntu-bionic-i386, manylinux-2_24-i686, debian-buster-i386, centos-7-i386-gcc_spkg]
         tox_packages_factor: [maximal]
         targets_pattern: [0-g, h-o, p, q-z]
     env:

diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
@@ -38,7 +38,7 @@ jobs:
       fail-fast: false
       max-parallel: 20
       matrix:
-        tox_system_factor: [gitpod, ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-hirsute, ubuntu-impish, ubuntu-jammy,  debian-stretch, debian-buster, debian-bullseye, debian-bookworm, debian-sid, linuxmint-17, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, linuxmint-20.2, linuxmint-20.3, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, fedora-35, fedora-36, centos-7, centos-8, gentoo-python3.9, gentoo-python3.10, archlinux-latest, opensuse-15, opensuse-15.3, opensuse-tumbleweed, slackware-14.2, conda-forge, ubuntu-bionic-i386, manylinux-2_24-i686, debian-buster-i386, centos-7-i386]
+        tox_system_factor: [gitpod, ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-hirsute, ubuntu-impish, ubuntu-jammy,  debian-stretch, debian-buster, debian-bullseye, debian-bookworm, debian-sid, linuxmint-17, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, linuxmint-20.2, linuxmint-20.3, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, fedora-35, fedora-36, centos-7, centos-stream-8, gentoo-python3.9, gentoo-python3.10, archlinux-latest, opensuse-15.2.1, opensuse-15.3, opensuse-tumbleweed, slackware-14.2, conda-forge, ubuntu-bionic-i386, manylinux-2_24-i686, debian-buster-i386, centos-7-i386]
         tox_packages_factor: [minimal, standard]
     env:
       TOX_ENV: docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}

diff --git a/build/bin/write-dockerfile.sh b/build/bin/write-dockerfile.sh
@@ -79,7 +79,7 @@ FROM \${BASE_IMAGE} as with-system-packages
 EOF
         # slackpkg install ignores packages that it does not know, so we do not have to filter
         EXISTS="true"
-        UPDATE="slackpkg update &&"
+        UPDATE="(yes|slackpkg update) &&"
         INSTALL="slackpkg install"
         ;;
     arch*)

diff --git a/build/pkgs/_prereq/distros/slackware.txt b/build/pkgs/_prereq/distros/slackware.txt
@@ -2,12 +2,15 @@ binutils
 make
 guile gc libffi  # dependencies of make
 "gcc-[0-9]"      # So that slackpkg pattern matching does not pull in all gcc-* packages
+gcc-11           # on slackware-current
 gcc-g++
+gcc-g++-11       # on slackware-current
 libmpc glibc kernel-headers # dependencies of gcc
 perl
 m4
 bc
-python-2.7
+python-2.7       # on slackware-14.2
+python3          # on slackware-current
 flex
 # for https upstream_url downloads
 ca-certificates

diff --git a/tox.ini b/tox.ini
@@ -276,7 +276,6 @@ setenv =
     centos:         BASE_IMAGE=centos
     centos:                                    IGNORE_MISSING_SYSTEM_PACKAGES=yes
     centos-7:         BASE_TAG=centos7
-    centos-8:         BASE_TAG=centos8
     centos-stream:  BASE_IMAGE=quay.io/centos/centos
     centos-stream:    BASE_TAG=stream
     centos-stream-8:  BASE_TAG=stream8
@@ -299,9 +298,10 @@ setenv =
     #
     # https://hub.docker.com/r/vbatts/slackware
     #
-    slackware:      SYSTEM=slackware
-    slackware:      BASE_IMAGE=vbatts/slackware
-    slackware-14.2:  BASE_TAG=14.2
+    slackware:        SYSTEM=slackware
+    slackware:          BASE_IMAGE=vbatts/slackware
+    slackware-14.2:       BASE_TAG=14.2
+    slackware-current:    BASE_TAG=current
     slackware:                                 IGNORE_MISSING_SYSTEM_PACKAGES=no
     #
     # https://hub.docker.com/r/voidlinux/
@@ -328,9 +328,8 @@ setenv =
     #
     # https://hub.docker.com/r/opensuse/leap
     # - OpenSUSE Leap 42 was superseded by the Leap 15 series.
-    # - OpenSUSE Leap 15.2 released July 2, 2020.
-    # - As of 2021-05-06, latest = 15 = 15.2
-    # - OpenSUSE Leap 15.3 planned to be released July 7, 2021
+    # - As of 2022-02, latest = 15 = 15.3
+    # - OpenSUSE Leap 15.4 planned to be released 2022-06
     # https://hub.docker.com/r/opensuse/tumbleweed
     # - Rolling distribution
     #
@@ -341,7 +340,9 @@ setenv =
     opensuse-15.0:         BASE_TAG=15.0
     opensuse-15.1:         BASE_TAG=15.1
     opensuse-15.2:         BASE_TAG=15.2
+    opensuse-15.2.1:       BASE_TAG=15.2.1
     opensuse-15.3:         BASE_TAG=15.3
+    opensuse-15.4:         BASE_TAG=15.4
     opensuse-15:           BASE_TAG=15
     opensuse-tumbleweed: BASE_IMAGE=opensuse/tumbleweed
     opensuse-tumbleweed:                       IGNORE_MISSING_SYSTEM_PACKAGES=no