Merge pull request #10569 from aphedges/fix-typos

Author: pradyunsg

NEWS.rst

@@ -58,7 +58,7 @@ Bug Fixes
   the index url contains the username, but the password comes
   from an external source, such as keyring. (`#10269 <https://github.com/pypa/pip/issues/10269>`_)
 - Fix double unescape of HTML ``data-requires-python`` and ``data-yanked`` attributes. (`#10378 <https://github.com/pypa/pip/issues/10378>`_)
-- 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>`_)
+- 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>`_)
 - Correctly indent metadata preparation messages in pip output. (`#10524 <https://github.com/pypa/pip/issues/10524>`_)
 
 Vendored Libraries

docs/html/development/architecture/anatomy.rst

@@ -46,7 +46,7 @@ The ``README``, license, ``pyproject.toml``, ``setup.py``, and so on are in the
 
   * ``__init__.py``
   * ``conftest.py``
-  * ``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]*
+  * ``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]*
   * ``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]*
   * ``lib/`` *[helpers for tests]*
   * ``unit/`` *[unit tests -- fast and small and nice!]*

docs/html/development/issue-triage.rst

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

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

@@ -410,7 +410,7 @@ def check_if_exists(self, use_user_site: bool) -> None:
         if not existing_dist:
             return
 
-        # pkg_resouces may contain a different copy of packaging.version from
+        # pkg_resources may contain a different copy of packaging.version from
         # pip in if the downstream distributor does a poor job debundling pip.
         # We avoid existing_dist.parsed_version and let SpecifierSet.contains
         # parses the version instead.

src/pip/_internal/req/req_install.py

@@ -260,7 +260,7 @@ def _get_installed_candidate() -> Optional[Candidate]:
                 extras=extras,
                 template=template,
             )
-            # The candidate is a known incompatiblity. Don't use it.
+            # The candidate is a known incompatibility. Don't use it.
             if id(candidate) in incompatible_ids:
                 return None
             return candidate
@@ -374,7 +374,7 @@ def find_candidates(
             )
 
         # Add explicit candidates from constraints. We only do this if there are
-        # kown ireqs, which represent requirements not already explicit. If
+        # known ireqs, which represent requirements not already explicit. If
         # there are no ireqs, we're constraining already-explicit requirements,
         # which is handled later when we return the explicit candidates.
         if ireqs:
@@ -615,7 +615,7 @@ def get_installation_error(
         ]
         if requires_python_causes:
             # The comprehension above makes sure all Requirement instances are
-            # RequiresPythonRequirement, so let's cast for convinience.
+            # RequiresPythonRequirement, so let's cast for convenience.
             return self._report_requires_python_error(
                 cast("Sequence[ConflictCause]", requires_python_causes),
             )

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

@@ -129,7 +129,7 @@ def get_preference(  # type: ignore
         # (Most projects specify it only to request for an installer feature,
         # which does not work, but that's another topic.) Intentionally
         # delaying Setuptools helps reduce branches the resolver has to check.
-        # This serves as a temporary fix for issues like "apache-airlfow[all]"
+        # This serves as a temporary fix for issues like "apache-airflow[all]"
         # while we work on "proper" branch pruning techniques.
         delay_this = identifier == "setuptools"
 
@@ -154,7 +154,7 @@ def _get_constraint(self, identifier: str) -> Constraint:
         if identifier in self._constraints:
             return self._constraints[identifier]
 
-        # HACK: Theoratically we should check whether this identifier is a valid
+        # HACK: Theoretically we should check whether this identifier is a valid
         # "NAME[EXTRAS]" format, and parse out the name part with packaging or
         # some regular expression. But since pip's resolver only spits out
         # three kinds of identifiers: normalized PEP 503 names, normalized names

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

@@ -21,12 +21,12 @@ def __repr__(self) -> str:
 
     @property
     def project_name(self) -> NormalizedName:
-        # No need to canonicalise - the candidate did this
+        # No need to canonicalize - the candidate did this
         return self.candidate.project_name
 
     @property
     def name(self) -> str:
-        # No need to canonicalise - the candidate did this
+        # No need to canonicalize - the candidate did this
         return self.candidate.name
 
     def format_for_error(self) -> str:

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

@@ -23,7 +23,7 @@ def test_options_from_env_vars(script):
     result = script.pip("install", "-vvv", "INITools", expect_error=True)
     assert "Ignoring indexes:" in result.stdout, str(result)
     msg = "DistributionNotFound: No matching distribution found for INITools"
-    # Case insensitive as the new resolver canonicalises the project name
+    # Case insensitive as the new resolver canonicalizes the project name
     assert msg.lower() in result.stdout.lower(), str(result)
 
 
@@ -70,7 +70,7 @@ def test_env_vars_override_config_file(script, virtualenv):
     )
     result = script.pip("install", "-vvv", "INITools", expect_error=True)
     msg = "DistributionNotFound: No matching distribution found for INITools"
