Merge pull request #5922 from lakshmanaram/fix-pyparsing-update

Move pyparsing update from Features to Vendored Libraries
pypa · Oct 27, 2018 · ebfa663 · ebfa663
2 parents 116c3b1 + c5331da
commit ebfa663
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/NEWS.rst b/NEWS.rst
@@ -18,7 +18,6 @@ Features
   As a security measure, pip will raise an exception when installing packages from
   PyPI if those packages depend on packages not also hosted on PyPI.
   In the future, PyPI will block uploading packages with such external URL dependencies directly. (`#4187 <https://github.com/pypa/pip/issues/4187>`_)
-- Upgrade pyparsing to 2.2.1. (`#5013 <https://github.com/pypa/pip/issues/5013>`_)
 - Allows dist options (--abi, --python-version, --platform, --implementation) when installing with --target (`#5355 <https://github.com/pypa/pip/issues/5355>`_)
 - Support passing ``svn+ssh`` URLs with a username to ``pip install -e``. (`#5375 <https://github.com/pypa/pip/issues/5375>`_)
 - pip now ensures that the RECORD file is sorted when installing from a wheel file. (`#5525 <https://github.com/pypa/pip/issues/5525>`_)
@@ -44,6 +43,7 @@ Vendored Libraries
 
 - Upgrade certifi to 2018.8.24
 - Upgrade packaging to 18.0
+- Upgrade pyparsing to 2.2.1
 - Add pep517 version 0.2
 - Upgrade pytoml to 0.1.19
 - Upgrade pkg_resources to 40.4.3 (via setuptools)

diff --git a/news/15be0039-1489-4442-94fc-ffe0790c4d73.trivial b/news/15be0039-1489-4442-94fc-ffe0790c4d73.trivial