From f1a20e1f74883705b2be0fb720dc460112e5d12f Mon Sep 17 00:00:00 2001 From: gwdio Date: Mon, 18 May 2026 18:31:38 -0400 Subject: [PATCH 1/3] Migrate dependencies to pyproject.toml Move test and dev dependencies into PEP 735 dependency groups. Update tox.ini and ci.yml to install via --dependency-group. requirements.txt retained as a stub until beeware/.github#355 lands; see #236 for context. --- .github/workflows/ci.yml | 7 +++++-- pyproject.toml | 12 ++++++++++++ requirements.txt | 4 ++++ tox.ini | 2 +- 4 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 pyproject.toml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 95f1fc8..bcbc91a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: name: Pre-commit checks uses: beeware/.github/.github/workflows/pre-commit-run.yml@main with: - pre-commit-source: -r requirements.txt + pre-commit-source: --dependency-group dev unit-tests: name: Unit tests @@ -38,8 +38,11 @@ jobs: with: python-version: "3.X" + - name: Update pip + run: python -m pip install -U pip + - name: Install Dependencies - run: python -m pip install -r requirements.txt + run: python -m pip install --dependency-group test - name: Test with tox run: tox diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..d8c3b0e --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,12 @@ +[dependency-groups] +test = [ + "pytest == 9.0.3", + "toml == 0.10.2", + "flake8 == 7.3.0", + "briefcase @ git+https://github.com/beeware/briefcase.git", +] +dev = [ + "tox == 4.54.0", + "pre-commit == 4.6.0", + "black == 26.5.1", +] diff --git a/requirements.txt b/requirements.txt index 5a75dab..1f93256 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,7 @@ +# Temporary: retained until beeware/.github's app-create-verify.yml +# workflow is updated to read deps from pyproject.toml. +# See beeware/briefcase-template#236. + black == 26.5.1 briefcase @ git+https://github.com/beeware/briefcase.git flake8 == 7.3.0 diff --git a/tox.ini b/tox.ini index 1f66a79..022f703 100644 --- a/tox.ini +++ b/tox.ini @@ -2,5 +2,5 @@ [testenv] skip_install = True -deps = -r{toxinidir}/requirements.txt +dependency_groups = test commands = python -m pytest {posargs:-vv --color yes tests/} From 2cb365f580b5c0a1fb5b4392422d86f38574d96a Mon Sep 17 00:00:00 2001 From: gwdio Date: Mon, 18 May 2026 18:51:31 -0400 Subject: [PATCH 2/3] Fix pip dependency group flag --dependency-group is not a valid pip flag; the correct flag introduced in pip 25.1 (PEP 735) is --group. --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bcbc91a..be1fa11 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: name: Pre-commit checks uses: beeware/.github/.github/workflows/pre-commit-run.yml@main with: - pre-commit-source: --dependency-group dev + pre-commit-source: --group dev unit-tests: name: Unit tests @@ -42,7 +42,7 @@ jobs: run: python -m pip install -U pip - name: Install Dependencies - run: python -m pip install --dependency-group test + run: python -m pip install --group test - name: Test with tox run: tox From 8520234dba900e8b916f451ff0d39049f0966736 Mon Sep 17 00:00:00 2001 From: gwdio Date: Mon, 18 May 2026 19:02:55 -0400 Subject: [PATCH 3/3] Fix depenendency target to install tox --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index be1fa11..87158a7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,7 +42,7 @@ jobs: run: python -m pip install -U pip - name: Install Dependencies - run: python -m pip install --group test + run: python -m pip install --group dev - name: Test with tox run: tox