diff options
| -rw-r--r-- | CHANGES.rst | 4 | ||||
| -rw-r--r-- | docs/easy_install.txt | 4 | ||||
| -rw-r--r-- | pkg_resources/__init__.py | 2 | ||||
| -rw-r--r-- | pkg_resources/_vendor/packaging/specifiers.py | 2 | ||||
| -rw-r--r-- | pkg_resources/_vendor/pyparsing.py | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index 5f2b6076..94d99fda 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -156,7 +156,7 @@ v20.8.0 v20.7.0 ------- -* Refactored extra enviroment marker processing +* Refactored extra environment marker processing in WorkingSet. * Issue #533: Fixed intermittent test failures. * Issue #536: In msvc9_support, trap additional exceptions @@ -243,7 +243,7 @@ v20.6.0 20.2.1 ------ -* Issue #499: Restore compatiblity for legacy versions +* Issue #499: Restore compatibility for legacy versions by bumping to packaging 16.4. 20.2 diff --git a/docs/easy_install.txt b/docs/easy_install.txt index a66909b1..591589fb 100644 --- a/docs/easy_install.txt +++ b/docs/easy_install.txt @@ -577,7 +577,7 @@ activated or deactivated. As a result, if you are using EasyInstall to upgrade an existing package, or to install a package with the same name as an existing package, EasyInstall will warn you of the conflict. (This is an improvement over ``setup.py -install``, becuase the ``distutils`` just install new packages on top of old +install``, because the ``distutils`` just install new packages on top of old ones, possibly combining two unrelated packages or leaving behind modules that have been deleted in the newer version of the package.) @@ -606,7 +606,7 @@ can be safely installed as a zipfile, and then acts on its analysis. (Previous versions would not install a package as a zipfile unless you used the ``--zip-ok`` option.) -The current analysis approach is fairly conservative; it currenly looks for: +The current analysis approach is fairly conservative; it currently looks for: * Any use of the ``__file__`` or ``__path__`` variables (which should be replaced with ``pkg_resources`` API calls) diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py index 2eab8230..15cb93fd 100644 --- a/pkg_resources/__init__.py +++ b/pkg_resources/__init__.py @@ -1367,7 +1367,7 @@ def get_default_cache(): return os.path.join(dirname, 'Python-Eggs') else: raise RuntimeError( - "Please set the PYTHON_EGG_CACHE enviroment variable" + "Please set the PYTHON_EGG_CACHE environment variable" ) def safe_name(name): diff --git a/pkg_resources/_vendor/packaging/specifiers.py b/pkg_resources/_vendor/packaging/specifiers.py index 7f5a76cf..9b6353f0 100644 --- a/pkg_resources/_vendor/packaging/specifiers.py +++ b/pkg_resources/_vendor/packaging/specifiers.py @@ -198,7 +198,7 @@ class _IndividualSpecifier(BaseSpecifier): (prereleases or self.prereleases)): found_prereleases.append(version) # Either this is not a prerelease, or we should have been - # accepting prereleases from the begining. + # accepting prereleases from the beginning. else: yielded = True yield version diff --git a/pkg_resources/_vendor/pyparsing.py b/pkg_resources/_vendor/pyparsing.py index 3e02dbee..2284cadc 100644 --- a/pkg_resources/_vendor/pyparsing.py +++ b/pkg_resources/_vendor/pyparsing.py @@ -1112,7 +1112,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}
"""
ParserElement.resetCache()
|