feat: drop Debian Buster support

Fixes #2036
This commit is contained in:
jo 2022-09-09 20:15:30 +02:00 committed by Kyle Robbertze
parent d29d837d01
commit 5eda6093f4
16 changed files with 37 additions and 72 deletions

View File

@ -51,7 +51,6 @@ jobs:
fail-fast: false
matrix:
release:
- buster
- bullseye
- focal
- jammy

View File

@ -30,7 +30,6 @@ jobs:
fail-fast: false
matrix:
release:
- buster
- bullseye
- focal
- jammy

View File

@ -19,8 +19,6 @@ jobs:
release: focal
- distribution: ubuntu
release: jammy
- distribution: debian
release: buster
- distribution: debian
release: bullseye
- distribution: debian

View File

@ -26,7 +26,6 @@ jobs:
fail-fast: false
matrix:
include:
- php-version: "7.3" # Buster
- php-version: "7.4" # Bullseye, Focal
steps:
@ -45,7 +44,6 @@ jobs:
fail-fast: false
matrix:
include:
- php-version: "7.3" # Buster
- php-version: "7.4" # Bullseye, Focal
env:

11
Vagrantfile vendored
View File

@ -6,7 +6,7 @@
# export VAGRANT_NO_PORT_FORWARDING=true
# export VAGRANT_CPUS=4
# export VAGRANT_MEMORY=4096
# vagrant up buster
# vagrant up bullseye
#
Vagrant.configure('2') do |config|
@ -107,13 +107,4 @@ Vagrant.configure('2') do |config|
setup_nfs(config, 4)
setup_libretime(os, 'debian.sh')
end
config.vm.define 'buster' do |os|
os.vm.box = 'debian/buster64'
config.vm.provider 'virtualbox' do |v, override|
override.vm.box = 'bento/debian-10'
end
setup_nfs(config)
setup_libretime(os, 'debian.sh')
end
end

View File

@ -1,17 +1,17 @@
# This file contains a list of package dependencies.
[python]
python3 = buster, bullseye, bookworm, focal, jammy
python3-pip = buster, bullseye, bookworm, focal, jammy
python3-pika = buster, bullseye, bookworm, focal, jammy
python3 = bullseye, bookworm, focal, jammy
python3-pip = bullseye, bookworm, focal, jammy
python3-pika = bullseye, bookworm, focal, jammy
[liquidsoap]
# https://github.com/savonet/liquidsoap/blob/main/CHANGES.md
liquidsoap = buster, bullseye, bookworm, focal, jammy
liquidsoap = bullseye, bookworm, focal, jammy
[ffmpeg]
# Detect duration, silences and replaygain
ffmpeg = buster, bullseye, bookworm, focal, jammy
ffmpeg = bullseye, bookworm, focal, jammy
[=development]
# Generate fixtures
ffmpeg = buster, bullseye, bookworm, focal, jammy
ffmpeg = bullseye, bookworm, focal, jammy

View File

@ -33,8 +33,8 @@ def test_analyze_playability_invalid_filepath():
def test_analyze_playability_invalid_wma():
# Liquisoap does not fail with wma files on buster, bullseye, focal, jammy
if distro.codename() in ("buster", "bullseye", "focal", "jammy"):
# Liquisoap does not fail with wma files on bullseye, focal, jammy
if distro.codename() in ("bullseye", "focal", "jammy"):
return
with pytest.raises(UnplayableFileError):

View File

@ -1,15 +1,15 @@
# This file contains a list of package dependencies.
[python]
python3 = buster, bullseye, focal
python3-pip = buster, bullseye, focal
gunicorn = buster, bullseye, focal
python3-gunicorn = buster, bullseye, focal
python3-uvicorn = buster, bullseye, focal
python3-httptools = buster, bullseye, focal
python3-uvloop = buster, bullseye, focal
python3 = bullseye, focal
python3-pip = bullseye, focal
gunicorn = bullseye, focal
python3-gunicorn = bullseye, focal
python3-uvicorn = bullseye, focal
python3-httptools = bullseye, focal
python3-uvloop = bullseye, focal
[psycopg2]
# See https://www.psycopg.org/docs/install.html#install-from-source
build-essential = buster, bullseye, focal
python3-dev = buster, bullseye, focal
libpq-dev = buster, bullseye, focal
build-essential = bullseye, focal
python3-dev = bullseye, focal
libpq-dev = bullseye, focal

View File

@ -104,7 +104,6 @@ offers the option to choose a different operation system according to you needs.
| OS | Command | Comment |
| ------------ | --------------------- | ------------------------------ |
| Debian 10 | `vagrant up buster` | Install on Debian Buster. |
| Debian 11 | `vagrant up bullseye` | Install on Debian Bullseye. |
| Ubuntu 20.04 | `vagrant up focal` | Install on Ubuntu Focal Fossa. |

View File

@ -305,13 +305,13 @@ check_distribution() {
# shellcheck disable=SC2034
case "$ID-$VERSION_ID" in
debian-10) is_debian=true && distro="buster" ;;
debian-11) is_debian=true && distro="bullseye" ;;
ubuntu-20.04) is_ubuntu=true && distro="focal" ;;
*)
error << "EOF"
could not determine supported distribution "$ID-$VERSION_ID"!
Support for installing LibreTime on Buster has dropped since 3.1.0.
Support for installing LibreTime on Bionic has dropped since 3.1.0.
Support for installing LibreTime on Xenial has dropped since 3.0.0-alpha.10.
Support for installing LibreTime on Stretch has dropped since 3.0.0-alpha.10.

