Merge pull request #506 from freedomofpress/poetry-deps

Specify test dependencies using poetry

.github/workflows/ci.yml

@@ -10,22 +10,19 @@ jobs:
     steps:
       - name: Bootstrap Debian system package dependencies
         run: |
-          apt-get update && apt-get install --yes --no-install-recommends make sudo git git-lfs ca-certificates
+          apt-get update && apt-get install --yes --no-install-recommends make sudo git git-lfs ca-certificates \
+            python3-poetry
       - uses: actions/checkout@v4
         with:
           lfs: true
       - name:  Install additional packages and Python dependencies
         run: |
-          # Installs Python & bootstrap wheels, and initializes a virtualenv at .venv
-          make install-deps
-          ./.venv/bin/pip install -r test-requirements.txt
+          poetry install --no-ansi
       - name: Run linters
         run: |
-          . ./.venv/bin/activate
           make lint
       - name: Run tests except reprotest
         run: |
-          . ./.venv/bin/activate
           make test
 
   checksums:

.github/workflows/reprotest.yml

@@ -15,15 +15,17 @@ jobs:
     steps:
       - name: Bootstrap Debian system package dependencies
         run: |
-          apt-get update && apt-get install --yes --no-install-recommends make sudo git git-lfs ca-certificates
+          apt-get update && apt-get install --yes --no-install-recommends make sudo git git-lfs ca-certificates \
+            python3-poetry
       - uses: actions/checkout@v4
         with:
           lfs: true
       - name:  Install additional packages and Python dependencies
         run: |
           # Installs Python & bootstrap wheels, and initializes a virtualenv at .venv
           make install-deps
-          ./.venv/bin/pip install -r test-requirements.txt
+          # Install poetry deps into the .venv
+          poetry install --no-ansi
       - name: Test wheel reproducibility
         run: |
           # Necessary to enable git operations without permission issues

Makefile

@@ -3,13 +3,13 @@ SHELL := /bin/bash
 
 .PHONY: lint
 lint:
-	@ruff check .
-	@ruff format --check .
+	@poetry run ruff check .
+	@poetry run ruff format --check .
 
 .PHONY: fix
 fix:
-	@ruff check . --fix
-	@ruff format .
+	@poetry run ruff check . --fix
+	@poetry run ruff format .
 
 .PHONY: install-deps
 install-deps: ## Install initial wheel building dependencies
@@ -28,11 +28,11 @@ build-wheels: ## Builds the wheels and adds them to the wheels subdirectory
 
 .PHONY: test
 test: ## Run simple test suite (skips reproducibility checks)
-	pytest -v tests/test_update_requirements.py tests/test_utils.py
+	poetry run pytest -v tests/test_update_requirements.py tests/test_utils.py
 
 .PHONY: reprotest
 reprotest: ## Runs only reproducibility tests for .whl files
-	pytest -vvs tests/test_reproducible_wheels.py
+	poetry run pytest -vvs tests/test_reproducible_wheels.py
 
 .PHONY: help
 help: ## Prints this message and exits

pyproject.toml

@@ -3,6 +3,21 @@ name = "securedrop-builder"
 version = "0.1.0"
 requires-python = ">=3.9"
 
+[tool.poetry]
+name = "securedrop-builder"
+version = "0.1.0"
+description = ""
+authors = []
+
+[tool.poetry.dependencies]
+python = ">=3.11"
+
+[tool.poetry.group.dev.dependencies]
+pytest = "*"
+pytest-mock = "*"
+ruff = "*"
+virtualenv = "<16"
+
 [tool.ruff]
 line-length = 100