From 98e3a77f8a112cf1a24e4d554952fedeab8f98c6 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Sat, 14 Nov 2020 07:30:11 +0800 Subject: [PATCH 1/2] [patch tracking] 20201114073007638399 - https://github.com/pypa/pip/commit/23324a664f98678e3fb3556d4d1c99916db06bd1 --- ...4a664f98678e3fb3556d4d1c99916db06bd1.patch | 115 ++++++++++++++++++ 1 file changed, 115 insertions(+) create mode 100644 23324a664f98678e3fb3556d4d1c99916db06bd1.patch diff --git a/23324a664f98678e3fb3556d4d1c99916db06bd1.patch b/23324a664f98678e3fb3556d4d1c99916db06bd1.patch new file mode 100644 index 0000000..3d6178b --- /dev/null +++ b/23324a664f98678e3fb3556d4d1c99916db06bd1.patch @@ -0,0 +1,115 @@ +diff --git a/docs/html/installing.rst b/docs/html/installing.rst +index 00c74a70ab..a49aebea4a 100644 +--- a/docs/html/installing.rst ++++ b/docs/html/installing.rst +@@ -10,8 +10,58 @@ Do I need to install pip? + pip is already installed if you are using Python 2 >=2.7.9 or Python 3 >=3.4 + downloaded from `python.org `_ or if you are working + in a :ref:`Virtual Environment ` +-created by :ref:`pypug:virtualenv` or :ref:`pyvenv `. +-Just make sure to :ref:`upgrade pip `. ++created by :ref:`pypug:virtualenv` or :ref:`venv `. Just make sure ++to :ref:`upgrade pip `. ++ ++Use the following command to check whether pip is installed: ++ ++.. tab:: Unix/macOS ++ ++ .. code-block:: console ++ ++ $ python -m pip --version ++ pip X.Y.Z from .../site-packages/pip (python X.Y) ++ ++.. tab:: Windows ++ ++ .. code-block:: console ++ ++ C:\> py -m pip --version ++ pip X.Y.Z from ...\site-packages\pip (python X.Y) ++ ++Using Linux Package Managers ++============================ ++ ++.. warning:: ++ ++ If you installed Python from a package manager on Linux, you should always ++ install pip for that Python installation using the same source. ++ ++See `pypug:Installing pip/setuptools/wheel with Linux Package Managers `_ ++in the Python Packaging User Guide. ++ ++Here are ways to contact a few Linux package maintainers if you run into ++problems: ++ ++* `Deadsnakes PPA `_ ++* `Debian Python Team `_ (for general ++ issues related to ``apt``) ++* `Red Hat Bugzilla `_ ++ ++pip developers do not have control over how Linux distributions handle pip ++installations, and are unable to provide solutions to related issues in ++general. ++ ++Using ensurepip ++=============== ++ ++Python >=3.4 can self-bootstrap pip with the built-in ++:ref:`ensurepip ` module. Refer to the standard library ++documentation for more details. Make sure to :ref:`upgrade pip ` ++after ``ensurepip`` installs pip. ++ ++See the `Using Linux Package Managers`_ section if your Python reports ++``No module named ensurepip`` on Debian and derived systems (e.g. Ubuntu). + + + .. _`get-pip`: +@@ -19,7 +69,13 @@ Just make sure to :ref:`upgrade pip `. + Installing with get-pip.py + ========================== + +-To install pip, securely [1]_ download ``get-pip.py`` by following ++.. warning:: ++ ++ Be cautious if you are using a Python install that is managed by your operating ++ system or another package manager. ``get-pip.py`` does not coordinate with ++ those tools, and may leave your system in an inconsistent state. ++ ++To manually install pip, securely [1]_ download ``get-pip.py`` by following + this link: `get-pip.py + `_. Alternatively, use ``curl``:: + +@@ -40,13 +96,6 @@ have downloaded ``get-pip.py``: + + py get-pip.py + +- +-.. warning:: +- +- Be cautious if you are using a Python install that is managed by your operating +- system or another package manager. ``get-pip.py`` does not coordinate with +- those tools, and may leave your system in an inconsistent state. +- + ``get-pip.py`` also installs :ref:`pypug:setuptools` [2]_ and :ref:`pypug:wheel` + if they are not already. :ref:`pypug:setuptools` is required to install + :term:`source distributions `. Both are +@@ -134,13 +183,6 @@ Install behind a proxy: + + py get-pip.py pip==9.0.2 wheel==0.30.0 setuptools==28.8.0 + +-Using Linux Package Managers +-============================ +- +-See :ref:`pypug:Installing pip/setuptools/wheel with Linux Package Managers` in +-the `Python Packaging User Guide +-`_. +- + .. _`Upgrading pip`: + + Upgrading pip +diff --git a/news/9131.doc.rst b/news/9131.doc.rst +new file mode 100644 +index 0000000000..18862aa554 +--- /dev/null ++++ b/news/9131.doc.rst +@@ -0,0 +1 @@ ++Reorder and revise installation instructions to make them easier to follow. -- Gitee From 1431f56c5e7ae61a28be60a17d88ec1aae853927 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Sat, 14 Nov 2020 07:30:11 +0800 Subject: [PATCH 2/2] [patch tracking] 20201114073007638399 - update spec file --- python-pip.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/python-pip.spec b/python-pip.spec index 3d035b5..9ee4fea 100644 --- a/python-pip.spec +++ b/python-pip.spec @@ -6,7 +6,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: 3 +Release: 4 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 @@ -16,6 +16,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: 23324a664f98678e3fb3556d4d1c99916db06bd1.patch Source10: pip-allow-older-versions.patch %description %{_description} @@ -112,6 +113,9 @@ install -p dist/%{python_wheelname} -t %{buildroot}%{python_wheeldir} %{python_wheeldir}/%{python_wheelname} %changelog +* 20201114073007638399 patch-tracking 20.2.2-4 +- append patch file of upstream repository from <23324a664f98678e3fb3556d4d1c99916db06bd1> to <23324a664f98678e3fb3556d4d1c99916db06bd1> + * Wed Nov 4 2020 wangjie -20.2.2-3 - Type:NA - ID:NA @@ -161,4 +165,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 -- Gitee