View File

@ -2,37 +2,19 @@
[common]
# The php-pear package depends on php-(cli|common|xml), be sure to
# install the dependencies with the right php version.
php-pear = buster, bullseye, focal
php-amqplib = buster, bullseye, focal
php-pear = bullseye, focal
php-amqplib = bullseye, focal
[locale]
gettext = buster, bullseye, focal
gettext = bullseye, focal
# [apache]
# apache2 = buster, bullseye, focal
# libapache2-mod-php7.3 = buster
# apache2 = bullseye, focal
# libapache2-mod-php7.4 = bullseye, focal
[php-fpm]
php7.3-fpm = buster
php7.4-fpm = bullseye, focal
# Buster
[php7.3]
php7.3 = buster
php7.3-apcu = buster
php7.3-apcu-bc = buster
php7.3-bcmath = buster
php7.3-cli = buster
php7.3-common = buster
php7.3-curl = buster
php7.3-dev = buster
php7.3-gd = buster
php7.3-mbstring = buster
php7.3-pgsql = buster
php7.3-xml = buster
php7.3-yaml = buster
# Bullseye, Focal
[php7.4]
php7.4 = bullseye, focal

View File

@ -1,17 +1,17 @@
# This file contains a list of package dependencies.
[python]
python3 = buster, bullseye, bookworm, focal, jammy
python3-pip = buster, bullseye, bookworm, focal, jammy
python3 = bullseye, bookworm, focal, jammy
python3-pip = bullseye, bookworm, focal, jammy
python3-lxml = bullseye, bookworm, focal, jammy
[liquidsoap]
# https://github.com/savonet/liquidsoap/blob/main/CHANGES.md
liquidsoap = buster, bullseye, bookworm, focal, jammy
liquidsoap = bullseye, bookworm, focal, jammy
[recorder]
ecasound = buster, bullseye, bookworm, focal, jammy
ecasound = bullseye, bookworm, focal, jammy
[misc]
# Used by pypofetch to check if a file is open.
# TODO: consider using a python library
lsof = buster, bullseye, bookworm, focal, jammy
lsof = bullseye, bookworm, focal, jammy

View File

@ -28,7 +28,6 @@ def test_parse_liquidsoap_version(version, expected):
@pytest.mark.skipif(getenv("CI") != "true", reason="requires liquidsoap")
def test_get_liquidsoap_version():
LIQUIDSOAP_VERSION_MAP = {
"buster": (1, 3, 3),
"focal": (1, 4, 1),
"bullseye": (1, 4, 3),
"jammy": (2, 0, 2),

View File

@ -1,3 +1,3 @@
# This file contains a list of package dependencies.
[tzdata]
tzdata = buster, bullseye, bookworm, focal, jammy
tzdata = bullseye, bookworm, focal, jammy

View File

@ -8,7 +8,7 @@ from typing import Iterator, List, Optional, Set
DEFAULT_PACKAGES_FILENAME = "packages.ini"
FORMATS = ("list", "line")
DISTRIBUTIONS = ("buster", "bullseye", "bookworm", "focal", "jammy")
DISTRIBUTIONS = ("bullseye", "bookworm", "focal", "jammy")
SETTINGS_SECTION = "=settings"
DEVELOPMENT_SECTION = "=development"

View File

@ -4,25 +4,25 @@ from tools.packages import list_packages, load_packages
PACKAGE_INI = """
[common]
postgresql = buster, focal
postgresql = jammy, focal
# Some comment
curl = buster, bullseye
curl = jammy, bullseye
[legacy]
some-package = bullseye, focal
[=development]
ffmpeg = buster, bullseye, focal
ffmpeg = jammy, bullseye, focal
"""
result_buster = {"curl", "postgresql"}
result_jammy = {"curl", "postgresql"}
result_bullseye = {"some-package", "curl", "ffmpeg"}
result_focal = {"postgresql", "some-package", "ffmpeg"}
result_exclude = {"postgresql", "ffmpeg"}
def test_load_packages():
assert load_packages(PACKAGE_INI, "buster", False) == result_buster
assert load_packages(PACKAGE_INI, "jammy", False) == result_jammy
assert load_packages(PACKAGE_INI, "bullseye", True) == result_bullseye
assert load_packages(PACKAGE_INI, "focal", True) == result_focal
assert load_packages(PACKAGE_INI, "focal", True, ["legacy"]) == result_exclude
@ -32,6 +32,6 @@ def test_list_packages(tmp_path: Path) -> None:
package_file = tmp_path / "packages.ini"
package_file.write_text(PACKAGE_INI)
assert list_packages([tmp_path, package_file], "buster", False) == result_buster
assert list_packages([tmp_path, package_file], "jammy", False) == result_jammy
assert list_packages([tmp_path, package_file], "bullseye", True) == result_bullseye
assert list_packages([tmp_path, package_file], "focal", True) == result_focal