mirror of
https://github.com/freedomofpress/dangerzone.git
synced 2025-04-28 18:02:38 +02:00
build: add poetry-plugin-export to the dependencies
Since Poetry 2.0.0, the `export` command has been removed and it's advised to use the "poetry-plugin-export" package instead. This commit adds this dependency to the different places it's needed (debian environments, CI, build instructions, etc).
This commit is contained in:
parent
d7fbfcd05c
commit
85c9d5eca4
4 changed files with 13 additions and 5 deletions
5
.github/workflows/scan.yml
vendored
5
.github/workflows/scan.yml
vendored
|
@ -14,7 +14,10 @@ jobs:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
- name: Install container build dependencies
|
- name: Install container build dependencies
|
||||||
run: sudo apt install pipx && pipx install poetry
|
run: |
|
||||||
|
sudo apt install pipx
|
||||||
|
pipx install poetry
|
||||||
|
pipx inject poetry poetry-plugin-export
|
||||||
- name: Build container image
|
- name: Build container image
|
||||||
run: python3 ./install/common/build-image.py --runtime docker --no-save
|
run: python3 ./install/common/build-image.py --runtime docker --no-save
|
||||||
# NOTE: Scan first without failing, else we won't be able to read the scan
|
# NOTE: Scan first without failing, else we won't be able to read the scan
|
||||||
|
|
6
BUILD.md
6
BUILD.md
|
@ -70,6 +70,7 @@ methods](https://python-poetry.org/docs/#installation))_
|
||||||
```sh
|
```sh
|
||||||
pipx ensurepath
|
pipx ensurepath
|
||||||
pipx install poetry
|
pipx install poetry
|
||||||
|
pipx inject poetry poetry-plugin-export
|
||||||
```
|
```
|
||||||
|
|
||||||
After this, restart the terminal window, for the `poetry` command to be in your
|
After this, restart the terminal window, for the `poetry` command to be in your
|
||||||
|
@ -157,6 +158,7 @@ Install Poetry using `pipx`:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
pipx install poetry
|
pipx install poetry
|
||||||
|
pipx inject poetry poetry-plugin-export
|
||||||
```
|
```
|
||||||
|
|
||||||
Clone this repository:
|
Clone this repository:
|
||||||
|
@ -372,7 +374,7 @@ cd dangerzone
|
||||||
Install Python dependencies:
|
Install Python dependencies:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
python3 -m pip install poetry
|
python3 -m pip install poetry poetry-plugin-export
|
||||||
poetry install
|
poetry install
|
||||||
```
|
```
|
||||||
|
|
||||||
|
@ -433,7 +435,7 @@ Install Microsoft Visual C++ 14.0 or greater. Get it with ["Microsoft C++ Build
|
||||||
Install [poetry](https://python-poetry.org/). Open PowerShell, and run:
|
Install [poetry](https://python-poetry.org/). Open PowerShell, and run:
|
||||||
|
|
||||||
```
|
```
|
||||||
python -m pip install poetry
|
python -m pip install poetry poetry-plugin-export
|
||||||
```
|
```
|
||||||
|
|
||||||
Install git from [here](https://git-scm.com/download/win), open a Windows terminal (`cmd.exe`) and clone this repository:
|
Install git from [here](https://git-scm.com/download/win), open a Windows terminal (`cmd.exe`) and clone this repository:
|
||||||
|
|
|
@ -220,6 +220,7 @@ COPY storage.conf /home/user/.config/containers
|
||||||
# FIXME: pipx install poetry does not work for Ubuntu Focal.
|
# FIXME: pipx install poetry does not work for Ubuntu Focal.
|
||||||
ENV PATH="$PATH:/home/user/.local/bin"
|
ENV PATH="$PATH:/home/user/.local/bin"
|
||||||
RUN pipx install poetry
|
RUN pipx install poetry
|
||||||
|
RUN pipx inject poetry poetry-plugin-export
|
||||||
|
|
||||||
COPY pyproject.toml poetry.lock /home/user/dangerzone/
|
COPY pyproject.toml poetry.lock /home/user/dangerzone/
|
||||||
RUN cd /home/user/dangerzone && poetry --no-ansi install
|
RUN cd /home/user/dangerzone && poetry --no-ansi install
|
||||||
|
|
|
@ -262,6 +262,7 @@ methods](https://python-poetry.org/docs/#installation))_
|
||||||
```sh
|
```sh
|
||||||
pipx ensurepath
|
pipx ensurepath
|
||||||
pipx install poetry
|
pipx install poetry
|
||||||
|
pipx inject poetry poetry-plugin-export
|
||||||
```
|
```
|
||||||
|
|
||||||
After this, restart the terminal window, for the `poetry` command to be in your
|
After this, restart the terminal window, for the `poetry` command to be in your
|
||||||
|
@ -350,6 +351,7 @@ Install Poetry using `pipx`:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
pipx install poetry
|
pipx install poetry
|
||||||
|
pipx inject poetry poetry-plugin-export
|
||||||
```
|
```
|
||||||
|
|
||||||
Clone this repository:
|
Clone this repository:
|
||||||
|
@ -415,7 +417,7 @@ Install Microsoft Visual C++ 14.0 or greater. Get it with ["Microsoft C++ Build
|
||||||
Install [poetry](https://python-poetry.org/). Open PowerShell, and run:
|
Install [poetry](https://python-poetry.org/). Open PowerShell, and run:
|
||||||
|
|
||||||
```
|
```
|
||||||
python -m pip install poetry
|
python -m pip install poetry poetry-plugin-export
|
||||||
```
|
```
|
||||||
|
|
||||||
Install git from [here](https://git-scm.com/download/win), open a Windows terminal (`cmd.exe`) and clone this repository:
|
Install git from [here](https://git-scm.com/download/win), open a Windows terminal (`cmd.exe`) and clone this repository:
|
||||||
|
@ -816,7 +818,7 @@ class QAWindows(QABase):
|
||||||
)
|
)
|
||||||
def install_poetry(self):
|
def install_poetry(self):
|
||||||
self.run("python", "-m", "pip", "install", "poetry")
|
self.run("python", "-m", "pip", "install", "poetry")
|
||||||
self.run("poetry", "install")
|
self.run("poetry", "install", "--sync")
|
||||||
|
|
||||||
@QABase.task("Build Dangerzone container image", ref=REF_BUILD, auto=True)
|
@QABase.task("Build Dangerzone container image", ref=REF_BUILD, auto=True)
|
||||||
def build_image(self):
|
def build_image(self):
|
||||||
|
|
Loading…
Reference in a new issue