[arch-commits] Commit in python-pip/repos (4 files)

David Runge dvzrv at gemini.archlinux.org
Mon Jun 27 14:53:41 UTC 2022


    Date: Monday, June 27, 2022 @ 14:53:40
  Author: dvzrv
Revision: 449490

archrelease: copy trunk to staging-any

Added:
  python-pip/repos/staging-any/
  python-pip/repos/staging-any/PKGBUILD
    (from rev 449489, python-pip/trunk/PKGBUILD)
  python-pip/repos/staging-any/pip-22.1.2-devendor.patch
    (from rev 449489, python-pip/trunk/pip-22.1.2-devendor.patch)
  python-pip/repos/staging-any/pip-22.1.2-devendor_imports.patch
    (from rev 449489, python-pip/trunk/pip-22.1.2-devendor_imports.patch)

-----------------------------------+
 PKGBUILD                          |  135 ++++++++++++++++++++++++++++++++++++
 pip-22.1.2-devendor.patch         |   12 +++
 pip-22.1.2-devendor_imports.patch |   21 +++++
 3 files changed, 168 insertions(+)

Copied: python-pip/repos/staging-any/PKGBUILD (from rev 449489, python-pip/trunk/PKGBUILD)
===================================================================
--- staging-any/PKGBUILD	                        (rev 0)
+++ staging-any/PKGBUILD	2022-06-27 14:53:40 UTC (rev 449490)
@@ -0,0 +1,135 @@
+# Maintainer: David Runge <dvzrv at archlinux.org>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Dan McGee <dan at archlinux.org>
+# Contributor: Eli Schwartz <eschwartz at archlinux.org>
+# Contributor: Sebastien Binet <binet at lblbox>
+
+_name=pip
+pkgname=python-pip
+pkgver=22.1.2
+pkgrel=1
+pkgdesc="The PyPA recommended tool for installing Python packages"
+url="https://pip.pypa.io/"
+arch=(any)
+license=(MIT)
+# packages required to devendor pip: https://github.com/pypa/pip/tree/main/src/pip/_vendor
+_vendored=(
+  python-cachecontrol
+  python-certifi
+  python-chardet
+  python-colorama
+  python-distlib
+  python-distro
+  python-html5lib
+  python-idna
+  python-msgpack
+  python-packaging
+  python-pep517
+  python-platformdirs
+  python-pygments
+  python-pyparsing
+  python-requests
+  python-resolvelib
+  python-rich
+  python-setuptools
+  python-six
+  python-tenacity
+  python-tomli
+  python-typing-extensions
+  python-urllib3
+  python-webencodings
+)
+# add these until https://github.com/pypa/pip/issues/5354#issuecomment-672678167 is resolved
+_vendored_optional=(
+  python-pyopenssl
+)
+depends=("${_vendored[@]}" "${_vendored_optional[@]}")
+makedepends=(
+  python-build
+  python-installer
+  python-myst-parser
+  python-setuptools
+  python-sphinx
+  python-sphinx-copybutton
+  python-sphinx-inline-tabs
+  python-sphinxcontrib-towncrier
+  python-wheel
+)
+checkdepends=(
+  git
+  python-cryptography
+  python-freezegun
+  python-pytest
+  python-pytest-rerunfailures
+  python-pytest-xdist
+  python-scripttest
+  python-setuptools
+  python-tomli-w
+  python-virtualenv
+  python-werkzeug
+  python-wheel
+  subversion
+)
+source=(
+  $_name-$pkgver.tar.gz::https://github.com/pypa/$_name/archive/$pkgver.tar.gz
+  $_name-22.1.2-devendor.patch
+  $_name-22.1.2-devendor_imports.patch
+)
+sha512sums=('7dd13150023f1cca8f5e01da7688ae418b5d0b36364efcfc15374a5147c7cabd46ff1d34e6499bc8e182dc0d34a366f5fe21d8ab4de4d112d269a97200401305'
+            '90f07252786d765c8ba7ce12915ed9434d3696addb8e5cfff298f280b9f499ad6836a158c9f515a51fc7373f1a77b9eb550b7855609114b041aa7bc5b2b821ae'
+            '5abdd74c505f649e381c807607c98edeab45671ca48bb7d99fc85d35191bbe7addbcadb4b833d8851095896433a8860a703c80e120a15038afb234448cea514d')
+b2sums=('f709f8977d467d5a3170884bb75cd2f74a2f40801ae02a3725d442e18e4073f9c4a39cd1c9d2ce3949eb888be69d151f67d0cf2d0cbad7e2ec1ec6e78150b5c7'
+        '892455034738c6c7a74cd7c136c0650f9c4eb54dd4708cf43d2e17ecbd9904adb567c9c3d5a05865048645ad3aac65406a82d23af43fd3889d9290b66d89ead5'
+        '256b5cc8b0f91265965ca90f443033f540fc698fca981cc9b30fbba60fcc9a82b2f7acfabb807db0911677f5a50ad3387879adf6ee21b6029cad47ed2abe7ebd')
+
+shopt -s extglob
+prepare() {
+  # set DEBUNDLED to True
+  patch -Np1 -d $_name-$pkgver -i ../$_name-22.1.2-devendor.patch
+  # add missing imports for rich for devendoring: https://github.com/pypa/pip/pull/11211
+  patch -Np1 -d $_name-$pkgver -i ../$_name-22.1.2-devendor_imports.patch
+
+  # remove vendored files, except __init__.py
+  rm -frv $_name-$pkgver/src/pip/_vendor/!(__init__.py)
+  shopt -u extglob
+}
+
+build() {
+  cd $_name-$pkgver
+
+  python -m build --wheel --no-isolation
+
+  cd docs/
+  PYTHONPATH="$srcdir/$_name-$pkgver/src/" python pip_sphinxext.py
+  PYTHONPATH="$srcdir/$_name-$pkgver/src/" sphinx-build -b man -d build/doctrees/man man build/man -c html
+}
+
+check() {
+  local _site_packages=$(python -c "import site; print(site.getsitepackages()[0])")
+  local _deselected=(
+    # deselect tests that would require python-pip in checkdepends (may or may not work due to devendored dependencies when python-pip is updated)
+    --deselect tests/unit/test_direct_url_helpers.py::test_from_link_vcs_with_source_dir_obtains_commit_id
+    --deselect tests/unit/test_direct_url_helpers.py::test_from_link_vcs_without_source_dir
+    --deselect tests/unit/test_wheel_builder.py::test_should_cache_git_sha
+  )
+
+  cd $_name-$pkgver
+  # install to temporary location
+  python -m installer --destdir=test_dir dist/*.whl
+  export PYTHONPATH="test_dir/$_site_packages:$PYTHONPATH"
+  pytest -vv -m unit "${_deselected[@]}"
+}
+
+package() {
+  local _site_packages=$(python -c "import site; print(site.getsitepackages()[0])")
+
+  cd $_name-$pkgver
+  python -m installer --destdir="$pkgdir" dist/*.whl
+
+  install -vDm 644 LICENSE.txt -t "$pkgdir/usr/share/licenses/$pkgname/"
+  install -vDm 644 docs/build/man/*.1 -t "$pkgdir/usr/share/man/man1/"
+
+  # NOTE: zsh completion does not work: https://bugs.archlinux.org/task/65349#comment187166
+  PYTHONPATH="$pkgdir/$_site_packages" "$pkgdir"/usr/bin/pip completion --bash | install -vDm 644 /dev/stdin "$pkgdir"/usr/share/bash-completion/completions/pip
+  PYTHONPATH="$pkgdir/$_site_packages" "$pkgdir"/usr/bin/pip completion --fish | install -vDm 644 /dev/stdin "$pkgdir"/usr/share/fish/vendor_completions.d/pip.fish
+}

Copied: python-pip/repos/staging-any/pip-22.1.2-devendor.patch (from rev 449489, python-pip/trunk/pip-22.1.2-devendor.patch)
===================================================================
--- staging-any/pip-22.1.2-devendor.patch	                        (rev 0)
+++ staging-any/pip-22.1.2-devendor.patch	2022-06-27 14:53:40 UTC (rev 449490)
@@ -0,0 +1,12 @@
+diff -ruN a/src/pip/_vendor/__init__.py b/src/pip/_vendor/__init__.py
+--- a/src/pip/_vendor/__init__.py	2022-05-31 13:05:52.000000000 +0200
++++ b/src/pip/_vendor/__init__.py	2022-06-27 13:03:22.909131639 +0200
+@@ -14,7 +14,7 @@
+ # Downstream redistributors which have debundled our dependencies should also
+ # patch this value to be true. This will trigger the additional patching
+ # to cause things like "six" to be available as pip.
+-DEBUNDLED = False
++DEBUNDLED = True
+ 
+ # By default, look in this directory for a bunch of .whl files which we will
+ # add to the beginning of sys.path before attempting to import anything. This

Copied: python-pip/repos/staging-any/pip-22.1.2-devendor_imports.patch (from rev 449489, python-pip/trunk/pip-22.1.2-devendor_imports.patch)
===================================================================
--- staging-any/pip-22.1.2-devendor_imports.patch	                        (rev 0)
+++ staging-any/pip-22.1.2-devendor_imports.patch	2022-06-27 14:53:40 UTC (rev 449490)
@@ -0,0 +1,21 @@
+diff --git c/src/pip/_vendor/__init__.py w/src/pip/_vendor/__init__.py
+index 3843cb099..39579aa96 100644
+--- c/src/pip/_vendor/__init__.py
++++ w/src/pip/_vendor/__init__.py
+@@ -106,6 +106,16 @@ if DEBUNDLED:
+     vendored("requests.packages.urllib3.util.timeout")
+     vendored("requests.packages.urllib3.util.url")
+     vendored("resolvelib")
++    vendored("rich")
++    vendored("rich.console")
++    vendored("rich.highlighter")
++    vendored("rich.logging")
++    vendored("rich.markup")
++    vendored("rich.progress")
++    vendored("rich.segment")
++    vendored("rich.style")
++    vendored("rich.text")
++    vendored("rich.traceback")
+     vendored("tenacity")
+     vendored("tomli")
+     vendored("urllib3")



More information about the arch-commits mailing list