Skip to content

Commit dbf351d

Browse files
Use --no-default-groups in preference to --no-dev (#765)
* Use `--no-default-groups` in preference to `--no-dev` * Catch all cases * Fix whitespace issue * Fix stray test
1 parent e8d49e0 commit dbf351d

4 files changed

Lines changed: 23 additions & 22 deletions

File tree

src/usethis/_core/tool.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ def use_requirements_txt(*, remove: bool = False, how: bool = False) -> None:
342342
[
343343
"export",
344344
"--frozen",
345-
"--no-dev",
345+
"--no-default-groups",
346346
"--output-file=requirements.txt",
347347
],
348348
change_toml=False,

src/usethis/_tool/impl/requirements_txt.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def print_how_to_use(self) -> None:
4141
box_print("Install uv to use 'uv export'.")
4242

4343
box_print(
44-
"Run 'uv export --no-dev -o=requirements.txt' to write 'requirements.txt'."
44+
"Run 'uv export --no-default-groups -o=requirements.txt' to write 'requirements.txt'."
4545
)
4646

4747
def get_dev_deps(self, *, unconditional: bool = False) -> list[Dependency]:
@@ -60,7 +60,7 @@ def get_pre_commit_config(self) -> PreCommitConfig:
6060
name="uv-export",
6161
files="^uv\\.lock$",
6262
pass_filenames=False,
63-
entry="uv export --frozen --offline --quiet --no-dev -o=requirements.txt",
63+
entry="uv export --frozen --offline --quiet --no-default-groups -o=requirements.txt",
6464
language=Language("system"),
6565
require_serial=True,
6666
)

tests/usethis/_core/test_core_tool.py

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1686,11 +1686,11 @@ def test_requirements_txt_used(
16861686

16871687
# Assert
16881688
out, _ = capfd.readouterr()
1689-
assert out == (
1690-
"☐ Run 'uv run --with pre-commit pre-commit uninstall' to deregister pre-commit.\n"
1691-
"✔ Removing '.pre-commit-config.yaml'.\n"
1692-
"✔ Removing dependency 'pre-commit' from the 'dev' group in 'pyproject.toml'.\n"
1693-
"☐ Run 'uv export --no-dev -o=requirements.txt' to write 'requirements.txt'.\n"
1689+
assert out.replace("\n", "") == (
1690+
"☐ Run 'uv run --with pre-commit pre-commit uninstall' to deregister pre-commit."
1691+
"✔ Removing '.pre-commit-config.yaml'."
1692+
"✔ Removing dependency 'pre-commit' from the 'dev' group in 'pyproject.toml'."
1693+
"☐ Run 'uv export --no-default-groups -o=requirements.txt' to write 'requirements.txt'."
16941694
)
16951695

16961696
@pytest.mark.usefixtures("_vary_network_conn")
@@ -2499,11 +2499,11 @@ def test_start_from_nothing(
24992499
assert (tmp_path / "requirements.txt").exists()
25002500
out, err = capfd.readouterr()
25012501
assert not err
2502-
assert out == (
2503-
"✔ Writing 'pyproject.toml'.\n"
2504-
"✔ Writing 'uv.lock'.\n"
2505-
"✔ Writing 'requirements.txt'.\n"
2506-
"☐ Run 'uv export --no-dev -o=requirements.txt' to write 'requirements.txt'.\n"
2502+
assert out.replace("\n", "") == (
2503+
"✔ Writing 'pyproject.toml'."
2504+
"✔ Writing 'uv.lock'."
2505+
"✔ Writing 'requirements.txt'."
2506+
"☐ Run 'uv export --no-default-groups -o=requirements.txt' to write 'requirements.txt'."
25072507
)
25082508

25092509
def test_start_from_uv_init(
@@ -2521,10 +2521,10 @@ def test_start_from_uv_init(
25212521
assert (uv_init_dir / "requirements.txt").exists()
25222522
out, err = capfd.readouterr()
25232523
assert not err
2524-
assert out == (
2525-
"✔ Writing 'uv.lock'.\n"
2526-
"✔ Writing 'requirements.txt'.\n"
2527-
"☐ Run 'uv export --no-dev -o=requirements.txt' to write 'requirements.txt'.\n"
2524+
assert out.replace("\n", "") == (
2525+
"✔ Writing 'uv.lock'."
2526+
"✔ Writing 'requirements.txt'."
2527+
"☐ Run 'uv export --no-default-groups -o=requirements.txt' to write 'requirements.txt'."
25282528
)
25292529

25302530
def test_start_from_uv_locked(
@@ -2545,9 +2545,9 @@ def test_start_from_uv_locked(
25452545
assert (uv_init_dir / "requirements.txt").exists()
25462546
out, err = capfd.readouterr()
25472547
assert not err
2548-
assert out == (
2549-
"✔ Writing 'requirements.txt'.\n"
2550-
"☐ Run 'uv export --no-dev -o=requirements.txt' to write 'requirements.txt'.\n"
2548+
assert out.replace("\n", "") == (
2549+
"✔ Writing 'requirements.txt'."
2550+
"☐ Run 'uv export --no-default-groups -o=requirements.txt' to write 'requirements.txt'."
25512551
)
25522552

25532553
@pytest.mark.usefixtures("_vary_network_conn")
@@ -2577,7 +2577,7 @@ def test_pre_commit(
25772577
- id: uv-export
25782578
name: uv-export
25792579
files: ^uv\\.lock$
2580-
entry: uv export --frozen --offline --quiet --no-dev -o=requirements.txt
2580+
entry: uv export --frozen --offline --quiet --no-default-groups -o=requirements.txt
25812581
language: system
25822582
pass_filenames: false
25832583
require_serial: true

tests/usethis/_interface/test_tool.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,8 @@ def test_how(self, tmp_path: Path):
344344
result.output
345345
== """\
346346
☐ Install uv to use 'uv export'.
347-
☐ Run 'uv export --no-dev -o=requirements.txt' to write 'requirements.txt'.
347+
☐ Run 'uv export --no-default-groups -o=requirements.txt' to write
348+
'requirements.txt'.
348349
"""
349350
)
350351

0 commit comments

Comments
 (0)