Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typos discovered by codespell #3113

Merged
merged 2 commits into from
Sep 6, 2023
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
15 changes: 11 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,25 @@ repos:
rev: 23.7.0
hooks:
- id: black
- repo: https://github.com/codespell-project/codespell
rev: v2.2.5
hooks:
- id: codespell
args: ["--ignore-words-list", "crate,releas", "--skip", "*.svg"]
additional_dependencies:
- tomli
- repo: https://github.com/tox-dev/tox-ini-fmt
rev: "1.3.1"
rev: 1.3.1
hooks:
- id: tox-ini-fmt
args: ["-p", "fix"]
- repo: https://github.com/tox-dev/pyproject-fmt
rev: "1.1.0"
rev: 1.1.0
hooks:
- id: pyproject-fmt
additional_dependencies: ["tox>=4.10"]
- repo: https://github.com/pre-commit/mirrors-prettier
rev: "v3.0.3"
rev: v3.0.3
hooks:
- id: prettier
args: ["--print-width=120", "--prose-wrap=always"]
Expand All @@ -29,7 +36,7 @@ repos:
- id: blacken-docs
additional_dependencies: [black==23.7]
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: "v0.0.287"
rev: v0.0.287
hooks:
- id: ruff
args: [--fix, --exit-non-zero-on-fix]
Expand Down
6 changes: 3 additions & 3 deletions docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ v4.6.0 (2023-06-05)

Features - 4.6.0
~~~~~~~~~~~~~~~~
- Addded ``--list-dependencies`` and ``--no-list-dependencies`` CLI parameters.
- Added ``--list-dependencies`` and ``--no-list-dependencies`` CLI parameters.
If unspecified, defaults to listing when in CI, but not otherwise. (:issue:`3024`)

Misc - 4.6.0
Expand Down Expand Up @@ -273,7 +273,7 @@ Bugfixes - 4.4.0
esoteric quoting.

To make this transition easier, on Windows, the backslash path separator will not treated as an escape character unless
it preceeds a quote, whitespace, or another backslash chracter. This allows paths to mostly be written in single or
it precedes a quote, whitespace, or another backslash character. This allows paths to mostly be written in single or
double backslash style.

Note that **double-backslash will no longer be escaped to a single backslash in substitutions**, instead the double
Expand Down Expand Up @@ -338,7 +338,7 @@ v4.3.2 (2023-01-16)

Bugfixes - 4.3.2
~~~~~~~~~~~~~~~~
- Fix regression introduced in 4.3.0 which occured when a substitution expression
- Fix regression introduced in 4.3.0 which occurred when a substitution expression
for an environment variable that had previously been substituted appears in the
ini file after a substitution expression for a different environment variable.
This situation erroneously resulted in an exception about "circular chain
Expand Down
Empty file added docs/changelog/3113.misc.rst
Empty file.
2 changes: 1 addition & 1 deletion docs/config.rst
Original file line number Diff line number Diff line change
Expand Up @@ -935,7 +935,7 @@ It's possible to inject a config value only when tox is running in interactive s
{tty:ON_VALUE:OFF_VALUE}

The first value is the value to inject when the interactive terminal is
available, the second value is the value to use when it's not (optiona). A good
available, the second value is the value to use when it's not (optional). A good
use case for this is e.g. passing in the ``--pdb`` flag for pytest.

.. _`command positional substitution`:
Expand Down
2 changes: 1 addition & 1 deletion src/tox/tox_env/python/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def version_dot(self) -> str:
PY_FACTORS_RE = re.compile(
r"""
^(?!py$) # don't match 'py' as it doesn't provide any info
(?P<impl>py|pypy|cpython|jython|rustpython|ironpython) # the interpeter; most users will simply use 'py'
(?P<impl>py|pypy|cpython|jython|rustpython|ironpython) # the interpreter; most users will simply use 'py'
(?P<version>[2-9]\.?[0-9]?[0-9]?)?$ # the version; one of: MAJORMINOR, MAJOR.MINOR
""",
re.VERBOSE,
Expand Down
2 changes: 1 addition & 1 deletion src/tox/tox_env/python/pip/pip_install.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def _register_config(self) -> None:
keys=["list_dependencies_command"],
of_type=Command,
default=Command(["python", "-m", "pip", "freeze", "--all"]),
desc="command used to list isntalled packages",
desc="command used to list installed packages",
)

def default_install_command(self, conf: Config, env_name: str | None) -> Command: # noqa: ARG002
Expand Down