Skip to content

Commit 0d20156

Browse files
authored
Update dependency groups for consistency. (#3902)
1 parent e634ea0 commit 0d20156

File tree

6 files changed

+12
-7
lines changed

6 files changed

+12
-7
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ jobs:
119119
# The $(ls ...) shell expansion is done in the GitHub environment; the value of
120120
# TOGA_INSTALL_COMMAND will be a literal string without any shell expansions to
121121
# perform.
122-
export TOGA_INSTALL_COMMAND="uv pip install ../$(ls dist/toga_core-*.whl) ../$(ls dist/travertino-*.whl) ../$(ls dist/toga_dummy-*.whl) --group dev"
122+
export TOGA_INSTALL_COMMAND="uv pip install ../$(ls dist/toga_core-*.whl) ../$(ls dist/travertino-*.whl) ../$(ls dist/toga_dummy-*.whl) --group test"
123123
tox -e py-cov${{ matrix.tox-suffix }}
124124
tox -qe coverage$(tr -dc "0-9" <<< "${{ matrix.python-version }}")${{ matrix.tox-suffix }}
125125
mv ${{ matrix.package }}/.coverage ${{ matrix.package }}/.coverage.${{ matrix.platform }}.${{ matrix.python-version }}

changes/3902.misc.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Dependency groups are now consistent with other BeeWare tools.

core/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ classifiers = [
6161
[dependency-groups]
6262
# Extras used by developers *of* Toga are pinned to specific versions to
6363
# ensure environment consistency.
64-
dev = [
64+
test = [
6565
"coverage[toml] == 7.11.3",
6666
"coverage-conditional-plugin == 0.9.0",
6767
"Pillow == 12.0.0",

pyproject.toml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,10 @@ pre-commit = [
116116
"pre-commit == 4.3.0",
117117
]
118118

119+
setuptools-scm = [
120+
"setuptools_scm == 9.2.2",
121+
]
122+
119123
towncrier = [
120124
"towncrier==24.8.0",
121125
]
@@ -127,13 +131,13 @@ tox-uv = [
127131
dev = [
128132
{include-group = "pre-commit"},
129133
{include-group = "tox-uv"},
134+
{include-group = "setuptools-scm"}
130135
]
131136

132137
# Docs are always built on a specific Python version; see RTD and tox config files,
133138
# and the docs contribution guide.
134139
docs = [
135140
"beeware-docs-tools @ git+https://github.com/beeware/beeware-docs-tools",
136-
"setuptools-scm==9.2.0",
137141
"tabulate==0.9.0",
138142
"PyYAML==6.0.3"
139143
]

tox.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ allowlist_externals =
3333
bash
3434
commands =
3535
# TOGA_INSTALL_COMMAND is set to a bash command by the CI workflow
36-
{env:TOGA_INSTALL_COMMAND:uv pip install {tox_root}{/}core {tox_root}{/}dummy {tox_root}{/}travertino --group dev}
36+
{env:TOGA_INSTALL_COMMAND:uv pip install {tox_root}{/}core {tox_root}{/}dummy {tox_root}{/}travertino --group test}
3737
!fast-!cov : python -m pytest {posargs:-vv --color yes}
3838
cov : python -m coverage run -m pytest {posargs:-vv --color yes}
3939
fast : python -m pytest {posargs:-vv --color yes -n auto}
@@ -65,7 +65,7 @@ setenv =
6565
commands_pre = python --version
6666
commands =
6767
# TOGA_INSTALL_COMMAND is set to a bash command by the CI workflow
68-
{env:TOGA_INSTALL_COMMAND:uv pip install {tox_root}{/}travertino --group dev}
68+
{env:TOGA_INSTALL_COMMAND:uv pip install {tox_root}{/}travertino --group test}
6969
-python -m coverage combine {env:PACKAGE_RCFILE} {env:COMBINE_KEEP}
7070
html: python -m coverage html {env:PROJECT_RCFILE} --skip-covered --skip-empty
7171
python -m coverage report {env:PROJECT_RCFILE} --fail-under=100
@@ -77,7 +77,7 @@ skip_install = True
7777
setenv =
7878
TOGA_BACKEND = toga_dummy
7979
commands =
80-
uv pip install toga_core==0.4.8 toga_dummy==0.4.8 --group dev
80+
uv pip install toga_core==0.4.8 toga_dummy==0.4.8 --group test
8181
# Install demo without dependencies, to avoid an unnecessary backend install.
8282
uv pip install --no-deps toga_demo==0.4.8
8383
# Overwrite the installed version of Travertino with the one being tested.

travertino/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ classifiers = [
4444
[dependency-groups]
4545
# Extras used by developers *of* Toga are pinned to specific versions to
4646
# ensure environment consistency.
47-
dev = [
47+
test = [
4848
"coverage[toml] == 7.11.3",
4949
"coverage-conditional-plugin == 0.9.0",
5050
"Pillow == 12.0.0",

0 commit comments

Comments
 (0)