Skip to content

Commit

Permalink
py-pip: updated to 22.1.2
Browse files Browse the repository at this point in the history
22.1.2 (2022-05-31)
===================

Bug Fixes
---------
- Revert <pypa/pip#10979> since it introduced a regression in certain edge cases.
- Fix an incorrect assertion in the logging logic, that prevented the upgrade prompt from being presented.


22.1.1 (2022-05-20)
===================

Bug Fixes
---------
- Properly filter out optional dependencies (i.e. extras) when checking build environment distributions.
- Change the build environment dependency checking to be opt-in.
- Allow using a pre-release version to satisfy a build requirement. This helps
  manually populated build environments to more accurately detect build-time
  requirement conflicts.


22.1 (2022-05-11)
=================

Process
-------
- Enable the ``importlib.metadata`` metadata implementation by default on
  Python 3.11 (or later). The environment variable ``_PIP_USE_IMPORTLIB_METADATA``
  can still be used to enable the implementation on 3.10 and earlier, or disable
  it on 3.11 (by setting it to ``0`` or ``false``).

Bug Fixes
---------
- Revert <pypa/pip#9243> since it introduced a regression in certain edge cases.
- Fix missing ``REQUESTED`` metadata when using URL constraints.
- ``pip config`` now normalizes names by converting underscores into dashes.
  • Loading branch information
adam committed Jul 7, 2022
1 parent 3018819 commit d108e1c
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 35 deletions.
4 changes: 2 additions & 2 deletions devel/py-pip/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.53 2022/04/20 21:04:12 wiz Exp $
# $NetBSD: Makefile,v 1.54 2022/07/07 11:48:51 adam Exp $

