mirror of
https://github.com/freedomofpress/dangerzone.git
synced 2025-04-28 18:02:38 +02:00
FIXUP: Install Python 3.12
This commit is contained in:
parent
b5d64e3420
commit
c13e594ff3
4 changed files with 14 additions and 1 deletions
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
|
@ -319,6 +319,8 @@ jobs:
|
||||||
version: "39"
|
version: "39"
|
||||||
- distro: fedora
|
- distro: fedora
|
||||||
version: "40"
|
version: "40"
|
||||||
|
- distro: fedora
|
||||||
|
version: "41"
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
|
|
|
@ -163,6 +163,13 @@ RUN apt-get update \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
# NOTE: For Fedora 41 specifically, we need to install Python 3.12, else PySide6 from
|
||||||
|
# PyPI won't work.
|
||||||
|
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.
|
# FIXME: Install Poetry on Fedora via package manager.
|
||||||
DOCKERFILE_BUILD_DEV_FEDORA_DEPS = r"""
|
DOCKERFILE_BUILD_DEV_FEDORA_DEPS = r"""
|
||||||
RUN dnf install -y git rpm-build podman python3 python3-devel python3-poetry-core \
|
RUN dnf install -y git rpm-build podman python3 python3-devel python3-poetry-core \
|
||||||
|
@ -661,6 +668,8 @@ class Env:
|
||||||
|
|
||||||
if self.distro == "fedora":
|
if self.distro == "fedora":
|
||||||
install_deps = DOCKERFILE_BUILD_DEV_FEDORA_DEPS
|
install_deps = DOCKERFILE_BUILD_DEV_FEDORA_DEPS
|
||||||
|
if self.version == "41":
|
||||||
|
install_deps += DOCKERFILE_BUILD_DEV_FEDORA_41_DEPS
|
||||||
else:
|
else:
|
||||||
# Use Qt6 in all of our Linux dev environments, and add a missing
|
# Use Qt6 in all of our Linux dev environments, and add a missing
|
||||||
# libxcb-cursor0 dependency
|
# libxcb-cursor0 dependency
|
||||||
|
|
|
@ -60,7 +60,7 @@ and newer platforms, we have to do the following:
|
||||||
- [ ] Run the Dangerzone tests.
|
- [ ] Run the Dangerzone tests.
|
||||||
- [ ] Create an .rpm package and install it system-wide.
|
- [ ] Create an .rpm package and install it system-wide.
|
||||||
- [ ] Test some QA scenarios (see [Scenarios](#Scenarios) below).
|
- [ ] Test some QA scenarios (see [Scenarios](#Scenarios) below).
|
||||||
- [ ] Create a test build in the most recent Qubes Fedora template (Fedora 39 as
|
- [ ] Create a test build in the most recent Qubes Fedora template (Fedora 40 as
|
||||||
of writing this) and make sure it works:
|
of writing this) and make sure it works:
|
||||||
- [ ] Create a new development environment with Poetry.
|
- [ ] Create a new development environment with Poetry.
|
||||||
- [ ] Run the Dangerzone tests.
|
- [ ] Run the Dangerzone tests.
|
||||||
|
|
|
@ -221,6 +221,8 @@ convert the documents within a secure sandbox.
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1 -n dangerzone-%{version}
|
%autosetup -p1 -n dangerzone-%{version}
|
||||||
|
|
||||||
|
sed -i 's/3.13/3.14/' pyproject.toml
|
||||||
|
|
||||||
%generate_buildrequires
|
%generate_buildrequires
|
||||||
%pyproject_buildrequires -R
|
%pyproject_buildrequires -R
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue