From 780ea18d226cd0a36e1599e4b39760dec8c46996 Mon Sep 17 00:00:00 2001 From: deeplow Date: Wed, 6 Dec 2023 11:28:41 +0000 Subject: [PATCH] Remove support for Fedora 37 (EOL) Fixes #637 --- .circleci/config.yml | 45 ----------------------------------- CHANGELOG.md | 4 ++++ INSTALL.md | 1 - dev_scripts/qa.py | 4 ---- install/linux/dangerzone.spec | 22 ----------------- 5 files changed, 4 insertions(+), 72 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7af63f3..911612a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -296,33 +296,6 @@ jobs: ./dev_scripts/env.py --distro fedora --version 38 run --dev \ bash -c 'cd dangerzone; poetry run make test' - ci-fedora-37: - machine: - image: ubuntu-2004:202111-01 - steps: - - checkout - - run: *install-podman - - - run: - name: Prepare cache directory - command: | - sudo mkdir -p /caches - sudo chown -R $USER:$USER /caches - - run: *calculate-cache-key - - restore_cache: *restore-cache - - run: *copy-image - - - run: - name: Prepare Dangerzone environment - command: | - ./dev_scripts/env.py --distro fedora --version 37 build-dev - - - run: - name: Run CI tests - command: | - ./dev_scripts/env.py --distro fedora --version 37 run --dev \ - bash -c 'cd dangerzone; poetry run make test' - ci-debian-trixie: machine: image: ubuntu-2004:202111-01 @@ -535,18 +508,6 @@ jobs: - run: *build-rpm - run: *build-rpm-qubes - build-fedora-37: - docker: - - image: fedora:37 - resource_class: medium+ - steps: - - run: *install-dependencies-rpm - - checkout - - run: *calculate-cache-key - - restore_cache: *restore-cache - - run: *copy-image - - run: *build-rpm - - run: *build-rpm-qubes workflows: version: 2 @@ -582,9 +543,6 @@ workflows: - ci-fedora-38: requires: - build-container-image - - ci-fedora-37: - requires: - - build-container-image - build-ubuntu-mantic: requires: - build-container-image @@ -609,6 +567,3 @@ workflows: - build-fedora-38: requires: - build-container-image - - build-fedora-37: - requires: - - build-container-image diff --git a/CHANGELOG.md b/CHANGELOG.md index 80a1818..db95803 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,10 @@ since 0.4.1, and this project adheres to [Semantic Versioning](https://semver.or - Use more descriptive button labels in update check prompt ([issue #527](https://github.com/freedomofpress/dangerzone/issues/527), thanks to [@garrettr](https://github.com/garrettr)) +### Removed + +- Platform support: Drop Fedora 37, since it reached end-of-life ([issue #637](https://github.com/freedomofpress/dangerzone/issues/637)) + ### Security - [Security advisory 2023-12-07](https://github.com/freedomofpress/dangerzone/blob/main/docs/advisories/2023-12-07.md): Protect our container image against diff --git a/INSTALL.md b/INSTALL.md index d599bd2..d87063d 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -17,7 +17,6 @@ Dangerzone is available for: - Debian 12 (bookworm) - Debian 11 (bullseye) - Fedora 38 -- Fedora 37 - Qubes OS (beta support) ### Ubuntu, Debian diff --git a/dev_scripts/qa.py b/dev_scripts/qa.py index 7986c11..6075ec4 100755 --- a/dev_scripts/qa.py +++ b/dev_scripts/qa.py @@ -894,10 +894,6 @@ class QAFedora(QALinux): ) -class QAFedora37(QAFedora): - VERSION = "37" - - class QAFedora38(QAFedora): VERSION = "38" diff --git a/install/linux/dangerzone.spec b/install/linux/dangerzone.spec index 6a26c7e..c93c888 100644 --- a/install/linux/dangerzone.spec +++ b/install/linux/dangerzone.spec @@ -227,28 +227,6 @@ convert the documents within a secure sandbox. # https://github.com/freedomofpress/dangerzone/issues/211 sed -i 's/^PySide6.*$/PySide2 = "*"/' pyproject.toml -# XXX: Replace all [tool.poetry.group.*] references in pyproject.toml with -# [tool.poetry.dev-dependencies], **ONLY** for Fedora 37. -# -# Fedora 37 ships python3-poetry-core v1.0.8. This version does not understand -# the dependency groups that were added in v1.2.0 [1]. Therefore, we need to -# dumb down the pyproject.toml file a bit, so that poetry-core can parse it. -# Note that the dev dependencies are not consulted for the creation of the RPM -# file, so doing so should be safe. -# -# The following sed invocations turn the various [tool.poetry.group.*] sections -# into one large [tool.poetry.dev-dependencies] section. Then, they patch the -# minimum required poetry-core version in pyproject.toml, to one that can be -# satisfied from the Fedora 37 repos. -# -# TODO: Remove this workaround once Fedora 37 (fedora-37) is EOL. -# -# [1]: https://python-poetry.org/docs/managing-dependencies/#dependency-groups -%if 0%{?fedora} == 37 -sed -i 's/^\[tool.poetry.group.package.*$/[tool.poetry.dev-dependencies]/' pyproject.toml -sed -i '/^\[tool.poetry.group.*$/d' pyproject.toml -sed -i 's/poetry-core>=1.2.0/poetry-core>=1.0.0/' pyproject.toml -%endif %generate_buildrequires %pyproject_buildrequires -R