diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cd888a8..ab951fe 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -49,6 +49,8 @@ jobs:
version: "40"
- distro: fedora
version: "41"
+ - distro: fedora
+ version: "42"
steps:
- name: Checkout
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fc89978..c9b29ed 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -306,7 +306,7 @@ jobs:
strategy:
matrix:
distro: ["fedora"]
- version: ["40", "41"]
+ version: ["40", "41", "42"]
steps:
- name: Checkout
uses: actions/checkout@v4
@@ -395,6 +395,8 @@ jobs:
version: "40"
- distro: fedora
version: "41"
+ - distro: fedora
+ version: "42"
steps:
- name: Checkout
diff --git a/BUILD.md b/BUILD.md
index 4a7c51e..3ef6b63 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -109,28 +109,6 @@ sudo dnf install -y rpm-build podman python3 python3-devel python3-poetry-core \
pipx qt6-qtbase-gui
```
-
-
-
-
- :memo: Expand this section if you are on Fedora 41.
-
-
- The default Python version that ships with Fedora 41 (3.13) is not
- compatible with PySide6, which requires Python 3.12 or earlier.
-
- You can install Python 3.12 using the `python3.12` package.
-
- ```bash
- sudo dnf install -y python3.12
- ```
-
- Poetry will automatically pick up the correct version when running.
-
- |
-
-
-
Install Poetry using `pipx`:
```sh
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 791abcf..bd61cae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ since 0.4.1, and this project adheres to [Semantic Versioning](https://semver.or
## [Unreleased](https://github.com/freedomofpress/dangerzone/compare/v0.8.1...HEAD)
- Platform support: Drop support for Ubuntu Focal, since it's nearing end-of-life ([#1018](https://github.com/freedomofpress/dangerzone/issues/1018))
+- Platform support: Add support for Fedora 42 ([#1091](https://github.com/freedomofpress/dangerzone/issues/1091))
## [0.8.1](https://github.com/freedomofpress/dangerzone/compare/v0.8.1...0.8.0)
diff --git a/dev_scripts/env.py b/dev_scripts/env.py
index a739004..ee276e7 100755
--- a/dev_scripts/env.py
+++ b/dev_scripts/env.py
@@ -103,14 +103,6 @@ RUN apt-get update \
&& rm -rf /var/lib/apt/lists/*
"""
-# NOTE: Fedora 41 comes with Python 3.13 installed. Our Python project is not compatible
-# yet with Python 3.13, because PySide6 cannot work with this Python version. To
-# sidestep this, install Python 3.12 *only* in dev environments.
-DOCKERFILE_BUILD_DEV_FEDORA_41_DEPS = r"""
-# Install Python 3.12 since our project is not compatible yet with Python 3.13.
-RUN dnf install -y python3.12
-"""
-
# FIXME: Install Poetry on Fedora via package manager.
DOCKERFILE_BUILD_DEV_FEDORA_DEPS = r"""
RUN dnf install -y git rpm-build podman python3 python3-devel python3-poetry-core \
@@ -538,8 +530,6 @@ class Env:
if self.distro == "fedora":
install_deps = DOCKERFILE_BUILD_DEV_FEDORA_DEPS
- if self.version == "41":
- install_deps += DOCKERFILE_BUILD_DEV_FEDORA_41_DEPS
else:
# Use Qt6 in all of our Linux dev environments, and add a missing
# libxcb-cursor0 dependency
diff --git a/dev_scripts/qa.py b/dev_scripts/qa.py
index 12526a2..1109def 100755
--- a/dev_scripts/qa.py
+++ b/dev_scripts/qa.py
@@ -327,28 +327,6 @@ sudo dnf install -y rpm-build podman python3 python3-devel python3-poetry-core \
pipx qt6-qtbase-gui
```
-
-
-
-
- :memo: Expand this section if you are on Fedora 41.
-
-
- The default Python version that ships with Fedora 41 (3.13) is not
- compatible with PySide6, which requires Python 3.12 or earlier.
-
- You can install Python 3.12 using the `python3.12` package.
-
- ```bash
- sudo dnf install -y python3.12
- ```
-
- Poetry will automatically pick up the correct version when running.
-
- |
-
-
-
Install Poetry using `pipx`:
```sh
@@ -1044,6 +1022,10 @@ class QAFedora(QALinux):
)
+class QAFedora41(QAFedora):
+ VERSION = "42"
+
+
class QAFedora41(QAFedora):
VERSION = "41"
diff --git a/tests/test_docs_large b/tests/test_docs_large
index 0068ffc..0faa21e 160000
--- a/tests/test_docs_large
+++ b/tests/test_docs_large
@@ -1 +1 @@
-Subproject commit 0068ffcb67f45fe9e3a082649493b7c8db5d1473
+Subproject commit 0faa21eb4e33ec1a3212468dcb6db3a668cf8fc8