forked from pool/python-pip
Dirk Mueller
ab9131a0af
* Always refuse installing or building projects that have no ``pyproject.toml`` nor ``setup.py``. * Tweak running-as-root detection, to check ``os.getuid`` if it exists, on Unix-y and non-Linux/non-MacOS machines. * When installing projects with a ``pyproject.toml`` in editable mode, and the build backend does not support :pep:`660`, prepare metadata using ``prepare_metadata_for_build_wheel`` instead of ``setup.py egg_info``. Also, refuse installing projects that only have a ``setup.cfg`` and no ``setup.py`` nor ``pyproject.toml``. These restore the pre-21.3 behaviour. * Restore compatibility of where configuration files are loaded from on MacOS * Upgrade pep517 to 0.12.0 * Improve deprecation warning regarding the copying of source trees when installing from a local directory. * Suppress location mismatch warnings when pip is invoked from a Python source tree, so ``ensurepip`` does not emit warnings on CPython ``make install``. * On Python 3.10 or later, the installation scheme backend has been changed to use ``sysconfig``. This is to anticipate the deprecation of ``distutils`` in Python 3.10, and its scheduled removal in 3.12. For compatibility considerations, pip installations running on Python 3.9 or lower will continue to use ``distutils``. * Remove the ``--build-dir`` option and aliases, one last time. * In-tree builds are now the default. ``--use-feature=in-tree-build`` is now ignored. ``--use-deprecated=out-of-tree-build`` may be used temporarily to ease the transition. * Un-deprecate source distribution re-installation behaviour. * Replace vendored appdirs with platformdirs. * Support `PEP 610 <https://www.python.org/dev/peps/pep-0610/>`_ to detect editable installs in ``pip freeze`` and ``pip list``. The ``pip list`` column output has a new ``Editable project location`` column, and the JSON output has a new ``editable_project_location`` field. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pip?expand=0&rev=92
86 lines
3.3 KiB
Diff
86 lines
3.3 KiB
Diff
Index: pip-21.3.1/src/pip/_vendor/certifi/core.py
|
|
===================================================================
|
|
--- pip-21.3.1.orig/src/pip/_vendor/certifi/core.py
|
|
+++ pip-21.3.1/src/pip/_vendor/certifi/core.py
|
|
@@ -5,72 +5,18 @@ certifi.py
|
|
~~~~~~~~~~
|
|
|
|
This module returns the installation location of cacert.pem or its contents.
|
|
-"""
|
|
-import os
|
|
-
|
|
|
|
-class _PipPatchedCertificate(Exception):
|
|
- pass
|
|
+Patched by openSUSE: return the system bundle
|
|
+"""
|
|
|
|
+def read_text(_module=None, _path=None, encoding="ascii"):
|
|
+ with open(where(), "r", encoding=encoding) as data:
|
|
+ return data.read()
|
|
|
|
-try:
|
|
- # Return a certificate file on disk for a standalone pip zipapp running in
|
|
- # an isolated build environment to use. Passing --cert to the standalone
|
|
- # pip does not work since requests calls where() unconditionally on import.
|
|
- _PIP_STANDALONE_CERT = os.environ.get("_PIP_STANDALONE_CERT")
|
|
- if _PIP_STANDALONE_CERT:
|
|
- def where():
|
|
- return _PIP_STANDALONE_CERT
|
|
- raise _PipPatchedCertificate()
|
|
-
|
|
- from importlib.resources import path as get_path, read_text
|
|
-
|
|
- _CACERT_CTX = None
|
|
- _CACERT_PATH = None
|
|
-
|
|
- def where():
|
|
- # This is slightly terrible, but we want to delay extracting the file
|
|
- # in cases where we're inside of a zipimport situation until someone
|
|
- # actually calls where(), but we don't want to re-extract the file
|
|
- # on every call of where(), so we'll do it once then store it in a
|
|
- # global variable.
|
|
- global _CACERT_CTX
|
|
- global _CACERT_PATH
|
|
- if _CACERT_PATH is None:
|
|
- # This is slightly janky, the importlib.resources API wants you to
|
|
- # manage the cleanup of this file, so it doesn't actually return a
|
|
- # path, it returns a context manager that will give you the path
|
|
- # when you enter it and will do any cleanup when you leave it. In
|
|
- # the common case of not needing a temporary file, it will just
|
|
- # return the file system location and the __exit__() is a no-op.
|
|
- #
|
|
- # We also have to hold onto the actual context manager, because
|
|
- # it will do the cleanup whenever it gets garbage collected, so
|
|
- # we will also store that at the global level as well.
|
|
- _CACERT_CTX = get_path("pip._vendor.certifi", "cacert.pem")
|
|
- _CACERT_PATH = str(_CACERT_CTX.__enter__())
|
|
-
|
|
- return _CACERT_PATH
|
|
-
|
|
-except _PipPatchedCertificate:
|
|
- pass
|
|
-
|
|
-except ImportError:
|
|
- # This fallback will work for Python versions prior to 3.7 that lack the
|
|
- # importlib.resources module but relies on the existing `where` function
|
|
- # so won't address issues with environments like PyOxidizer that don't set
|
|
- # __file__ on modules.
|
|
- def read_text(_module, _path, encoding="ascii"):
|
|
- with open(where(), "r", encoding=encoding) as data:
|
|
- return data.read()
|
|
-
|
|
- # If we don't have importlib.resources, then we will just do the old logic
|
|
- # of assuming we're on the filesystem and munge the path directly.
|
|
- def where():
|
|
- f = os.path.dirname(__file__)
|
|
|
|
- return os.path.join(f, "cacert.pem")
|
|
+def where():
|
|
+ return "/etc/ssl/ca-bundle.pem"
|
|
|
|
|
|
def contents():
|
|
- return read_text("certifi", "cacert.pem", encoding="ascii")
|
|
+ return read_text(encoding="ascii")
|