-    # Case insensitive as the new resolver canonicalises the project name
+    # Case insensitive as the new resolver canonicalizes the project name
     assert msg.lower() in result.stdout.lower(), str(result)
     script.environ["PIP_NO_INDEX"] = "0"
     virtualenv.clear()
@@ -218,7 +218,7 @@ def test_options_from_venv_config(script, virtualenv):
     result = script.pip("install", "-vvv", "INITools", expect_error=True)
     assert "Ignoring indexes:" in result.stdout, str(result)
     msg = "DistributionNotFound: No matching distribution found for INITools"
-    # Case insensitive as the new resolver canonicalises the project name
+    # Case insensitive as the new resolver canonicalizes the project name
     assert msg.lower() in result.stdout.lower(), str(result)
 
 

tests/functional/test_install_config.py

@@ -83,7 +83,7 @@ def test_only_if_needed_does_upgrade_deps_when_no_longer_satisfied(script):
 
 
 @pytest.mark.usefixtures("with_wheel")
-def test_eager_does_upgrade_dependecies_when_currently_satisfied(script):
+def test_eager_does_upgrade_dependencies_when_currently_satisfied(script):
     """
     It does upgrade a dependency even if it already satisfies the requirements.
 
@@ -102,7 +102,7 @@ def test_eager_does_upgrade_dependecies_when_currently_satisfied(script):
 
 
 @pytest.mark.usefixtures("with_wheel")
-def test_eager_does_upgrade_dependecies_when_no_longer_satisfied(script):
+def test_eager_does_upgrade_dependencies_when_no_longer_satisfied(script):
     """
     It does upgrade a dependency if it no longer satisfies the requirements.
 

tests/functional/test_install_upgrade.py

@@ -619,7 +619,7 @@ def test_new_resolver_handles_prerelease(
         ([], ["pkg", "dep; os_name == 'nonexist_os'"]),
     ],
 )
-def test_new_reolver_skips_marker(script, pkg_deps, root_deps):
+def test_new_resolver_skips_marker(script, pkg_deps, root_deps):
     create_basic_wheel_for_package(script, "pkg", "1.0", depends=pkg_deps)
     create_basic_wheel_for_package(script, "dep", "1.0")
 
@@ -781,14 +781,14 @@ def test_new_resolver_constraint_only_marker_match(script):
     create_basic_wheel_for_package(script, "pkg", "2.0")
     create_basic_wheel_for_package(script, "pkg", "3.0")
 
-    constrants_content = textwrap.dedent(
+    constraints_content = textwrap.dedent(
         """
         pkg==1.0; python_version == "{ver[0]}.{ver[1]}"  # Always satisfies.
         pkg==2.0; python_version < "0"  # Never satisfies.
         """
     ).format(ver=sys.version_info)
     constraints_txt = script.scratch_path / "constraints.txt"
-    constraints_txt.write_text(constrants_content)
+    constraints_txt.write_text(constraints_content)
 
     script.pip(
         "install",

tests/functional/test_new_resolver.py

@@ -41,8 +41,8 @@ def test_new_resolver_conflict_requirements_file(tmpdir, script):
 def test_new_resolver_conflict_constraints_file(tmpdir, script):
     create_basic_wheel_for_package(script, "pkg", "1.0")
 
-    constrats_file = tmpdir.joinpath("constraints.txt")
-    constrats_file.write_text("pkg!=1.0")
+    constraints_file = tmpdir.joinpath("constraints.txt")
+    constraints_file.write_text("pkg!=1.0")
 
     result = script.pip(
         "install",
@@ -51,7 +51,7 @@ def test_new_resolver_conflict_constraints_file(tmpdir, script):
         "--find-links",
         script.scratch_path,
         "-c",
-        constrats_file,
+        constraints_file,
         "pkg==1.0",
         expect_error=True,
     )