[arch-commits] Commit in python-pip/repos/extra-any (3 files)

David Runge dvzrv at gemini.archlinux.org
Sun Aug 28 14:22:42 UTC 2022


    Date: Sunday, August 28, 2022 @ 14:22:39
  Author: dvzrv
Revision: 454673

archrelease: copy trunk to extra-any

Added:
  python-pip/repos/extra-any/PKGBUILD
    (from rev 454672, python-pip/trunk/PKGBUILD)
Deleted:
  python-pip/repos/extra-any/PKGBUILD
  python-pip/repos/extra-any/pip-22.1.2-devendor.patch

---------------------------+
 PKGBUILD                  |  215 +++++++++++++++++---------------------------
 pip-22.1.2-devendor.patch |   12 --
 2 files changed, 85 insertions(+), 142 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-28 14:22:25 UTC (rev 454672)
+++ PKGBUILD	2022-08-28 14:22:39 UTC (rev 454673)
@@ -1,130 +0,0 @@
-# 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.2.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-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
-)
-sha512sums=('bd59e28b55475b77a8f11ea771cbad3b2602ff974e219f9a55288963a9522c9279a5b00fde40fb65cfebefae0e905d3da3c06fe50b402aa5326b25f70a98a015'
-            '90f07252786d765c8ba7ce12915ed9434d3696addb8e5cfff298f280b9f499ad6836a158c9f515a51fc7373f1a77b9eb550b7855609114b041aa7bc5b2b821ae')
-b2sums=('2179b0d3f5f05bbd678f1785b4dbc0613078c09c83b45faa62d766182dfeb564095abda809ed99f45644abcb06c125efc528aeaed3ad40ab1c9e8972e33ccbb2'
-        '892455034738c6c7a74cd7c136c0650f9c4eb54dd4708cf43d2e17ecbd9904adb567c9c3d5a05865048645ad3aac65406a82d23af43fd3889d9290b66d89ead5')
-
-shopt -s extglob
-prepare() {
-  # set DEBUNDLED to True
-  patch -Np1 -d $_name-$pkgver -i ../$_name-22.1.2-devendor.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/"
-  install -vDm 644 {NEWS,README}.rst -t "$pkgdir/usr/share/doc/$pkgname/"
-
-  # 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/extra-any/PKGBUILD (from rev 454672, python-pip/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-08-28 14:22:39 UTC (rev 454673)
@@ -0,0 +1,85 @@
+# 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.2.2
+pkgrel=2
+pkgdesc="The PyPA recommended tool for installing Python packages"
+url="https://pip.pypa.io/"
+arch=(any)
+license=(MIT)
+depends=(python)
+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)
+sha512sums=('bd59e28b55475b77a8f11ea771cbad3b2602ff974e219f9a55288963a9522c9279a5b00fde40fb65cfebefae0e905d3da3c06fe50b402aa5326b25f70a98a015')
+b2sums=('2179b0d3f5f05bbd678f1785b4dbc0613078c09c83b45faa62d766182dfeb564095abda809ed99f45644abcb06c125efc528aeaed3ad40ab1c9e8972e33ccbb2')
+
+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/"
+  install -vDm 644 {NEWS,README}.rst -t "$pkgdir/usr/share/doc/$pkgname/"
+
+  # 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
+}

Deleted: pip-22.1.2-devendor.patch
===================================================================
--- pip-22.1.2-devendor.patch	2022-08-28 14:22:25 UTC (rev 454672)
+++ pip-22.1.2-devendor.patch	2022-08-28 14:22:39 UTC (rev 454673)
@@ -1,12 +0,0 @@
-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



More information about the arch-commits mailing list