Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -271,9 +271,9 @@
### 🚀 New Features

- The Ruff linter and formatter can now be configured independently. When using the `usethis tool ruff` command, you can now specify whether to add or remove the linter or formatter independently using the `--linter` and `--formatter` options. This allows for more granular control over which components of Ruff are used in your project. By default, as before, both the linter and formatter will be added or removed together.
This introduces a change in the way that Bitbucket Pipeline steps will be configured for Ruff, by having the linter and formatter as separate steps.
This introduces a change in the way that Bitbucket Pipelines steps will be configured for Ruff, by having the linter and formatter as separate steps.

- Integrations with Ruff for pre-commit and Bitbucket pipelines will determine whether the linter or formatter is being used based on the presence of the `ruff.lint` and `ruff.format` keys the active Ruff configuration file.
- Integrations with Ruff for pre-commit and Bitbucket Pipelines will determine whether the linter or formatter is being used based on the presence of the `ruff.lint` and `ruff.format` keys the active Ruff configuration file.

### 🐞 Bug Fixes

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ $ uvx usethis tool pytest
☐ Run 'uv run pytest' to run the tests.
```

To configure Bitbucket pipelines, run:
To configure Bitbucket Pipelines, run:

```console
$ uvx usethis ci bitbucket
Expand Down
2 changes: 1 addition & 1 deletion docs/example-usage.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ $ uvx usethis tool pytest
☐ Run 'uv run pytest' to run the tests.
```

To configure Bitbucket pipelines, run:
To configure Bitbucket Pipelines, run:

```console
$ uvx usethis ci bitbucket
Expand Down
2 changes: 1 addition & 1 deletion src/usethis/_integrations/ci/bitbucket/schema_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def step1tostep(step1: Step1) -> Step:
"""Promoting Step1 to a standard Step.

This is necessary because there is some unusual inconsistency in the JSON Schema
for Bitbucket pipelines that means conditions are not constrained by type when
for Bitbucket Pipelines that means conditions are not constrained by type when
occurring in a stage, whereas at time of writing they are constrained in all other
circumstances. This gives rise to strange naming in the output of
datamodel-code-generator (which is repeated here for consistency).
Expand Down
2 changes: 1 addition & 1 deletion src/usethis/_tool/impl/pytest.py
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ def get_managed_bitbucket_step_names(self) -> list[str]:
return sorted(names)

def update_bitbucket_steps(self) -> None:
"""Update the pytest-related Bitbucket pipelines steps.
"""Update the pytest-related Bitbucket Pipelines steps.

A bespoke function is needed here to ensure we inform the user about the need
to manually add the dependencies if they are not using a backend.
Expand Down
4 changes: 2 additions & 2 deletions src/usethis/_ui/interface/ci.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
)


@app.command(help="Use Bitbucket pipelines for CI.")
@app.command(help="Use Bitbucket Pipelines for CI.")
def bitbucket(
remove: bool = typer.Option(
False, "--remove", help="Remove Bitbucket pipelines CI instead of adding it."
False, "--remove", help="Remove Bitbucket Pipelines CI instead of adding it."
),
offline: bool = offline_opt,
quiet: bool = quiet_opt,
Expand Down
2 changes: 1 addition & 1 deletion tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def _uv_init_dir(tmp_path_factory: pytest.TempPathFactory) -> Path:
"--lib",
"--python",
# Deliberately kept at at a version other than the latest version to
# check range checks e.g. for Bitbucket pipelines matrixes.
# check range checks e.g. for Bitbucket Pipelines matrixes.
"3.13",
"--vcs",
"none",
Expand Down