diff --git a/5ee7caf92ae6135b8ae8fdad4cd2cc28d5f81b8a.patch b/5ee7caf92ae6135b8ae8fdad4cd2cc28d5f81b8a.patch new file mode 100644 index 0000000000000000000000000000000000000000..7a0225e4febec5202755a651f83d547d54275dc4 --- /dev/null +++ b/5ee7caf92ae6135b8ae8fdad4cd2cc28d5f81b8a.patch @@ -0,0 +1,536 @@ +diff --git a/AUTHORS.txt b/AUTHORS.txt +index 5304f51fb2..f6fe855d7a 100644 +--- a/AUTHORS.txt ++++ b/AUTHORS.txt +@@ -146,6 +146,7 @@ Daniel Collins + Daniel Hahler + Daniel Holth + Daniel Jost ++Daniel Katz + Daniel Shaulov + Daniele Esposti + Daniele Procida +@@ -160,6 +161,7 @@ David Bordeynik + David Caro + David Evans + David Linke ++David Poggi + David Pursehouse + David Tucker + David Wales +@@ -183,6 +185,7 @@ Eitan Adler + ekristina + elainechan + Eli Schwartz ++Elisha Hollander + Ellen Marie Dash + Emil Burzo + Emil Styrke +@@ -203,6 +206,7 @@ everdimension + Felix Yan + fiber-space + Filip Kokosiński ++Filipe Laíns + Florian Briand + Florian Rathgeber + Francesco +@@ -318,6 +322,7 @@ Kyle Persohn + lakshmanaram + Laszlo Kiss-Kollar + Laurent Bristiel ++Laurie O + Laurie Opperman + Leon Sasson + Lev Givon +@@ -398,6 +403,7 @@ nvdv + Ofekmeister + ofrinevo + Oliver Jeeves ++Oliver Mannion + Oliver Tonnhofer + Olivier Girardot + Olivier Grisel +@@ -489,6 +495,7 @@ Segev Finer + SeongSoo Cho + Sergey Vasilyev + Seth Woodworth ++shireenrao + Shlomi Fish + Shovan Maity + Simeon Visser +@@ -553,6 +560,7 @@ Ville Skyttä + Vinay Sajip + Vincent Philippon + Vinicyus Macedo ++Vipul Kumar + Vitaly Babiy + Vladimir Rutsky + W. Trevor King +diff --git a/NEWS.rst b/NEWS.rst +index 6c6db47998..fffba7cf31 100644 +--- a/NEWS.rst ++++ b/NEWS.rst +@@ -9,6 +9,92 @@ + + .. towncrier release notes start + ++20.3b1 (2020-10-31) ++=================== ++ ++Deprecations and Removals ++------------------------- ++ ++- ``pip freeze`` will stop filtering the ``pip``, ``setuptools``, ``distribute`` and ``wheel`` packages from ``pip freeze`` output in a future version. ++ To keep the previous behavior, users should use the new ``--exclude`` option. (`#4256 `_) ++- Deprecate support for Python 3.5 (`#8181 `_) ++- Document that certain removals can be fast tracked. (`#8417 `_) ++- Document that Python versions are generally supported until PyPI usage falls below 5%. (`#8927 `_) ++- Deprecate ``--find-links`` option in ``pip freeze`` (`#9069 `_) ++ ++Features ++-------- ++ ++- Add ``--exclude`` option to ``pip freeze`` and ``pip list`` commands to explicitly exclude packages from the output. (`#4256 `_) ++- Allow multiple values for --abi and --platform. (`#6121 `_) ++- Add option ``--format`` to subcommand ``list`` of ``pip cache``, with ``abspath`` choice to output the full path of a wheel file. (`#8355 `_) ++- Improve error message friendliness when an environment has packages with ++ corrupted metadata. (`#8676 `_) ++- Make the ``setup.py install`` deprecation warning less noisy. We warn only ++ when ``setup.py install`` succeeded and ``setup.py bdist_wheel`` failed, as ++ situations where both fails are most probably irrelevant to this deprecation. (`#8752 `_) ++- Check the download directory for existing wheels to possibly avoid ++ fetching metadata when the ``fast-deps`` feature is used with ++ ``pip wheel`` and ``pip download``. (`#8804 `_) ++- When installing a git URL that refers to a commit that is not available locally ++ after git clone, attempt to fetch it from the remote. (`#8815 `_) ++- Include http subdirectory in ``pip cache info`` and ``pip cache purge`` commands. (`#8892 `_) ++- Cache package listings on index packages so they are guarenteed to stay stable ++ during a pip command session. This also improves performance when a index page ++ is accessed multiple times during the command session. (`#8905 `_) ++- New resolver: Tweak resolution logic to improve user experience when ++ user-supplied requirements conflict. (`#8924 `_) ++- Support Python 3.9. (`#8971 `_) ++- Log an informational message when backtracking takes multiple rounds on a specific package. (`#8975 `_) ++- Switch to the new dependency resolver by default. (`#9019 `_) ++- Remove the ``--build-dir`` option, as per the deprecation. (`#9049 `_) ++ ++Bug Fixes ++--------- ++ ++- Propagate ``--extra-index-url`` from requirements file properly to session auth, ++ so that keyring auth will work as expected. (`#8103 `_) ++- Allow specifying verbosity and quiet level via configuration files ++ and environment variables. Previously these options were treated as ++ boolean values when read from there while through CLI the level can be ++ specified. (`#8578 `_) ++- Only converts Windows path to unicode on Python 2 to avoid regressions when a ++ POSIX environment does not configure the file system encoding correctly. (`#8658 `_) ++- List downloaded distributions before exiting ``pip download`` ++ when using the new resolver to make the behavior the same as ++ that on the legacy resolver. (`#8696 `_) ++- New resolver: Pick up hash declarations in constraints files and use them to ++ filter available distributions. (`#8792 `_) ++- Avoid polluting the destination directory by resolution artifacts ++ when the new resolver is used for ``pip download`` or ``pip wheel``. (`#8827 `_) ++- New resolver: If a package appears multiple times in user specification with ++ different ``--hash`` options, only hashes that present in all specifications ++ should be allowed. (`#8839 `_) ++- Tweak the output during dependency resolution in the new resolver. (`#8861 `_) ++- Correctly search for installed distributions in new resolver logic in order ++ to not miss packages (virtualenv packages from system-wide-packages for example) (`#8963 `_) ++- Do not fail in pip freeze when encountering a ``direct_url.json`` metadata file ++ with editable=True. Render it as a non-editable ``file://`` URL until modern ++ editable installs are standardized and supported. (`#8996 `_) ++ ++Vendored Libraries ++------------------ ++ ++- Fix devendoring instructions to explicitly state that ``vendor.txt`` should not be removed. ++ It is mandatory for ``pip debug`` command. ++ ++Improved Documentation ++---------------------- ++ ++- Add documentation for '.netrc' support. (`#7231 `_) ++- Add OS tabs for OS-specific commands. (`#7311 `_) ++- Add note and example on keyring support for index basic-auth (`#8636 `_) ++- Added initial UX feedback widgets to docs. (`#8783 `_, `#8848 `_) ++- Add ux documentation (`#8807 `_) ++- Update user docs to reflect new resolver as default in 20.3. (`#9044 `_) ++- Improve migration guide to reflect changes in new resolver behavior. (`#9056 `_) ++ ++ + 20.2.4 (2020-10-16) + =================== + +diff --git a/news/093f7456-cc25-4df9-9518-4732b1e07fe5.trivial.rst b/news/093f7456-cc25-4df9-9518-4732b1e07fe5.trivial.rst +deleted file mode 100644 +index e69de29bb2..0000000000 +diff --git a/news/0e494986-202e-4275-b7ec-d6f046c0aa05.trivial.rst b/news/0e494986-202e-4275-b7ec-d6f046c0aa05.trivial.rst +deleted file mode 100644 +index e69de29bb2..0000000000 +diff --git a/news/24715eb2-c118-473b-9d99-4f6ce8bbfa83.trivial.rst b/news/24715eb2-c118-473b-9d99-4f6ce8bbfa83.trivial.rst +deleted file mode 100644 +index e69de29bb2..0000000000 +diff --git a/news/2a1e2773-eae6-43a4-b075-55f49e713fb1.trivial.rst b/news/2a1e2773-eae6-43a4-b075-55f49e713fb1.trivial.rst +deleted file mode 100644 +index e69de29bb2..0000000000 +diff --git a/news/4256.feature.rst b/news/4256.feature.rst +deleted file mode 100644 +index 03d7c95d77..0000000000 +--- a/news/4256.feature.rst ++++ /dev/null +@@ -1 +0,0 @@ +-Add ``--exclude`` option to ``pip freeze`` and ``pip list`` commands to explicitly exclude packages from the output. +diff --git a/news/4256.removal.rst b/news/4256.removal.rst +deleted file mode 100644 +index 6d560b7bba..0000000000 +--- a/news/4256.removal.rst ++++ /dev/null +@@ -1,2 +0,0 @@ +-``pip freeze`` will stop filtering the ``pip``, ``setuptools``, ``distribute`` and ``wheel`` packages from ``pip freeze`` output in a future version. +-To keep the previous behavior, users should use the new ``--exclude`` option. +diff --git a/news/4c82ffb4-cde3-4dd5-8f37-6f4ef53e028b.trivial.rst b/news/4c82ffb4-cde3-4dd5-8f37-6f4ef53e028b.trivial.rst +deleted file mode 100644 +index e69de29bb2..0000000000 +diff --git a/news/50cf024d-0a74-44c8-b3e9-483dd826fff2.trivial.rst b/news/50cf024d-0a74-44c8-b3e9-483dd826fff2.trivial.rst +deleted file mode 100644 +index e69de29bb2..0000000000 +diff --git a/news/559bb022-21ae-498c-a2ce-2c354d880f5e.trivial.rst b/news/559bb022-21ae-498c-a2ce-2c354d880f5e.trivial.rst +deleted file mode 100644 +index e69de29bb2..0000000000 +diff --git a/news/5661d979-1abd-4c9a-a7bf-45701b33dd6c.trivial.rst b/news/5661d979-1abd-4c9a-a7bf-45701b33dd6c.trivial.rst +deleted file mode 100644 +index e69de29bb2..0000000000 +diff --git a/news/5e8c60c2-d540-4a25-af03-100d848acbc0.trivial.rst b/news/5e8c60c2-d540-4a25-af03-100d848acbc0.trivial.rst +deleted file mode 100644 +index e69de29bb2..0000000000 +diff --git a/news/6121.feature.rst b/news/6121.feature.rst +deleted file mode 100644 +index 16b272a69f..0000000000 +--- a/news/6121.feature.rst ++++ /dev/null +@@ -1 +0,0 @@ +-Allow multiple values for --abi and --platform. +diff --git a/news/629892ca-55da-4ca9-9cff-c15373e97ad1.trivial.rst b/news/629892ca-55da-4ca9-9cff-c15373e97ad1.trivial.rst +deleted file mode 100644 +index e69de29bb2..0000000000 +diff --git a/news/6f8eff8d-9886-4e00-b431-5c809500e6bf.trivial.rst b/news/6f8eff8d-9886-4e00-b431-5c809500e6bf.trivial.rst +deleted file mode 100644 +index e69de29bb2..0000000000 +diff --git a/news/7231.doc.rst b/news/7231.doc.rst +deleted file mode 100644 +index bef9bf3e6e..0000000000 +--- a/news/7231.doc.rst ++++ /dev/null +@@ -1 +0,0 @@ +-Add documentation for '.netrc' support. +diff --git a/news/7311.doc.rst b/news/7311.doc.rst +deleted file mode 100644 +index 6ed2c42048..0000000000 +--- a/news/7311.doc.rst ++++ /dev/null +@@ -1 +0,0 @@ +-Add OS tabs for OS-specific commands. +diff --git a/news/8103.bugfix.rst b/news/8103.bugfix.rst +deleted file mode 100644 +index 55e4d6571a..0000000000 +--- a/news/8103.bugfix.rst ++++ /dev/null +@@ -1,2 +0,0 @@ +-Propagate ``--extra-index-url`` from requirements file properly to session auth, +-so that keyring auth will work as expected. +diff --git a/news/8181.removal.rst b/news/8181.removal.rst +deleted file mode 100644 +index ae6bbe9f88..0000000000 +--- a/news/8181.removal.rst ++++ /dev/null +@@ -1 +0,0 @@ +-Deprecate support for Python 3.5 +diff --git a/news/8327.vendor.rst b/news/8327.vendor.rst +deleted file mode 100644 +index 7b4536ae2f..0000000000 +--- a/news/8327.vendor.rst ++++ /dev/null +@@ -1,2 +0,0 @@ +-Fix devendoring instructions to explicitly state that ``vendor.txt`` should not be removed. +-It is mandatory for ``pip debug`` command. +diff --git a/news/8355.feature.rst b/news/8355.feature.rst +deleted file mode 100644 +index 3a7fb53750..0000000000 +--- a/news/8355.feature.rst ++++ /dev/null +@@ -1 +0,0 @@ +-Add option ``--format`` to subcommand ``list`` of ``pip cache``, with ``abspath`` choice to output the full path of a wheel file. +diff --git a/news/8417.removal.rst b/news/8417.removal.rst +deleted file mode 100644 +index 8f280b535c..0000000000 +--- a/news/8417.removal.rst ++++ /dev/null +@@ -1 +0,0 @@ +-Document that certain removals can be fast tracked. +diff --git a/news/8578.bugfix.rst b/news/8578.bugfix.rst +deleted file mode 100644 +index 3df7ed078c..0000000000 +--- a/news/8578.bugfix.rst ++++ /dev/null +@@ -1,4 +0,0 @@ +-Allow specifying verbosity and quiet level via configuration files +-and environment variables. Previously these options were treated as +-boolean values when read from there while through CLI the level can be +-specified. +diff --git a/news/8636.doc.rst b/news/8636.doc.rst +deleted file mode 100644 +index 081cf1c7eb..0000000000 +--- a/news/8636.doc.rst ++++ /dev/null +@@ -1 +0,0 @@ +-Add note and example on keyring support for index basic-auth +diff --git a/news/8658.bugfix.rst b/news/8658.bugfix.rst +deleted file mode 100644 +index 6e43c8b3c0..0000000000 +--- a/news/8658.bugfix.rst ++++ /dev/null +@@ -1,2 +0,0 @@ +-Only converts Windows path to unicode on Python 2 to avoid regressions when a +-POSIX environment does not configure the file system encoding correctly. +diff --git a/news/8676.feature.rst b/news/8676.feature.rst +deleted file mode 100644 +index f8da963f6e..0000000000 +--- a/news/8676.feature.rst ++++ /dev/null +@@ -1,2 +0,0 @@ +-Improve error message friendliness when an environment has packages with +-corrupted metadata. +diff --git a/news/8696.bugfix.rst b/news/8696.bugfix.rst +deleted file mode 100644 +index 989d2d029a..0000000000 +--- a/news/8696.bugfix.rst ++++ /dev/null +@@ -1,3 +0,0 @@ +-List downloaded distributions before exiting ``pip download`` +-when using the new resolver to make the behavior the same as +-that on the legacy resolver. +diff --git a/news/8752.feature.rst b/news/8752.feature.rst +deleted file mode 100644 +index d2560da180..0000000000 +--- a/news/8752.feature.rst ++++ /dev/null +@@ -1,3 +0,0 @@ +-Make the ``setup.py install`` deprecation warning less noisy. We warn only +-when ``setup.py install`` succeeded and ``setup.py bdist_wheel`` failed, as +-situations where both fails are most probably irrelevant to this deprecation. +diff --git a/news/8781.trivial.rst b/news/8781.trivial.rst +deleted file mode 100644 +index e6044f52f7..0000000000 +--- a/news/8781.trivial.rst ++++ /dev/null +@@ -1 +0,0 @@ +-Fix a broken slug anchor in user guide. +diff --git a/news/8783.doc.rst b/news/8783.doc.rst +deleted file mode 100644 +index 6d2bb8762d..0000000000 +--- a/news/8783.doc.rst ++++ /dev/null +@@ -1 +0,0 @@ +-Added initial UX feedback widgets to docs. +diff --git a/news/8792.bugfix.rst b/news/8792.bugfix.rst +deleted file mode 100644 +index e83bdb09cf..0000000000 +--- a/news/8792.bugfix.rst ++++ /dev/null +@@ -1,2 +0,0 @@ +-New resolver: Pick up hash declarations in constraints files and use them to +-filter available distributions. +diff --git a/news/8804.feature.rst b/news/8804.feature.rst +deleted file mode 100644 +index a29333342e..0000000000 +--- a/news/8804.feature.rst ++++ /dev/null +@@ -1,3 +0,0 @@ +-Check the download directory for existing wheels to possibly avoid +-fetching metadata when the ``fast-deps`` feature is used with +-``pip wheel`` and ``pip download``. +diff --git a/news/8807.doc.rst b/news/8807.doc.rst +deleted file mode 100644 +index 6ef1a123ad..0000000000 +--- a/news/8807.doc.rst ++++ /dev/null +@@ -1 +0,0 @@ +-Add ux documentation +diff --git a/news/8815.feature.rst b/news/8815.feature.rst +deleted file mode 100644 +index 7d9149d69c..0000000000 +--- a/news/8815.feature.rst ++++ /dev/null +@@ -1,2 +0,0 @@ +-When installing a git URL that refers to a commit that is not available locally +-after git clone, attempt to fetch it from the remote. +diff --git a/news/8827.bugfix.rst b/news/8827.bugfix.rst +deleted file mode 100644 +index 608cd3d5c6..0000000000 +--- a/news/8827.bugfix.rst ++++ /dev/null +@@ -1,2 +0,0 @@ +-Avoid polluting the destination directory by resolution artifacts +-when the new resolver is used for ``pip download`` or ``pip wheel``. +diff --git a/news/8839.bugfix.rst b/news/8839.bugfix.rst +deleted file mode 100644 +index 987b801e93..0000000000 +--- a/news/8839.bugfix.rst ++++ /dev/null +@@ -1,3 +0,0 @@ +-New resolver: If a package appears multiple times in user specification with +-different ``--hash`` options, only hashes that present in all specifications +-should be allowed. +diff --git a/news/8848.doc.rst b/news/8848.doc.rst +deleted file mode 100644 +index 6d2bb8762d..0000000000 +--- a/news/8848.doc.rst ++++ /dev/null +@@ -1 +0,0 @@ +-Added initial UX feedback widgets to docs. +diff --git a/news/8861.bugfix.rst b/news/8861.bugfix.rst +deleted file mode 100644 +index d623419fae..0000000000 +--- a/news/8861.bugfix.rst ++++ /dev/null +@@ -1 +0,0 @@ +-Tweak the output during dependency resolution in the new resolver. +diff --git a/news/8892.feature.rst b/news/8892.feature.rst +deleted file mode 100644 +index 96c99bf8cb..0000000000 +--- a/news/8892.feature.rst ++++ /dev/null +@@ -1 +0,0 @@ +-Include http subdirectory in ``pip cache info`` and ``pip cache purge`` commands. +diff --git a/news/8905.feature.rst b/news/8905.feature.rst +deleted file mode 100644 +index 5d27d40c2b..0000000000 +--- a/news/8905.feature.rst ++++ /dev/null +@@ -1,3 +0,0 @@ +-Cache package listings on index packages so they are guarenteed to stay stable +-during a pip command session. This also improves performance when a index page +-is accessed multiple times during the command session. +diff --git a/news/8924.feature.rst b/news/8924.feature.rst +deleted file mode 100644 +index c607aa0d06..0000000000 +--- a/news/8924.feature.rst ++++ /dev/null +@@ -1,2 +0,0 @@ +-New resolver: Tweak resolution logic to improve user experience when +-user-supplied requirements conflict. +diff --git a/news/8927.removal.rst b/news/8927.removal.rst +deleted file mode 100644 +index 0032fa5f29..0000000000 +--- a/news/8927.removal.rst ++++ /dev/null +@@ -1 +0,0 @@ +-Document that Python versions are generally supported until PyPI usage falls below 5%. +diff --git a/news/8963.bugfix.rst b/news/8963.bugfix.rst +deleted file mode 100644 +index 62c01b464e..0000000000 +--- a/news/8963.bugfix.rst ++++ /dev/null +@@ -1,2 +0,0 @@ +-Correctly search for installed distributions in new resolver logic in order +-to not miss packages (virtualenv packages from system-wide-packages for example) +diff --git a/news/8971.feature.rst b/news/8971.feature.rst +deleted file mode 100644 +index e0b7b19cf6..0000000000 +--- a/news/8971.feature.rst ++++ /dev/null +@@ -1 +0,0 @@ +-Support Python 3.9. +diff --git a/news/8975.feature.rst b/news/8975.feature.rst +deleted file mode 100644 +index 082612505b..0000000000 +--- a/news/8975.feature.rst ++++ /dev/null +@@ -1 +0,0 @@ +-Log an informational message when backtracking takes multiple rounds on a specific package. +diff --git a/news/8996.bugfix.rst b/news/8996.bugfix.rst +deleted file mode 100644 +index fa3528e7c4..0000000000 +--- a/news/8996.bugfix.rst ++++ /dev/null +@@ -1,3 +0,0 @@ +-Do not fail in pip freeze when encountering a ``direct_url.json`` metadata file +-with editable=True. Render it as a non-editable ``file://`` URL until modern +-editable installs are standardized and supported. +diff --git a/news/9019.feature.rst b/news/9019.feature.rst +deleted file mode 100644 +index 5f81e95fd5..0000000000 +--- a/news/9019.feature.rst ++++ /dev/null +@@ -1 +0,0 @@ +-Switch to the new dependency resolver by default. +diff --git a/news/9044.doc.rst b/news/9044.doc.rst +deleted file mode 100644 +index 58c7f39d20..0000000000 +--- a/news/9044.doc.rst ++++ /dev/null +@@ -1 +0,0 @@ +-Update user docs to reflect new resolver as default in 20.3. +diff --git a/news/9049.feature.rst b/news/9049.feature.rst +deleted file mode 100644 +index 1cf0916f9a..0000000000 +--- a/news/9049.feature.rst ++++ /dev/null +@@ -1 +0,0 @@ +-Remove the ``--build-dir`` option, as per the deprecation. +diff --git a/news/9056.doc.rst b/news/9056.doc.rst +deleted file mode 100644 +index 7317dc9cd0..0000000000 +--- a/news/9056.doc.rst ++++ /dev/null +@@ -1 +0,0 @@ +-Improve migration guide to reflect changes in new resolver behavior. +diff --git a/news/9069.removal.rst b/news/9069.removal.rst +deleted file mode 100644 +index a7fae08da4..0000000000 +--- a/news/9069.removal.rst ++++ /dev/null +@@ -1 +0,0 @@ +-Deprecate ``--find-links`` option in ``pip freeze`` +diff --git a/news/946beace-6164-4d1a-a05d-e9bebf43ccd0.trivial.rst b/news/946beace-6164-4d1a-a05d-e9bebf43ccd0.trivial.rst +deleted file mode 100644 +index e69de29bb2..0000000000 +diff --git a/news/9f8da1d9-dd18-47e9-b334-5eb862054409.trivial.rst b/news/9f8da1d9-dd18-47e9-b334-5eb862054409.trivial.rst +deleted file mode 100644 +index e69de29bb2..0000000000 +diff --git a/news/a2fa2e68-01bf-11eb-a0b1-4fe8cb1f9dcf.trivial.rst b/news/a2fa2e68-01bf-11eb-a0b1-4fe8cb1f9dcf.trivial.rst +deleted file mode 100644 +index e69de29bb2..0000000000 +diff --git a/news/a3a2b1b7-744e-4533-b3ff-6e7a1843d573.trivial.rst b/news/a3a2b1b7-744e-4533-b3ff-6e7a1843d573.trivial.rst +deleted file mode 100644 +index e69de29bb2..0000000000 +diff --git a/news/bc7f9ea0-030d-11eb-92cb-6b2b625d02fc.trivial.rst b/news/bc7f9ea0-030d-11eb-92cb-6b2b625d02fc.trivial.rst +deleted file mode 100644 +index e69de29bb2..0000000000 +diff --git a/news/c6182139-edb4-4bf6-bc3f-2d37cb5759ad.trivial.rst b/news/c6182139-edb4-4bf6-bc3f-2d37cb5759ad.trivial.rst +deleted file mode 100644 +index e69de29bb2..0000000000 +diff --git a/news/d53425e4-767e-4d73-bce5-88644b781855.trivial.rst b/news/d53425e4-767e-4d73-bce5-88644b781855.trivial.rst +deleted file mode 100644 +index e69de29bb2..0000000000 +diff --git a/news/d90a40c1-15b7-46b9-9162-335bb346b53f.trivial.rst b/news/d90a40c1-15b7-46b9-9162-335bb346b53f.trivial.rst +deleted file mode 100644 +index e69de29bb2..0000000000 +diff --git a/news/e1831861-84a4-4f9b-9987-762e127cb42b.trivial.rst b/news/e1831861-84a4-4f9b-9987-762e127cb42b.trivial.rst +deleted file mode 100644 +index e69de29bb2..0000000000 +diff --git a/src/pip/__init__.py b/src/pip/__init__.py +index 5a2f3c3174..cd09297136 100644 +--- a/src/pip/__init__.py ++++ b/src/pip/__init__.py +@@ -4,7 +4,7 @@ + from typing import List, Optional + + +-__version__ = "20.3.dev0" ++__version__ = "20.3.dev1" + + + def main(args=None): diff --git a/python-pip.spec b/python-pip.spec index 05f810a986da3034c3f240b38e74be80b2c67322..db2a3f096b0eb36743373bdfc6d7b31b94ea8cbc 100644 --- a/python-pip.spec +++ b/python-pip.spec @@ -7,7 +7,7 @@ pip is the package installer for Python. You can use pip to install packages fro %global bashcompdir %(b=$(pkg-config --variable=completionsdir bash-completion 2>/dev/null); echo ${b:-%{_sysconfdir}/bash_completion.d}) Name: python-%{srcname} Version: 20.2.2 -Release: 2 +Release: 3 Summary: A tool for installing and managing Python packages License: MIT and Python and ASL 2.0 and BSD and ISC and LGPLv2 and MPLv2.0 and (ASL 2.0 or BSD) URL: http://www.pip-installer.org @@ -17,6 +17,7 @@ Patch1: allow-stripping-given-prefix-from-wheel-RECORD-files.patch Patch2: emit-a-warning-when-running-with-root-privileges.patch Patch3: remove-existing-dist-only-if-path-conflicts.patch Patch6000: dummy-certifi.patch +Patch6001: 5ee7caf92ae6135b8ae8fdad4cd2cc28d5f81b8a.patch Source10: pip-allow-older-versions.patch %description %{_description} @@ -140,6 +141,9 @@ install -p dist/%{python_wheelname} -t %{buildroot}%{python_wheeldir} %{python_wheeldir}/%{python_wheelname} %changelog +* 20201101033007638063 patch-tracking 20.2.2-3 +- append patch file of upstream repository from <5ee7caf92ae6135b8ae8fdad4cd2cc28d5f81b8a> to <5ee7caf92ae6135b8ae8fdad4cd2cc28d5f81b8a> + * Tue Sep 1 2020 wenzhanli - 20.2.2-2 - add pip-allow-older-versions.patch @@ -183,4 +187,4 @@ install -p dist/%{python_wheelname} -t %{buildroot}%{python_wheeldir} - DESC: Synchronize a patch * Mon Sep 23 2019 openEuler Buildteam - 18.0-6 -- Package init +- Package init \ No newline at end of file