[arch-commits] Commit in python-pip/repos/staging-any (4 files)
Felix Yan
felixonmars at gemini.archlinux.org
Wed Dec 1 20:14:38 UTC 2021
Date: Wednesday, December 1, 2021 @ 20:14:37
Author: felixonmars
Revision: 430121
archrelease: copy trunk to staging-any
Added:
python-pip/repos/staging-any/PKGBUILD
(from rev 430120, python-pip/trunk/PKGBUILD)
python-pip/repos/staging-any/resolvelib-0.5.5.patch
(from rev 430120, python-pip/trunk/resolvelib-0.5.5.patch)
Deleted:
python-pip/repos/staging-any/PKGBUILD
python-pip/repos/staging-any/resolvelib-0.5.5.patch
------------------------+
PKGBUILD | 189 +++++++++++++++++++++++------------------------
resolvelib-0.5.5.patch | 90 +++++++++++-----------
2 files changed, 139 insertions(+), 140 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-12-01 20:14:27 UTC (rev 430120)
+++ PKGBUILD 2021-12-01 20:14:37 UTC (rev 430121)
@@ -1,95 +0,0 @@
-# Maintainer: Dan McGee <dan at archlinux.org>
-# Contributor: Eli Schwartz <eschwartz at archlinux.org>
-# Contributor: Sebastien Binet <binet at lblbox>
-
-pkgname=python-pip
-pkgver=20.3.4
-pkgrel=3
-pkgdesc="The PyPA recommended tool for installing Python packages"
-url="https://pip.pypa.io/"
-arch=('any')
-license=('MIT')
-_deps=('appdirs' 'cachecontrol' 'colorama' 'contextlib2' 'distlib' 'distro' 'html5lib'
- 'packaging' 'pep517' 'progress' 'requests' 'retrying' 'resolvelib' 'setuptools' 'six' 'toml'
- # add these until https://github.com/pypa/pip/issues/5354#issuecomment-672678167 is resolved
- 'pyopenssl')
-depends=("${_deps[@]/#/python-}")
-makedepends=("${_deps[@]/#/python-}" 'python-sphinx'
- 'python-sphinx-inline-tabs')
-checkdepends=('python-pytest-runner' 'python-scripttest' 'python-virtualenv' 'python-pretend'
- 'python-yaml' 'python-mock' 'python-freezegun' 'python-cryptography' 'python-pip'
- 'python-wheel' 'python-werkzeug' 'python-csv23' 'git' 'subversion')
-source=("pip-${pkgver}.tar.gz::https://github.com/pypa/pip/archive/${pkgver}.tar.gz"
- resolvelib-0.5.5.patch)
-sha512sums=('30e9d6d5dfc54681ca07e5701e26cdde202326848f6b37a013fe1fcc38402efa81284e15d7750de97d871e0da995cf5363e5c9676a036d271ff06bb0052cc1ec'
- 'f339a20e965c583c1dc741d9fff90749aab049d591f0ac974e2187d4f41842661802b96266e8e35454b65d61d65c337a770d58b81119af07483fde0eda48001b')
-
-shopt -s extglob
-prepare() {
- cd pip-$pkgver
-
- # Backported from:
- # https://github.com/pypa/pip/commit/0d39ae9734d054c25e48e2da7ddb76545e5de330
- patch -p1 -i ../resolvelib-0.5.5.patch
-
- # Remove certifi usage
- sed -i 's|from pip._vendor.certifi import where|where = lambda: "/etc/ssl/certs/ca-certificates.crt"|' src/pip/_internal/commands/debug.py
-
- rm -rf src/pip/_vendor/!(__init__.py)
- sed -i -e 's/DEBUNDLED = False/DEBUNDLED = True/' \
- src/pip/_vendor/__init__.py
-}
-
-build() {
- cd pip-$pkgver
-
- python setup.py build
- return # skip docs for bootstrap
-
- cd docs/
- PYTHONPATH="$srcdir/pip-$pkgver/src/" python pip_sphinxext.py
- PYTHONPATH="$srcdir/pip-$pkgver/src/" sphinx-build -W -b man -d build/doctrees/man man build/man -c html
- mkdir -p build/man-pip2
- cd build/man
- for manfile in *; do
- sed 's/pip/pip2/g;s/PIP/PIP2/g' $manfile > ../man-pip2/${manfile/pip/pip2}
- done
-}
-
-check() {
- cd "$srcdir"/pip-$pkgver
- pip wheel -w tests/data/common_wheels -r tools/requirements/tests-common_wheels.txt
- python setup.py install --root="$PWD/tmp_install" --optimize=1
- # appdirs: https://github.com/pypa/pip/issues/7784
- # build_env: TODO weird looking errors
- # virtualenv: https://github.com/pypa/pip/issues/8273
- PYTHONPATH="$PWD/tmp_install/usr/lib/python3.10/site-packages" PATH="$PWD/tmp_install/usr/bin:$PATH" \
- python -m pytest -m unit --junit-xml=junit/unit-test.xml --deselect tests/unit/test_appdirs.py::TestSiteConfigDirs::test_site_config_dirs_linux \
- --deselect tests/unit/test_appdirs.py::TestSiteConfigDirs::test_site_config_dirs_linux_override \
- --deselect tests/unit/test_appdirs.py::TestSiteConfigDirs::test_site_config_dirs_linux_empty \
- --deselect tests/unit/test_appdirs.py::TestUserDataDir::test_user_data_dir_osx \
- --deselect tests/unit/test_appdirs.py::TestUserConfigDir::test_user_config_dir_osx \
- --deselect tests/unit/test_build_env.py::test_build_env_requirements_check \
- --deselect tests/unit/test_build_env.py::test_build_env_overlay_prefix_has_priority \
- --deselect tests/unit/test_build_env.py::test_build_env_isolation \
- --deselect tests/unit/test_build_env.py::test_build_env_allow_only_one_install \
- --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 \
- --deselect tests/unit/resolution_resolvelib/test_requirement.py::test_new_resolver_full_resolve
-}
-
-package() {
- cd pip-$pkgver
- python setup.py install --prefix=/usr --root="$pkgdir"
-
- install -D -m644 LICENSE.txt \
- "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-
- #install -Dm644 -t "$pkgdir"/usr/share/man/man1 docs/build/man/*
-
- PYTHONPATH="$pkgdir"/usr/lib/python3.10/site-packages "$pkgdir"/usr/bin/pip completion --bash \
- | install -Dm644 /dev/stdin "$pkgdir"/usr/share/bash-completion/completions/pip
- PYTHONPATH="$pkgdir"/usr/lib/python3.10/site-packages "$pkgdir"/usr/bin/pip completion --fish \
- | install -Dm644 /dev/stdin "$pkgdir"/usr/share/fish/vendor_completions.d/pip.fish
-}
Copied: python-pip/repos/staging-any/PKGBUILD (from rev 430120, python-pip/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-12-01 20:14:37 UTC (rev 430121)
@@ -0,0 +1,94 @@
+# Maintainer: Dan McGee <dan at archlinux.org>
+# Contributor: Eli Schwartz <eschwartz at archlinux.org>
+# Contributor: Sebastien Binet <binet at lblbox>
+
+pkgname=python-pip
+pkgver=20.3.4
+pkgrel=4
+pkgdesc="The PyPA recommended tool for installing Python packages"
+url="https://pip.pypa.io/"
+arch=('any')
+license=('MIT')
+_deps=('appdirs' 'cachecontrol' 'colorama' 'contextlib2' 'distlib' 'distro' 'html5lib'
+ 'packaging' 'pep517' 'progress' 'requests' 'retrying' 'resolvelib' 'setuptools' 'six' 'toml'
+ # add these until https://github.com/pypa/pip/issues/5354#issuecomment-672678167 is resolved
+ 'pyopenssl')
+depends=("${_deps[@]/#/python-}")
+makedepends=("${_deps[@]/#/python-}" 'python-sphinx'
+ 'python-sphinx-inline-tabs')
+checkdepends=('python-pytest-runner' 'python-scripttest' 'python-virtualenv' 'python-pretend'
+ 'python-yaml' 'python-mock' 'python-freezegun' 'python-cryptography' 'python-pip'
+ 'python-wheel' 'python-werkzeug' 'python-csv23' 'git' 'subversion')
+source=("pip-${pkgver}.tar.gz::https://github.com/pypa/pip/archive/${pkgver}.tar.gz"
+ resolvelib-0.5.5.patch)
+sha512sums=('30e9d6d5dfc54681ca07e5701e26cdde202326848f6b37a013fe1fcc38402efa81284e15d7750de97d871e0da995cf5363e5c9676a036d271ff06bb0052cc1ec'
+ 'f339a20e965c583c1dc741d9fff90749aab049d591f0ac974e2187d4f41842661802b96266e8e35454b65d61d65c337a770d58b81119af07483fde0eda48001b')
+
+shopt -s extglob
+prepare() {
+ cd pip-$pkgver
+
+ # Backported from:
+ # https://github.com/pypa/pip/commit/0d39ae9734d054c25e48e2da7ddb76545e5de330
+ patch -p1 -i ../resolvelib-0.5.5.patch
+
+ # Remove certifi usage
+ sed -i 's|from pip._vendor.certifi import where|where = lambda: "/etc/ssl/certs/ca-certificates.crt"|' src/pip/_internal/commands/debug.py
+
+ rm -rf src/pip/_vendor/!(__init__.py)
+ sed -i -e 's/DEBUNDLED = False/DEBUNDLED = True/' \
+ src/pip/_vendor/__init__.py
+}
+
+build() {
+ cd pip-$pkgver
+
+ python setup.py build
+
+ cd docs/
+ PYTHONPATH="$srcdir/pip-$pkgver/src/" python pip_sphinxext.py
+ PYTHONPATH="$srcdir/pip-$pkgver/src/" sphinx-build -W -b man -d build/doctrees/man man build/man -c html
+ mkdir -p build/man-pip2
+ cd build/man
+ for manfile in *; do
+ sed 's/pip/pip2/g;s/PIP/PIP2/g' $manfile > ../man-pip2/${manfile/pip/pip2}
+ done
+}
+
+check() {
+ cd "$srcdir"/pip-$pkgver
+ pip wheel -w tests/data/common_wheels -r tools/requirements/tests-common_wheels.txt
+ python setup.py install --root="$PWD/tmp_install" --optimize=1
+ # appdirs: https://github.com/pypa/pip/issues/7784
+ # build_env: TODO weird looking errors
+ # virtualenv: https://github.com/pypa/pip/issues/8273
+ PYTHONPATH="$PWD/tmp_install/usr/lib/python3.10/site-packages" PATH="$PWD/tmp_install/usr/bin:$PATH" \
+ python -m pytest -m unit --junit-xml=junit/unit-test.xml --deselect tests/unit/test_appdirs.py::TestSiteConfigDirs::test_site_config_dirs_linux \
+ --deselect tests/unit/test_appdirs.py::TestSiteConfigDirs::test_site_config_dirs_linux_override \
+ --deselect tests/unit/test_appdirs.py::TestSiteConfigDirs::test_site_config_dirs_linux_empty \
+ --deselect tests/unit/test_appdirs.py::TestUserDataDir::test_user_data_dir_osx \
+ --deselect tests/unit/test_appdirs.py::TestUserConfigDir::test_user_config_dir_osx \
+ --deselect tests/unit/test_build_env.py::test_build_env_requirements_check \
+ --deselect tests/unit/test_build_env.py::test_build_env_overlay_prefix_has_priority \
+ --deselect tests/unit/test_build_env.py::test_build_env_isolation \
+ --deselect tests/unit/test_build_env.py::test_build_env_allow_only_one_install \
+ --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 \
+ --deselect tests/unit/resolution_resolvelib/test_requirement.py::test_new_resolver_full_resolve
+}
+
+package() {
+ cd pip-$pkgver
+ python setup.py install --prefix=/usr --root="$pkgdir"
+
+ install -D -m644 LICENSE.txt \
+ "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+ install -Dm644 -t "$pkgdir"/usr/share/man/man1 docs/build/man/*
+
+ PYTHONPATH="$pkgdir"/usr/lib/python3.10/site-packages "$pkgdir"/usr/bin/pip completion --bash \
+ | install -Dm644 /dev/stdin "$pkgdir"/usr/share/bash-completion/completions/pip
+ PYTHONPATH="$pkgdir"/usr/lib/python3.10/site-packages "$pkgdir"/usr/bin/pip completion --fish \
+ | install -Dm644 /dev/stdin "$pkgdir"/usr/share/fish/vendor_completions.d/pip.fish
+}
Deleted: resolvelib-0.5.5.patch
===================================================================
--- resolvelib-0.5.5.patch 2021-12-01 20:14:27 UTC (rev 430120)
+++ resolvelib-0.5.5.patch 2021-12-01 20:14:37 UTC (rev 430121)
@@ -1,45 +0,0 @@
-From 0d39ae9734d054c25e48e2da7ddb76545e5de330 Mon Sep 17 00:00:00 2001
-From: Tzu-ping Chung <uranusjr at gmail.com>
-Date: Tue, 9 Mar 2021 05:20:23 +0800
-Subject: [PATCH] Pull in resolvelib's typing information
-
----
- .../resolution/resolvelib/factory.py | 9 ++-
- .../resolution/resolvelib/provider.py | 24 ++++--
- .../resolution/resolvelib/resolver.py | 25 +++++--
- src/pip/_vendor/resolvelib.pyi | 1 -
- src/pip/_vendor/resolvelib/__init__.py | 2 +-
- src/pip/_vendor/resolvelib/__init__.pyi | 15 ++++
- src/pip/_vendor/resolvelib/providers.py | 8 +-
- src/pip/_vendor/resolvelib/providers.pyi | 44 +++++++++++
- src/pip/_vendor/resolvelib/py.typed | 0
- src/pip/_vendor/resolvelib/reporters.pyi | 10 +++
- src/pip/_vendor/resolvelib/resolvers.py | 39 +++++-----
- src/pip/_vendor/resolvelib/resolvers.pyi | 73 +++++++++++++++++++
- src/pip/_vendor/resolvelib/structs.pyi | 35 +++++++++
- src/pip/_vendor/vendor.txt | 2 +-
- 14 files changed, 242 insertions(+), 45 deletions(-)
- delete mode 100644 src/pip/_vendor/resolvelib.pyi
- create mode 100644 src/pip/_vendor/resolvelib/__init__.pyi
- create mode 100644 src/pip/_vendor/resolvelib/providers.pyi
- create mode 100644 src/pip/_vendor/resolvelib/py.typed
- create mode 100644 src/pip/_vendor/resolvelib/reporters.pyi
- create mode 100644 src/pip/_vendor/resolvelib/resolvers.pyi
- create mode 100644 src/pip/_vendor/resolvelib/structs.pyi
-
-diff --git a/src/pip/_internal/resolution/resolvelib/provider.py b/src/pip/_internal/resolution/resolvelib/provider.py
-index 2085a0714a3..cd2ccfa60a3 100644
---- a/src/pip/_internal/resolution/resolvelib/provider.py
-+++ b/src/pip/_internal/resolution/resolvelib/provider.py
-@@ -50,9 +50,9 @@ def __init__(
- self._upgrade_strategy = upgrade_strategy
- self._user_requested = user_requested
-
-- def identify(self, dependency):
-+ def identify(self, requirement_or_candidate):
- # type: (Union[Requirement, Candidate]) -> str
-- return dependency.name
-+ return requirement_or_candidate.name
-
- def get_preference(
- self,
Copied: python-pip/repos/staging-any/resolvelib-0.5.5.patch (from rev 430120, python-pip/trunk/resolvelib-0.5.5.patch)
===================================================================
--- resolvelib-0.5.5.patch (rev 0)
+++ resolvelib-0.5.5.patch 2021-12-01 20:14:37 UTC (rev 430121)
@@ -0,0 +1,45 @@
+From 0d39ae9734d054c25e48e2da7ddb76545e5de330 Mon Sep 17 00:00:00 2001
+From: Tzu-ping Chung <uranusjr at gmail.com>
+Date: Tue, 9 Mar 2021 05:20:23 +0800
+Subject: [PATCH] Pull in resolvelib's typing information
+
+---
+ .../resolution/resolvelib/factory.py | 9 ++-
+ .../resolution/resolvelib/provider.py | 24 ++++--
+ .../resolution/resolvelib/resolver.py | 25 +++++--
+ src/pip/_vendor/resolvelib.pyi | 1 -
+ src/pip/_vendor/resolvelib/__init__.py | 2 +-
+ src/pip/_vendor/resolvelib/__init__.pyi | 15 ++++
+ src/pip/_vendor/resolvelib/providers.py | 8 +-
+ src/pip/_vendor/resolvelib/providers.pyi | 44 +++++++++++
+ src/pip/_vendor/resolvelib/py.typed | 0
+ src/pip/_vendor/resolvelib/reporters.pyi | 10 +++
+ src/pip/_vendor/resolvelib/resolvers.py | 39 +++++-----
+ src/pip/_vendor/resolvelib/resolvers.pyi | 73 +++++++++++++++++++
+ src/pip/_vendor/resolvelib/structs.pyi | 35 +++++++++
+ src/pip/_vendor/vendor.txt | 2 +-
+ 14 files changed, 242 insertions(+), 45 deletions(-)
+ delete mode 100644 src/pip/_vendor/resolvelib.pyi
+ create mode 100644 src/pip/_vendor/resolvelib/__init__.pyi
+ create mode 100644 src/pip/_vendor/resolvelib/providers.pyi
+ create mode 100644 src/pip/_vendor/resolvelib/py.typed
+ create mode 100644 src/pip/_vendor/resolvelib/reporters.pyi
+ create mode 100644 src/pip/_vendor/resolvelib/resolvers.pyi
+ create mode 100644 src/pip/_vendor/resolvelib/structs.pyi
+
+diff --git a/src/pip/_internal/resolution/resolvelib/provider.py b/src/pip/_internal/resolution/resolvelib/provider.py
+index 2085a0714a3..cd2ccfa60a3 100644
+--- a/src/pip/_internal/resolution/resolvelib/provider.py
++++ b/src/pip/_internal/resolution/resolvelib/provider.py
+@@ -50,9 +50,9 @@ def __init__(
+ self._upgrade_strategy = upgrade_strategy
+ self._user_requested = user_requested
+
+- def identify(self, dependency):
++ def identify(self, requirement_or_candidate):
+ # type: (Union[Requirement, Candidate]) -> str
+- return dependency.name
++ return requirement_or_candidate.name
+
+ def get_preference(
+ self,
More information about the arch-commits
mailing list