Skip to content

Commit

Permalink
build: add poetry-plugin-export to the dependencies
Browse files Browse the repository at this point in the history
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).
  • Loading branch information
almet authored and apyrgio committed Feb 4, 2025
1 parent d7fbfcd commit 85c9d5e
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 5 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- 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
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
Expand Down
6 changes: 4 additions & 2 deletions BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ methods](https://python-poetry.org/docs/#installation))_
```sh
pipx ensurepath
pipx install poetry
pipx inject poetry poetry-plugin-export
```

After this, restart the terminal window, for the `poetry` command to be in your
Expand Down Expand Up @@ -157,6 +158,7 @@ Install Poetry using `pipx`:

```sh
pipx install poetry
pipx inject poetry poetry-plugin-export
```

Clone this repository:
Expand Down Expand Up @@ -372,7 +374,7 @@ cd dangerzone
Install Python dependencies:

```sh
python3 -m pip install poetry
python3 -m pip install poetry poetry-plugin-export
poetry install
```

Expand Down Expand Up @@ -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:

```
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:
Expand Down
1 change: 1 addition & 0 deletions dev_scripts/env.py
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@
# FIXME: pipx install poetry does not work for Ubuntu Focal.
ENV PATH="$PATH:/home/user/.local/bin"
RUN pipx install poetry
RUN pipx inject poetry poetry-plugin-export
COPY pyproject.toml poetry.lock /home/user/dangerzone/
RUN cd /home/user/dangerzone && poetry --no-ansi install
Expand Down
6 changes: 4 additions & 2 deletions dev_scripts/qa.py
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,7 @@
```sh
pipx ensurepath
pipx install poetry
pipx inject poetry poetry-plugin-export
```
After this, restart the terminal window, for the `poetry` command to be in your
Expand Down Expand Up @@ -350,6 +351,7 @@
```sh
pipx install poetry
pipx inject poetry poetry-plugin-export
```
Clone this repository:
Expand Down Expand Up @@ -415,7 +417,7 @@
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:
Expand Down Expand Up @@ -816,7 +818,7 @@ def install_docker(self):
)
def install_poetry(self):
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)
def build_image(self):
Expand Down

0 comments on commit 85c9d5e

Please sign in to comment.