summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGES.rst6
-rw-r--r--changelog.d/README.rst2
-rw-r--r--docs/pkg_resources.rst2
-rw-r--r--docs/python 2 sunset.rst2
-rw-r--r--docs/userguide/dependency_management.rst2
-rw-r--r--docs/userguide/quickstart.rst8
-rw-r--r--pkg_resources/_vendor/pyparsing.py2
-rw-r--r--setuptools/_distutils/ccompiler.py2
-rw-r--r--setuptools/_imp.py4
-rw-r--r--setuptools/_vendor/pyparsing.py2
-rw-r--r--setuptools/package_index.py2
-rw-r--r--setuptools/tests/environment.py2
-rw-r--r--setuptools/tests/test_easy_install.py4
-rw-r--r--setuptools/tests/test_windows_wrappers.py2
14 files changed, 21 insertions, 21 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index f7dd6a75..60adfd3d 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -213,7 +213,7 @@ v51.2.0
Changes
^^^^^^^
-* #2493: Use importlib.import_module() rather than the deprectated loader.load_module()
+* #2493: Use importlib.import_module() rather than the deprecated loader.load_module()
in pkg_resources namespace delaration -- by :user:`encukou`
Documentation changes
@@ -4295,7 +4295,7 @@ how it parses version numbers.
(platform.mac_ver() fails)
* Distribute #103: test_get_script_header_jython_workaround not run
anymore under py3 with C or POSIX local. Contributed by Arfrever.
-* Distribute #104: remvoved the assertion when the installation fails,
+* Distribute #104: removed the assertion when the installation fails,
with a nicer message for the end user.
* Distribute #100: making sure there's no SandboxViolation when
the setup script patches setuptools.
@@ -4432,7 +4432,7 @@ setuptools
bootstrapping
^^^^^^^^^^^^^
-* The boostrap process leave setuptools alone if detected in the system
+* The bootstrap process leave setuptools alone if detected in the system
and --root or --prefix is provided, but is not in the same location.
This closes Distribute #10.
diff --git a/changelog.d/README.rst b/changelog.d/README.rst
index 30831edc..49b4d563 100644
--- a/changelog.d/README.rst
+++ b/changelog.d/README.rst
@@ -76,7 +76,7 @@ File :file:`changelog.d/1354.misc.rst`:
.. code-block:: rst
- Added ``towncrier`` for changelog managment -- by :user:`pganssle`
+ Added ``towncrier`` for changelog management -- by :user:`pganssle`
File :file:`changelog.d/2355.change.rst`:
diff --git a/docs/pkg_resources.rst b/docs/pkg_resources.rst
index 994bea6f..2ba10134 100644
--- a/docs/pkg_resources.rst
+++ b/docs/pkg_resources.rst
@@ -1229,7 +1229,7 @@ Resource Extraction
If you are implementing an ``IResourceProvider`` and/or ``IMetadataProvider``
for a new distribution archive format, you may need to use the following
-``IResourceManager`` methods to co-ordinate extraction of resources to the
+``IResourceManager`` methods to coordinate extraction of resources to the
filesystem. If you're not implementing an archive format, however, you have
no need to use these methods. Unlike the other methods listed above, they are
*not* available as top-level functions tied to the global ``ResourceManager``;
diff --git a/docs/python 2 sunset.rst b/docs/python 2 sunset.rst
index f7b7ee25..225d6551 100644
--- a/docs/python 2 sunset.rst
+++ b/docs/python 2 sunset.rst
@@ -50,7 +50,7 @@ versions of Setuptools installed, here are some things to try.
Then ``pip install setuptools``.
2. If possible, attempt to replicate the problem in a second environment
(virtual machine, friend's computer, etc). If the issue is isolated to just
- one unique enviornment, first determine what is different about those
+ one unique environment, first determine what is different about those
environments (or reinstall/reset the failing one to defaults).
3. End users who are not themselves the maintainers for the package they are
trying to install should contact the support channels for the relevant
diff --git a/docs/userguide/dependency_management.rst b/docs/userguide/dependency_management.rst
index 188083e0..c6333a10 100644
--- a/docs/userguide/dependency_management.rst
+++ b/docs/userguide/dependency_management.rst
@@ -250,7 +250,7 @@ dependencies for it to work:
}
)
-The name ``PDF`` is an arbitary identifier of such a list of dependencies, to
+The name ``PDF`` is an arbitrary identifier of such a list of dependencies, to
which other components can refer and have them installed. There are two common
use cases.
diff --git a/docs/userguide/quickstart.rst b/docs/userguide/quickstart.rst
index a9f0bbae..5d4dd37b 100644
--- a/docs/userguide/quickstart.rst
+++ b/docs/userguide/quickstart.rst
@@ -173,7 +173,7 @@ Including Data Files
====================
The distutils have traditionally allowed installation of "data files", which
are placed in a platform-specific location. Setuptools offers three ways to
-specify data files to be included in your packages. For the simpliest use, you
+specify data files to be included in your packages. For the simplest use, you
can simply use the ``include_package_data`` keyword:
.. code-block:: ini
@@ -189,7 +189,7 @@ For more details, see :doc:`datafiles`
Development mode
================
``setuptools`` allows you to install a package without copying any files
-to your interpretor directory (e.g. the ``site-packages`` directory). This
+to your interpreter directory (e.g. the ``site-packages`` directory). This
allows you to modify your source code and have the changes take effect without
you having to rebuild and reinstall. This is currently incompatible with
PEP 517 and therefore it requires a ``setup.py`` script with the following
@@ -202,7 +202,7 @@ Then::
pip install --editable .
-This creates a link file in your interpretor site package directory which
+This creates a link file in your interpreter site package directory which
associate with your source code. For more information, see: (WIP)
@@ -216,7 +216,7 @@ basic use here.
Transitioning from ``setup.py`` to ``setup.cfg``
================================================
-To avoid executing arbitary scripts and boilerplate code, we are transitioning
+To avoid executing arbitrary scripts and boilerplate code, we are transitioning
into a full-fledged ``setup.cfg`` to declare your package information instead
of running ``setup()``. This inevitably brings challenges due to a different
syntax. Here we provide a quick guide to understanding how ``setup.cfg`` is
diff --git a/pkg_resources/_vendor/pyparsing.py b/pkg_resources/_vendor/pyparsing.py
index cf75e1e5..4cae7883 100644
--- a/pkg_resources/_vendor/pyparsing.py
+++ b/pkg_resources/_vendor/pyparsing.py
@@ -1625,7 +1625,7 @@ class ParserElement(object):
(see L{I{parseWithTabs}<parseWithTabs>})
- define your parse action using the full C{(s,loc,toks)} signature, and
reference the input string using the parse action's C{s} argument
- - explictly expand the tabs in your input string before calling
+ - explicitly expand the tabs in your input string before calling
C{parseString}
Example::
diff --git a/setuptools/_distutils/ccompiler.py b/setuptools/_distutils/ccompiler.py
index b38cf261..48d160d2 100644
--- a/setuptools/_distutils/ccompiler.py
+++ b/setuptools/_distutils/ccompiler.py
@@ -392,7 +392,7 @@ class CCompiler:
return output_dir, macros, include_dirs
def _prep_compile(self, sources, output_dir, depends=None):
- """Decide which souce files must be recompiled.
+ """Decide which source files must be recompiled.
Determine the list of object files corresponding to 'sources',
and figure out which ones really need to be recompiled.
diff --git a/setuptools/_imp.py b/setuptools/_imp.py
index 451e45a8..47efd792 100644
--- a/setuptools/_imp.py
+++ b/setuptools/_imp.py
@@ -41,12 +41,12 @@ def find_module(module, paths=None):
spec.loader, importlib.machinery.FrozenImporter):
kind = PY_FROZEN
path = None # imp compabilty
- suffix = mode = '' # imp compability
+ suffix = mode = '' # imp compatibility
elif spec.origin == 'built-in' or static and issubclass(
spec.loader, importlib.machinery.BuiltinImporter):
kind = C_BUILTIN
path = None # imp compabilty
- suffix = mode = '' # imp compability
+ suffix = mode = '' # imp compatibility
elif spec.has_location:
path = spec.origin
suffix = os.path.splitext(path)[1]
diff --git a/setuptools/_vendor/pyparsing.py b/setuptools/_vendor/pyparsing.py
index cf75e1e5..4cae7883 100644
--- a/setuptools/_vendor/pyparsing.py
+++ b/setuptools/_vendor/pyparsing.py
@@ -1625,7 +1625,7 @@ class ParserElement(object):
(see L{I{parseWithTabs}<parseWithTabs>})
- define your parse action using the full C{(s,loc,toks)} signature, and
reference the input string using the parse action's C{s} argument
- - explictly expand the tabs in your input string before calling
+ - explicitly expand the tabs in your input string before calling
C{parseString}
Example::
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 123e9582..8bec05e7 100644
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -161,7 +161,7 @@ def interpret_distro_name(
# Generate alternative interpretations of a source distro name
# Because some packages are ambiguous as to name/versions split
# e.g. "adns-python-1.1.0", "egenix-mx-commercial", etc.
- # So, we generate each possible interepretation (e.g. "adns, python-1.1.0"
+ # So, we generate each possible interpretation (e.g. "adns, python-1.1.0"
# "adns-python, 1.1.0", and "adns-python-1.1.0, no version"). In practice,
# the spurious interpretations should be ignored, because in the event
# there's also an "adns" package, the spurious "python-1.1.0" version will
diff --git a/setuptools/tests/environment.py b/setuptools/tests/environment.py
index bd3119ef..c0274c33 100644
--- a/setuptools/tests/environment.py
+++ b/setuptools/tests/environment.py
@@ -29,7 +29,7 @@ def run_setup_py(cmd, pypath=None, path=None,
if pypath is not None:
env["PYTHONPATH"] = pypath
- # overide the execution path if needed
+ # override the execution path if needed
if path is not None:
env["PATH"] = path
if not env.get("PATH", ""):
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index a3b2d6e6..4b2bb2b3 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -659,7 +659,7 @@ class TestSetupRequires:
dep_url = path_to_url(dep_sdist, authority='localhost')
test_pkg = create_setup_requires_package(
temp_dir,
- # Ignored (overriden by setup_attrs)
+ # Ignored (overridden by setup_attrs)
'python-xlib', '0.19',
setup_attrs=dict(
setup_requires='dependency @ %s' % dep_url))
@@ -731,7 +731,7 @@ class TestSetupRequires:
with contexts.save_pkg_resources_state():
test_pkg = create_setup_requires_package(
str(tmpdir),
- 'python-xlib', '0.19', # Ignored (overriden by setup_attrs).
+ 'python-xlib', '0.19', # Ignored (overridden by setup_attrs).
setup_attrs=dict(
setup_requires='dep', dependency_links=[index_url]))
test_setup_py = os.path.join(test_pkg, 'setup.py')
diff --git a/setuptools/tests/test_windows_wrappers.py b/setuptools/tests/test_windows_wrappers.py
index fa647de8..27853aae 100644
--- a/setuptools/tests/test_windows_wrappers.py
+++ b/setuptools/tests/test_windows_wrappers.py
@@ -167,7 +167,7 @@ class TestGUI(WrapperTester):
""").strip()
def test_basic(self, tmpdir):
- """Test the GUI version with the simple scipt, bar-script.py"""
+ """Test the GUI version with the simple script, bar-script.py"""
self.create_script(tmpdir)
cmd = [
View Lorry Controller Status