From f8f12d37c5c1ea0b75cdc1d428ae3f1164a90e55 Mon Sep 17 00:00:00 2001 From: Alex Pyrgiotis Date: Wed, 2 Apr 2025 14:34:46 +0300 Subject: [PATCH] Do not install poetry-plugin-export Do not unconditionally install the Poetry plugin for exporting dependencies as a requirements.txt file, since it's used only when building a Debian package. Keep it instead in the Linux instructions and when building a Dangerzone environment. --- BUILD.md | 6 +++--- RELEASE.md | 4 ++-- dev_scripts/qa.py | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/BUILD.md b/BUILD.md index 3ef6b63..2580f52 100644 --- a/BUILD.md +++ b/BUILD.md @@ -113,7 +113,7 @@ Install Poetry using `pipx`: ```sh pipx install poetry -pipx inject poetry poetry-plugin-export +pipx inject poetry ``` Clone this repository: @@ -326,7 +326,7 @@ cd dangerzone Install Python dependencies: ```sh -python3 -m pip install poetry poetry-plugin-export +python3 -m pip install poetry poetry install ``` @@ -387,7 +387,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 poetry-plugin-export +python -m pip install poetry ``` Install git from [here](https://git-scm.com/download/win), open a Windows terminal (`cmd.exe`) and clone this repository: diff --git a/RELEASE.md b/RELEASE.md index 18700bb..17fbccb 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -123,7 +123,7 @@ Here is what you need to do: # In case of a new Python installation or minor version upgrade, e.g., from # 3.11 to 3.12, reinstall Poetry - python3 -m pip install poetry poetry-plugin-export + python3 -m pip install poetry # You can verify the correct Python version is used poetry debug info @@ -205,7 +205,7 @@ The Windows release is performed in a Windows 11 virtual machine (as opposed to ```bash # In case of a new Python installation or minor version upgrade, e.g., from # 3.11 to 3.12, reinstall Poetry - python3 -m pip install poetry poetry-plugin-export + python3 -m pip install poetry # You can verify the correct Python version is used poetry debug info diff --git a/dev_scripts/qa.py b/dev_scripts/qa.py index b1ee7d9..96ba77b 100755 --- a/dev_scripts/qa.py +++ b/dev_scripts/qa.py @@ -331,7 +331,7 @@ Install Poetry using `pipx`: ```sh pipx install poetry -pipx inject poetry poetry-plugin-export +pipx inject poetry ``` Clone this repository: @@ -397,7 +397,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 poetry-plugin-export +python -m pip install poetry ``` Install git from [here](https://git-scm.com/download/win), open a Windows terminal (`cmd.exe`) and clone this repository: @@ -835,7 +835,7 @@ class QAWindows(QABase): "Install Poetry and the project's dependencies", ref=REF_BUILD, auto=True ) def install_poetry(self): - self.run("python", "-m", "pip", "install", "poetry", "poetry-plugin-export") + self.run("python", "-m", "pip", "install", "poetry") self.run("poetry", "install", "--sync") @QABase.task("Build Dangerzone container image", ref=REF_BUILD, auto=True)