DISTNAME= pip-22.0.4
DISTNAME= pip-22.1.2
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
CATEGORIES= devel python
MASTER_SITES= ${MASTER_SITE_PYPI:=p/pip/}
Expand Down
59 changes: 34 additions & 25 deletions devel/py-pip/PLIST
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.33 2022/04/20 21:04:12 wiz Exp $
@comment $NetBSD: PLIST,v 1.34 2022/07/07 11:48:51 adam Exp $
bin/pip${PYVERSSUFFIX}
${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
Expand Down Expand Up @@ -162,6 +162,18 @@ ${PYSITELIB}/pip/_internal/metadata/__init__.pyo
${PYSITELIB}/pip/_internal/metadata/base.py
${PYSITELIB}/pip/_internal/metadata/base.pyc
${PYSITELIB}/pip/_internal/metadata/base.pyo
${PYSITELIB}/pip/_internal/metadata/importlib/__init__.py
${PYSITELIB}/pip/_internal/metadata/importlib/__init__.pyc
${PYSITELIB}/pip/_internal/metadata/importlib/__init__.pyo
${PYSITELIB}/pip/_internal/metadata/importlib/_compat.py
${PYSITELIB}/pip/_internal/metadata/importlib/_compat.pyc
${PYSITELIB}/pip/_internal/metadata/importlib/_compat.pyo
${PYSITELIB}/pip/_internal/metadata/importlib/_dists.py
${PYSITELIB}/pip/_internal/metadata/importlib/_dists.pyc
${PYSITELIB}/pip/_internal/metadata/importlib/_dists.pyo
${PYSITELIB}/pip/_internal/metadata/importlib/_envs.py
${PYSITELIB}/pip/_internal/metadata/importlib/_envs.pyc
${PYSITELIB}/pip/_internal/metadata/importlib/_envs.pyo
${PYSITELIB}/pip/_internal/metadata/pkg_resources.py
${PYSITELIB}/pip/_internal/metadata/pkg_resources.pyc
${PYSITELIB}/pip/_internal/metadata/pkg_resources.pyo
Expand Down Expand Up @@ -228,6 +240,9 @@ ${PYSITELIB}/pip/_internal/operations/__init__.pyo
${PYSITELIB}/pip/_internal/operations/build/__init__.py
${PYSITELIB}/pip/_internal/operations/build/__init__.pyc
${PYSITELIB}/pip/_internal/operations/build/__init__.pyo
${PYSITELIB}/pip/_internal/operations/build/build_tracker.py
${PYSITELIB}/pip/_internal/operations/build/build_tracker.pyc
${PYSITELIB}/pip/_internal/operations/build/build_tracker.pyo
${PYSITELIB}/pip/_internal/operations/build/metadata.py
${PYSITELIB}/pip/_internal/operations/build/metadata.pyc
${PYSITELIB}/pip/_internal/operations/build/metadata.pyo
Expand Down Expand Up @@ -285,9 +300,6 @@ ${PYSITELIB}/pip/_internal/req/req_install.pyo
${PYSITELIB}/pip/_internal/req/req_set.py
${PYSITELIB}/pip/_internal/req/req_set.pyc
${PYSITELIB}/pip/_internal/req/req_set.pyo
${PYSITELIB}/pip/_internal/req/req_tracker.py
${PYSITELIB}/pip/_internal/req/req_tracker.pyc
${PYSITELIB}/pip/_internal/req/req_tracker.pyo
${PYSITELIB}/pip/_internal/req/req_uninstall.py
${PYSITELIB}/pip/_internal/req/req_uninstall.pyc
${PYSITELIB}/pip/_internal/req/req_uninstall.pyo
Expand Down Expand Up @@ -698,9 +710,15 @@ ${PYSITELIB}/pip/_vendor/distlib/w64.exe
${PYSITELIB}/pip/_vendor/distlib/wheel.py
${PYSITELIB}/pip/_vendor/distlib/wheel.pyc
${PYSITELIB}/pip/_vendor/distlib/wheel.pyo
${PYSITELIB}/pip/_vendor/distro.py
${PYSITELIB}/pip/_vendor/distro.pyc
${PYSITELIB}/pip/_vendor/distro.pyo
${PYSITELIB}/pip/_vendor/distro/__init__.py
${PYSITELIB}/pip/_vendor/distro/__init__.pyc
${PYSITELIB}/pip/_vendor/distro/__init__.pyo
${PYSITELIB}/pip/_vendor/distro/__main__.py
${PYSITELIB}/pip/_vendor/distro/__main__.pyc
${PYSITELIB}/pip/_vendor/distro/__main__.pyo
${PYSITELIB}/pip/_vendor/distro/distro.py
${PYSITELIB}/pip/_vendor/distro/distro.pyc
${PYSITELIB}/pip/_vendor/distro/distro.pyo
${PYSITELIB}/pip/_vendor/html5lib/__init__.py
${PYSITELIB}/pip/_vendor/html5lib/__init__.pyc
${PYSITELIB}/pip/_vendor/html5lib/__init__.pyo
Expand Down Expand Up @@ -935,21 +953,6 @@ ${PYSITELIB}/pip/_vendor/platformdirs/version.pyo
${PYSITELIB}/pip/_vendor/platformdirs/windows.py
${PYSITELIB}/pip/_vendor/platformdirs/windows.pyc
${PYSITELIB}/pip/_vendor/platformdirs/windows.pyo
${PYSITELIB}/pip/_vendor/progress/__init__.py
${PYSITELIB}/pip/_vendor/progress/__init__.pyc
${PYSITELIB}/pip/_vendor/progress/__init__.pyo
${PYSITELIB}/pip/_vendor/progress/bar.py
${PYSITELIB}/pip/_vendor/progress/bar.pyc
${PYSITELIB}/pip/_vendor/progress/bar.pyo
${PYSITELIB}/pip/_vendor/progress/colors.py
${PYSITELIB}/pip/_vendor/progress/colors.pyc
${PYSITELIB}/pip/_vendor/progress/colors.pyo
${PYSITELIB}/pip/_vendor/progress/counter.py
${PYSITELIB}/pip/_vendor/progress/counter.pyc
${PYSITELIB}/pip/_vendor/progress/counter.pyo
${PYSITELIB}/pip/_vendor/progress/spinner.py
${PYSITELIB}/pip/_vendor/progress/spinner.pyc
${PYSITELIB}/pip/_vendor/progress/spinner.pyo
${PYSITELIB}/pip/_vendor/pygments/__init__.py
${PYSITELIB}/pip/_vendor/pygments/__init__.pyc
${PYSITELIB}/pip/_vendor/pygments/__init__.pyo
Expand Down Expand Up @@ -1211,9 +1214,15 @@ ${PYSITELIB}/pip/_vendor/rich/_stack.pyo
${PYSITELIB}/pip/_vendor/rich/_timer.py
${PYSITELIB}/pip/_vendor/rich/_timer.pyc
${PYSITELIB}/pip/_vendor/rich/_timer.pyo
${PYSITELIB}/pip/_vendor/rich/_win32_console.py
${PYSITELIB}/pip/_vendor/rich/_win32_console.pyc
${PYSITELIB}/pip/_vendor/rich/_win32_console.pyo
${PYSITELIB}/pip/_vendor/rich/_windows.py
${PYSITELIB}/pip/_vendor/rich/_windows.pyc
${PYSITELIB}/pip/_vendor/rich/_windows.pyo
${PYSITELIB}/pip/_vendor/rich/_windows_renderer.py
${PYSITELIB}/pip/_vendor/rich/_windows_renderer.pyc
${PYSITELIB}/pip/_vendor/rich/_windows_renderer.pyo
${PYSITELIB}/pip/_vendor/rich/_wrap.py
${PYSITELIB}/pip/_vendor/rich/_wrap.pyc
${PYSITELIB}/pip/_vendor/rich/_wrap.pyo
Expand Down Expand Up @@ -1364,9 +1373,6 @@ ${PYSITELIB}/pip/_vendor/rich/syntax.pyo
${PYSITELIB}/pip/_vendor/rich/table.py
${PYSITELIB}/pip/_vendor/rich/table.pyc
${PYSITELIB}/pip/_vendor/rich/table.pyo
${PYSITELIB}/pip/_vendor/rich/tabulate.py
${PYSITELIB}/pip/_vendor/rich/tabulate.pyc
${PYSITELIB}/pip/_vendor/rich/tabulate.pyo
${PYSITELIB}/pip/_vendor/rich/terminal_theme.py
${PYSITELIB}/pip/_vendor/rich/terminal_theme.pyc
${PYSITELIB}/pip/_vendor/rich/terminal_theme.pyo
Expand Down Expand Up @@ -1430,6 +1436,9 @@ ${PYSITELIB}/pip/_vendor/tomli/_parser.pyo
${PYSITELIB}/pip/_vendor/tomli/_re.py
${PYSITELIB}/pip/_vendor/tomli/_re.pyc
${PYSITELIB}/pip/_vendor/tomli/_re.pyo
${PYSITELIB}/pip/_vendor/tomli/_types.py
${PYSITELIB}/pip/_vendor/tomli/_types.pyc
${PYSITELIB}/pip/_vendor/tomli/_types.pyo
${PYSITELIB}/pip/_vendor/typing_extensions.py
${PYSITELIB}/pip/_vendor/typing_extensions.pyc
${PYSITELIB}/pip/_vendor/typing_extensions.pyo
Expand Down
10 changes: 5 additions & 5 deletions devel/py-pip/distinfo
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$NetBSD: distinfo,v 1.45 2022/04/20 21:04:12 wiz Exp $
$NetBSD: distinfo,v 1.46 2022/07/07 11:48:51 adam Exp $

BLAKE2s (pip-22.0.4.tar.gz) = c8a469895424643117d49a5b293eda69bb6a4d6a64e5bd2632e36f0b47147d19
SHA512 (pip-22.0.4.tar.gz) = 5d1e38832050fedfdb0f013e31d41d0874a08a2b031a9bac7d856995c6d655c0e104e698fe519e8acfd000d5cd1b623eb17ceeabc35014d7c9a9183597e84a86
Size (pip-22.0.4.tar.gz) = 2090742 bytes
SHA1 (patch-src_pip___internal_build__env.py) = 6fe99f9ca2d88b21ed084c01817958098a2a0140
BLAKE2s (pip-22.1.2.tar.gz) = 8bb5a1718ac4bb34974a2cbeaa1688a1936168ba14ebdbec69a5143ceef07748
SHA512 (pip-22.1.2.tar.gz) = 7adcb23e52fd946944b2f6b6518ff3a9208e662b963aafce3396c2a719aa2e2214c6c83ce9dfa345d066e55e5132c8fcc3e9645eed054c6182f00a93e51ac44e
Size (pip-22.1.2.tar.gz) = 2112549 bytes
SHA1 (patch-src_pip___internal_build__env.py) = 363eb58869db2c70b3169b9c4360fd344153e86c
6 changes: 3 additions & 3 deletions devel/py-pip/patches/patch-src_pip___internal_build__env.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
$NetBSD: patch-src_pip___internal_build__env.py,v 1.2 2022/04/20 21:04:12 wiz Exp $
$NetBSD: patch-src_pip___internal_build__env.py,v 1.3 2022/07/07 11:48:51 adam Exp $

Copy distutils distro config file to overlay.
https://github.com/pypa/pip/issues/10949

--- src/pip/_internal/build_env.py.orig 2022-03-07 07:42:01.000000000 +0000
--- src/pip/_internal/build_env.py.orig 2022-05-31 11:18:59.000000000 +0000
+++ src/pip/_internal/build_env.py
@@ -9,6 +9,7 @@ import sys
import textwrap
Expand All @@ -12,7 +12,7 @@
+from shutil import copy
from sysconfig import get_paths
from types import TracebackType
from typing import TYPE_CHECKING, Iterable, Iterator, List, Optional, Set, Tuple, Type
from typing import TYPE_CHECKING, Generator, Iterable, List, Optional, Set, Tuple, Type
@@ -93,6 +94,9 @@ class BuildEnvironment:
self._site_dir = os.path.join(temp_dir.path, "site")
if not os.path.exists(self._site_dir):
Expand Down

0 comments on commit d108e1c

Please sign in to comment.