almet/dangerzone
1
0
Fork 0
mirror of https://github.com/freedomofpress/dangerzone.git synced 2025-04-28 18:02:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Update RPM dependencies

Browse source 
Update the dependencies required to build RPM packages. More
specifically, remove the older python3-setuptools dependency, and depend
instead on python3-devel and python3-poetry-core.

Note that this commit may break our CI, but it will be resolved in
subsequent commits.
This commit is contained in:
Alex Pyrgiotis 2023-08-31 13:25:20 +03:00
parent 33197f26b7
commit f5abe0abd0
No known key found for this signature in database
GPG key ID: B6C15EBA0357C9AA
4 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.circleci/config.yml
View file

@ -28,7 +28,8 @@ aliases:
- &install-dependencies-rpm - &install-dependencies-rpm
name: Install dependencies (rpm) name: Install dependencies (rpm)
command: | command: |
dnf install -y rpm-build python3 python3-setuptools dnf install -y rpm-build python3 python3-devel python3-poetry-core pipx
pipx install poetry
- &build-deb - &build-deb
name: Build the .deb package name: Build the .deb package
@ -39,7 +40,7 @@ aliases:
- &build-rpm - &build-rpm
name: Build the .rpm package name: Build the .rpm package
command: | command: |
./install/linux/build-rpm.py PATH=/root/.local/bin:$PATH ./install/linux/build-rpm.py
ls -lh dist/ ls -lh dist/
- &calculate-cache-key - &calculate-cache-key

6
BUILD.md
View file

@ -60,7 +60,8 @@ Create a .deb:
Install dependencies: Install dependencies:
```sh ```sh
sudo dnf install -y rpm-build podman python3 pipx qt6-qtbase-gui sudo dnf install -y rpm-build podman python3 python3-devel python3-poetry-core \
pipx qt6-qtbase-gui
``` ```
Install Poetry using `pipx`: Install Poetry using `pipx`:
@ -172,7 +173,8 @@ Overview of the qubes you'll create:
1. Install dependencies: 1. Install dependencies:
``` ```
sudo dnf install -y rpm-build pipx qt6-qtbase-gui libreoffice python3-magic \ sudo dnf install -y rpm-build podman python3 python3-devel \
python3-poetry-core pipx qt6-qtbase-gui libreoffice python3-magic \
tesseract* tesseract*
``` ```

3
dev_scripts/env.py
View file

@ -108,7 +108,8 @@ RUN apt-get update \
# 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 rpm-build podman python3 python3-setuptools pipx make qt6-qtbase-gui \ RUN dnf install -y rpm-build podman python3 python3-devel python3-poetry-core \
pipx make qt6-qtbase-gui \
&& dnf clean all && dnf clean all
# FIXME: Drop this fix after it's resolved upstream. # FIXME: Drop this fix after it's resolved upstream.

3
dev_scripts/qa.py
View file

@ -236,7 +236,8 @@ CONTENT_BUILD_FEDORA = r"""## Fedora
Install dependencies: Install dependencies:
```sh ```sh
sudo dnf install -y rpm-build podman python3 pipx qt6-qtbase-gui sudo dnf install -y rpm-build podman python3 python3-devel python3-poetry-core \
pipx qt6-qtbase-gui
``` ```
Install Poetry using `pipx`: Install Poetry using `pipx`: