Skip to content

Commit e1f81bf

Browse files
committed
Fix many typos
1 parent 2bf32f5 commit e1f81bf

File tree

12 files changed

+22
-22
lines changed

12 files changed

+22
-22
lines changed

NEWS.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Bug Fixes
5858
the index url contains the username, but the password comes
5959
from an external source, such as keyring. (`#10269 <https://github.com/pypa/pip/issues/10269>`_)
6060
- Fix double unescape of HTML ``data-requires-python`` and ``data-yanked`` attributes. (`#10378 <https://github.com/pypa/pip/issues/10378>`_)
61-
- New resolver: Fixes depth ordering of packages during resolution, e.g. a dependency 2 levels deep will be ordered before a dependecy 3 levels deep. (`#10482 <https://github.com/pypa/pip/issues/10482>`_)
61+
- New resolver: Fixes depth ordering of packages during resolution, e.g. a dependency 2 levels deep will be ordered before a dependency 3 levels deep. (`#10482 <https://github.com/pypa/pip/issues/10482>`_)
6262
- Correctly indent metadata preparation messages in pip output. (`#10524 <https://github.com/pypa/pip/issues/10524>`_)
6363

6464
Vendored Libraries

docs/html/development/architecture/anatomy.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ The ``README``, license, ``pyproject.toml``, ``setup.py``, and so on are in the
4646

4747
* ``__init__.py``
4848
* ``conftest.py``
49-
* ``data/`` *[test data for running tests -- pesudo package index in it! Lots of small packages that are invalid or are valid. Test fixtures. Used by functional tests]*
49+
* ``data/`` *[test data for running tests -- pseudo package index in it! Lots of small packages that are invalid or are valid. Test fixtures. Used by functional tests]*
5050
* ``functional/`` *[functional tests of pip’s CLI -- end-to-end, invoke pip in subprocess & check results of execution against desired result. This also is what makes test suite slow]*
5151
* ``lib/`` *[helpers for tests]*
5252
* ``unit/`` *[unit tests -- fast and small and nice!]*

docs/html/development/issue-triage.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ The lifecycle of an issue (bug or support) generally looks like:
137137
#. waiting for triage (marked with label ``triage``)
138138
#. confirming issue - some discussion with the user, gathering
139139
details, trying to reproduce the issue (may be marked with a specific
140-
category, ``S: awaiting-respose``, ``S: discussion-needed``, or
140+
category, ``S: awaiting-response``, ``S: discussion-needed``, or
141141
``S: need-repro``)
142142
#. confirmed - the issue is pretty consistently reproducible in a
143143
straightforward way, or a mechanism that could be causing the issue has been

news/FD80732D-5DC1-4B68-BDB5-0283EF9EBC3A.trivial.rst

Whitespace-only changes.

src/pip/_internal/req/req_install.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ def check_if_exists(self, use_user_site: bool) -> None:
410410
if not existing_dist:
411411
return
412412

413-
# pkg_resouces may contain a different copy of packaging.version from
413+
# pkg_resources may contain a different copy of packaging.version from
414414
# pip in if the downstream distributor does a poor job debundling pip.
415415
# We avoid existing_dist.parsed_version and let SpecifierSet.contains
416416
# parses the version instead.

src/pip/_internal/resolution/resolvelib/factory.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ def _get_installed_candidate() -> Optional[Candidate]:
260260
extras=extras,
261261
template=template,
262262
)
263-
# The candidate is a known incompatiblity. Don't use it.
263+
# The candidate is a known incompatibility. Don't use it.
264264
if id(candidate) in incompatible_ids:
265265
return None
266266
return candidate
@@ -374,7 +374,7 @@ def find_candidates(
374374
)
375375

376376
# Add explicit candidates from constraints. We only do this if there are
377-
# kown ireqs, which represent requirements not already explicit. If
377+
# known ireqs, which represent requirements not already explicit. If
378378
# there are no ireqs, we're constraining already-explicit requirements,
379379
# which is handled later when we return the explicit candidates.
380380
if ireqs:
@@ -615,7 +615,7 @@ def get_installation_error(
615615
]
616616
if requires_python_causes:
617617
# The comprehension above makes sure all Requirement instances are
618-
# RequiresPythonRequirement, so let's cast for convinience.
618+
# RequiresPythonRequirement, so let's cast for convenience.
619619
return self._report_requires_python_error(
620620
cast("Sequence[ConflictCause]", requires_python_causes),
621621
)

src/pip/_internal/resolution/resolvelib/provider.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ def get_preference( # type: ignore
129129
# (Most projects specify it only to request for an installer feature,
130130
# which does not work, but that's another topic.) Intentionally
131131
# delaying Setuptools helps reduce branches the resolver has to check.
132-
# This serves as a temporary fix for issues like "apache-airlfow[all]"
132+
# This serves as a temporary fix for issues like "apache-airflow[all]"
133133
# while we work on "proper" branch pruning techniques.
134134
delay_this = identifier == "setuptools"
135135

@@ -154,7 +154,7 @@ def _get_constraint(self, identifier: str) -> Constraint:
154154
if identifier in self._constraints:
155155
return self._constraints[identifier]
156156

157-
# HACK: Theoratically we should check whether this identifier is a valid
157+
# HACK: Theoretically we should check whether this identifier is a valid
158158
# "NAME[EXTRAS]" format, and parse out the name part with packaging or
159159
# some regular expression. But since pip's resolver only spits out
160160
# three kinds of identifiers: normalized PEP 503 names, normalized names

src/pip/_internal/resolution/resolvelib/requirements.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ def __repr__(self) -> str:
2121

2222
@property
2323
def project_name(self) -> NormalizedName:
24-
# No need to canonicalise - the candidate did this
24+
# No need to canonicalize - the candidate did this
2525
return self.candidate.project_name
2626

2727
@property
2828
def name(self) -> str:
29-
# No need to canonicalise - the candidate did this
29+
# No need to canonicalize - the candidate did this
3030
return self.candidate.name
3131

3232
def format_for_error(self) -> str:

tests/functional/test_install_config.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def test_options_from_env_vars(script):
2323
result = script.pip("install", "-vvv", "INITools", expect_error=True)
2424
assert "Ignoring indexes:" in result.stdout, str(result)
2525
msg = "DistributionNotFound: No matching distribution found for INITools"
26-
# Case insensitive as the new resolver canonicalises the project name
26+
# Case insensitive as the new resolver canonicalizes the project name
2727
assert msg.lower() in result.stdout.lower(), str(result)
2828

2929

@@ -70,7 +70,7 @@ def test_env_vars_override_config_file(script, virtualenv):
7070
)
7171
result = script.pip("install", "-vvv", "INITools", expect_error=True)
7272
msg = "DistributionNotFound: No matching distribution found for INITools"
73-
# Case insensitive as the new resolver canonicalises the project name
73+
# Case insensitive as the new resolver canonicalizes the project name
7474
assert msg.lower() in result.stdout.lower(), str(result)
7575
script.environ["PIP_NO_INDEX"] = "0"
7676
virtualenv.clear()
@@ -218,7 +218,7 @@ def test_options_from_venv_config(script, virtualenv):
218218
result = script.pip("install", "-vvv", "INITools", expect_error=True)
219219
assert "Ignoring indexes:" in result.stdout, str(result)
220220
msg = "DistributionNotFound: No matching distribution found for INITools"
221-
# Case insensitive as the new resolver canonicalises the project name
221+
# Case insensitive as the new resolver canonicalizes the project name
222222
assert msg.lower() in result.stdout.lower(), str(result)
223223

224224

tests/functional/test_install_upgrade.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def test_only_if_needed_does_upgrade_deps_when_no_longer_satisfied(script):
8383

8484

8585
@pytest.mark.usefixtures("with_wheel")
86-
def test_eager_does_upgrade_dependecies_when_currently_satisfied(script):
86+
def test_eager_does_upgrade_dependencies_when_currently_satisfied(script):
8787
"""
8888
It does upgrade a dependency even if it already satisfies the requirements.
8989
@@ -102,7 +102,7 @@ def test_eager_does_upgrade_dependecies_when_currently_satisfied(script):
102102

103103

104104
@pytest.mark.usefixtures("with_wheel")
105-
def test_eager_does_upgrade_dependecies_when_no_longer_satisfied(script):
105+
def test_eager_does_upgrade_dependencies_when_no_longer_satisfied(script):
106106
"""
107107
It does upgrade a dependency if it no longer satisfies the requirements.
108108

tests/functional/test_new_resolver.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -619,7 +619,7 @@ def test_new_resolver_handles_prerelease(
619619
([], ["pkg", "dep; os_name == 'nonexist_os'"]),
620620
],
621621
)
622-
def test_new_reolver_skips_marker(script, pkg_deps, root_deps):
622+
def test_new_resolver_skips_marker(script, pkg_deps, root_deps):
623623
create_basic_wheel_for_package(script, "pkg", "1.0", depends=pkg_deps)
624624
create_basic_wheel_for_package(script, "dep", "1.0")
625625

@@ -781,14 +781,14 @@ def test_new_resolver_constraint_only_marker_match(script):
781781
create_basic_wheel_for_package(script, "pkg", "2.0")
782782
create_basic_wheel_for_package(script, "pkg", "3.0")
783783

784-
constrants_content = textwrap.dedent(
784+
constraints_content = textwrap.dedent(
785785
"""
786786
pkg==1.0; python_version == "{ver[0]}.{ver[1]}" # Always satisfies.
787787
pkg==2.0; python_version < "0" # Never satisfies.
788788
"""
789789
).format(ver=sys.version_info)
790790
constraints_txt = script.scratch_path / "constraints.txt"
791-
constraints_txt.write_text(constrants_content)
791+
constraints_txt.write_text(constraints_content)
792792

793793
script.pip(
794794
"install",

tests/functional/test_new_resolver_errors.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ def test_new_resolver_conflict_requirements_file(tmpdir, script):
4141
def test_new_resolver_conflict_constraints_file(tmpdir, script):
4242
create_basic_wheel_for_package(script, "pkg", "1.0")
4343

44-
constrats_file = tmpdir.joinpath("constraints.txt")
45-
constrats_file.write_text("pkg!=1.0")
44+
constraints_file = tmpdir.joinpath("constraints.txt")
45+
constraints_file.write_text("pkg!=1.0")
4646

4747
result = script.pip(
4848
"install",
@@ -51,7 +51,7 @@ def test_new_resolver_conflict_constraints_file(tmpdir, script):
5151
"--find-links",
5252
script.scratch_path,
5353
"-c",
54-
constrats_file,
54+
constraints_file,
5555
"pkg==1.0",
5656
expect_error=True,
5757
)

0 commit comments

Comments
 (0)