Date: Tuesday, April 11, 2023 @ 14:53:16
Author: dvzrv
Revision: 1444675
archrelease: copy trunk to community-any
Added:
ansible-core/repos/community-any/PKGBUILD
(from rev 1444674, ansible-core/trunk/PKGBUILD)
ansible-core/repos/community-any/ansible-core-2.14.4-resolvelib_1.1.patch
(from rev 1444674,
ansible-core/trunk/ansible-core-2.14.4-resolvelib_1.1.patch)
Deleted:
ansible-core/repos/community-any/PKGBUILD
ansible-core/repos/community-any/ansible-core-2.14.4-resolvelib_1.1.patch
------------------------------------------+
PKGBUILD | 219 +++++++++++++----------------
ansible-core-2.14.4-resolvelib_1.1.patch | 69 +++++----
2 files changed, 144 insertions(+), 144 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-04-11 14:53:02 UTC (rev 1444674)
+++ PKGBUILD 2023-04-11 14:53:16 UTC (rev 1444675)
@@ -1,114 +0,0 @@
-# Maintainer: David Runge <[email protected]>
-# Maintainer: Sven-Hendrik Haase <[email protected]>
-# Maintainer: Robin Candau <[email protected]>
-# Contributor: Bartłomiej Piotrowski <[email protected]>
-# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com>
-# Contributor: Chris <[email protected]>
-# Contributor: m0ikz <[email protected]>
-# Contributor: atweiden <[email protected]>
-
-pkgname=ansible-core
-pkgver=2.14.4
-pkgrel=3
-pkgdesc='Radically simple IT automation platform'
-arch=('any')
-url='https://pypi.org/project/ansible-core'
-license=('GPL3')
-depends=(
- 'python'
- 'python-cryptography'
- 'python-jinja'
- 'python-packaging'
- 'python-pyyaml'
- 'python-resolvelib'
-)
-# not directly required, but either convenient or indirectly required
-depends+=('python-paramiko' 'python-typing-extensions')
-makedepends=(
- 'python-build'
- 'python-docutils'
- 'python-installer'
- 'python-setuptools'
- 'python-straight.plugin'
- 'python-wheel'
-)
-checkdepends=(
- 'git'
- 'python-bcrypt'
- 'python-botocore'
- 'python-passlib'
- 'python-pexpect'
- 'python-py' # missing as dependency of python-pytest-forked
- 'python-pytest'
- 'python-pytest-mock'
- 'python-pytest-xdist'
- 'python-pytest-forked'
- 'python-pywinrm'
- 'python-voluptuous'
-)
-optdepends=(
- 'python-dnspython: for dig lookup'
- 'python-jmespath: json_query support'
- 'python-netaddr: for the ipaddr filter'
- 'python-passlib: crypt values for vars_prompt'
- 'python-pip: for module to manage Python libarary dependencies'
- 'python-pywinrm: connect to Windows machines'
- 'python-setuptools: for module to manage Python libarary dependencies'
- 'python-systemd: for journald support'
- 'sshpass: for ssh connections with password'
-)
-provides=('python-ansible' 'ansible-base')
-replaces=('ansible-base')
-backup=('etc/ansible/ansible.cfg')
-source=(
-
"https://pypi.python.org/packages/source/a/ansible-core/ansible-core-${pkgver}.tar.gz";
- "$pkgname-2.14.4-resolvelib_1.1.patch"
-)
-sha512sums=('86164dfded15232174e4f11140a71b91ef5b0d93b40a2df9588930b4b955f20feb419258c2bbf9d6735d298ec626c88c5e9b1c933a51e3273a28b85fac7a3762'
-
'f69bfd47c7079873c78ca795fb83826ffebfc6b5955759484c08edfd651baf0c9ef136b6df1a9bedceebd80fb26ee0f8b95b07f1fb38ee50506c65b17e2cef5a')
-b2sums=('ae096debaf676dbd46cb047f0f87af5d09b4265368500964bbd0cf3ac8e58969bee489d66486fb570a697df5b22065fae206f1df361eb911a7fe025628655371'
-
'87ab3cac6acdefbf265526803ace205ade1caed8a97e244a8e96d5329b1779661defb5fa0d4ebf2ebee7e2bc547a7996aa7adc82126d07d3b226ad2fd133370f')
-
-prepare() {
- # backport (minus test requirements!) of patch to add resolvelib < 1.1.0
support
- #
https://github.com/ansible/ansible/commit/b148fd8dd74c8599f809f71117a86577ccfb0638
- #
https://github.com/ansible/ansible/commit/016b7f71b10539c90ddbb3246f19f9cbf0e65428
- patch -Np1 -d $pkgname-$pkgver -i ../$pkgname-2.14.4-resolvelib_1.1.patch
-}
-
-build() {
- cd $pkgname-$pkgver
- python -m build --wheel --no-isolation
-
- make docs
-}
-
-# tests don't find the ansible-core internals:
https://github.com/ansible/ansible/issues/80472
-# check() {
-# local site_packages=$(python -c "import site;
print(site.getsitepackages()[0])")
-
-# cd $pkgname-$pkgver
-# # install to test location
-# # python -m installer --destdir=test_dir dist/*.whl
-# # export PYTHONPATH="test_dir/$site_packages:$PYTHONPATH"
-# # export PATH="$PWD/test_dir/usr/bin:$PATH"
-# # pytest -vv test/units/
-
-# # upstream test wrapper
-# # bin/ansible-test units
-
-# # run only locally
-# # export PYTHONPATH="lib:$PYTHONPATH"
-# # export PATH="bin:$PATH"
-# # pytest -vv --ignore test/integration/ --ignore test/ansible_test/
-# }
-
-package() {
- cd $pkgname-$pkgver
- python -m installer --destdir="$pkgdir" dist/*.whl
-
- install -Dm644 COPYING -t "${pkgdir}"/usr/share/doc/${pkgname}/
- install -Dm644 examples/ansible.cfg -t "${pkgdir}"/etc/ansible/
- install -Dm644 examples/{ansible.cfg,hosts} -t
"${pkgdir}"/usr/share/ansible/doc/examples/
- install -Dm644 docs/man/man1/*.1 -t "${pkgdir}"/usr/share/man/man1/
-}
Copied: ansible-core/repos/community-any/PKGBUILD (from rev 1444674,
ansible-core/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-04-11 14:53:16 UTC (rev 1444675)
@@ -0,0 +1,105 @@
+# Maintainer: David Runge <[email protected]>
+# Maintainer: Sven-Hendrik Haase <[email protected]>
+# Maintainer: Robin Candau <[email protected]>
+# Contributor: Bartłomiej Piotrowski <[email protected]>
+# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com>
+# Contributor: Chris <[email protected]>
+# Contributor: m0ikz <[email protected]>
+# Contributor: atweiden <[email protected]>
+
+pkgname=ansible-core
+pkgver=2.14.4
+pkgrel=5
+pkgdesc='Radically simple IT automation platform'
+arch=('any')
+url='https://pypi.org/project/ansible-core'
+license=('GPL3')
+depends=(
+ 'python'
+ 'python-cryptography'
+ 'python-jinja'
+ 'python-packaging'
+ 'python-pyyaml'
+ 'python-resolvelib'
+)
+# not directly required, but either convenient or indirectly required
+depends+=('python-paramiko' 'python-typing-extensions')
+makedepends=(
+ 'python-build'
+ 'python-docutils'
+ 'python-installer'
+ 'python-setuptools'
+ 'python-straight.plugin'
+ 'python-wheel'
+)
+checkdepends=(
+ 'git'
+ 'openssh'
+ 'python-bcrypt'
+ 'python-botocore'
+ 'python-passlib'
+ 'python-pexpect'
+ 'python-py' # missing as dependency of python-pytest-forked
+ 'python-pytest'
+ 'python-pytest-mock'
+ 'python-pytest-xdist'
+ 'python-pytest-forked'
+ 'python-pywinrm'
+ 'python-voluptuous'
+)
+optdepends=(
+ 'python-dnspython: for dig lookup'
+ 'python-jmespath: json_query support'
+ 'python-netaddr: for the ipaddr filter'
+ 'python-passlib: crypt values for vars_prompt'
+ 'python-pip: for module to manage Python libarary dependencies'
+ 'python-pywinrm: connect to Windows machines'
+ 'python-setuptools: for module to manage Python libarary dependencies'
+ 'python-systemd: for journald support'
+ 'sshpass: for ssh connections with password'
+)
+provides=('python-ansible' 'ansible-base')
+replaces=('ansible-base')
+backup=('etc/ansible/ansible.cfg')
+source=(
+
"https://pypi.python.org/packages/source/a/ansible-core/ansible-core-${pkgver}.tar.gz";
+ "$pkgname-2.14.4-resolvelib_1.1.patch"
+)
+sha512sums=('86164dfded15232174e4f11140a71b91ef5b0d93b40a2df9588930b4b955f20feb419258c2bbf9d6735d298ec626c88c5e9b1c933a51e3273a28b85fac7a3762'
+
'cdf1335d49ecec7bb4fff6b29cc0217d0dfa50ca9dc23338717bcbf807d06e7db8bb2c8037f8c613299f92d7db8733ce3e08f343dac33def3bf1612bd6e6bfca')
+b2sums=('ae096debaf676dbd46cb047f0f87af5d09b4265368500964bbd0cf3ac8e58969bee489d66486fb570a697df5b22065fae206f1df361eb911a7fe025628655371'
+
'712bc0366da99e8176bd80b7abbc2cdc3d9960911a39fedb7f1ae460577151bf13af9ca1225c28fa63c8feae30226cbc686765511459b81bc253745bf28ae246')
+
+prepare() {
+ # backport (minus test requirements!) of patch to add resolvelib < 1.1.0
support
+ #
https://github.com/ansible/ansible/commit/b148fd8dd74c8599f809f71117a86577ccfb0638
+ #
https://github.com/ansible/ansible/commit/016b7f71b10539c90ddbb3246f19f9cbf0e65428
+ patch -Np1 -d $pkgname-$pkgver -i ../$pkgname-2.14.4-resolvelib_1.1.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+ python -m build --wheel --no-isolation
+
+ make docs
+}
+
+check() {
+ local python_version=$(python -c 'import sys; print(".".join(map(str,
sys.version_info[:2])))')
+
+ # tests require upstream wrapper to find ansible-core internals:
https://github.com/ansible/ansible/issues/80472
+ cd $pkgname-$pkgver
+ # we do not have libselinux packaged
+ rm -v test/units/module_utils/basic/test_selinux.py
+ bin/ansible-test units --python $python_version --truncate 0
+}
+
+package() {
+ cd $pkgname-$pkgver
+ python -m installer --destdir="$pkgdir" dist/*.whl
+
+ install -Dm644 COPYING -t "${pkgdir}"/usr/share/doc/${pkgname}/
+ install -Dm644 examples/ansible.cfg -t "${pkgdir}"/etc/ansible/
+ install -Dm644 examples/{ansible.cfg,hosts} -t
"${pkgdir}"/usr/share/ansible/doc/examples/
+ install -Dm644 docs/man/man1/*.1 -t "${pkgdir}"/usr/share/man/man1/
+}
Deleted: ansible-core-2.14.4-resolvelib_1.1.patch
===================================================================
--- ansible-core-2.14.4-resolvelib_1.1.patch 2023-04-11 14:53:02 UTC (rev
1444674)
+++ ansible-core-2.14.4-resolvelib_1.1.patch 2023-04-11 14:53:16 UTC (rev
1444675)
@@ -1,30 +0,0 @@
-diff -ruN a/lib/ansible/galaxy/dependency_resolution/providers.py
b/lib/ansible/galaxy/dependency_resolution/providers.py
---- a/lib/ansible/galaxy/dependency_resolution/providers.py 2023-03-27
19:29:13.000000000 +0200
-+++ b/lib/ansible/galaxy/dependency_resolution/providers.py 2023-04-10
22:10:30.216701977 +0200
-@@ -42,7 +42,7 @@
-
- # TODO: add python requirements to ansible-test's ansible-core distribution
info and remove the hardcoded lowerbound/upperbound fallback
- RESOLVELIB_LOWERBOUND = SemanticVersion("0.5.3")
--RESOLVELIB_UPPERBOUND = SemanticVersion("0.9.0")
-+RESOLVELIB_UPPERBOUND = SemanticVersion("1.1.0")
- RESOLVELIB_VERSION =
SemanticVersion.from_loose_version(LooseVersion(resolvelib_version))
-
-
-@@ -220,7 +220,7 @@
- Mapping of identifier, list of named tuple pairs.
- The named tuples have the entries ``requirement`` and ``parent``.
-
-- resolvelib >=0.8.0, <= 0.8.1
-+ resolvelib >=0.8.0, <= 1.0.1
-
- :param identifier: The value returned by ``identify()``.
-
-diff -ruN a/test/lib/ansible_test/_data/requirements/ansible.txt
b/test/lib/ansible_test/_data/requirements/ansible.txt
---- a/test/lib/ansible_test/_data/requirements/ansible.txt 2023-03-27
19:29:13.000000000 +0200
-+++ b/test/lib/ansible_test/_data/requirements/ansible.txt 2023-04-10
22:11:39.433634202 +0200
-@@ -12,4 +12,4 @@
- # NOTE: Ref: https://github.com/sarugaku/resolvelib/issues/69
- # NOTE: When updating the upper bound, also update the latest version used
- # NOTE: in the ansible-galaxy-collection test suite.
--resolvelib >= 0.5.3, < 0.9.0 # dependency resolver used by ansible-galaxy
-+resolvelib >= 0.5.3, < 1.1.0 # dependency resolver used by ansible-galaxy
Copied:
ansible-core/repos/community-any/ansible-core-2.14.4-resolvelib_1.1.patch (from
rev 1444674, ansible-core/trunk/ansible-core-2.14.4-resolvelib_1.1.patch)
===================================================================
--- ansible-core-2.14.4-resolvelib_1.1.patch (rev 0)
+++ ansible-core-2.14.4-resolvelib_1.1.patch 2023-04-11 14:53:16 UTC (rev
1444675)
@@ -0,0 +1,39 @@
+diff -ruN a/lib/ansible/galaxy/dependency_resolution/providers.py
b/lib/ansible/galaxy/dependency_resolution/providers.py
+--- a/lib/ansible/galaxy/dependency_resolution/providers.py 2023-03-27
19:29:13.000000000 +0200
++++ b/lib/ansible/galaxy/dependency_resolution/providers.py 2023-04-10
22:10:30.216701977 +0200
+@@ -42,7 +42,7 @@
+
+ # TODO: add python requirements to ansible-test's ansible-core distribution
info and remove the hardcoded lowerbound/upperbound fallback
+ RESOLVELIB_LOWERBOUND = SemanticVersion("0.5.3")
+-RESOLVELIB_UPPERBOUND = SemanticVersion("0.9.0")
++RESOLVELIB_UPPERBOUND = SemanticVersion("1.1.0")
+ RESOLVELIB_VERSION =
SemanticVersion.from_loose_version(LooseVersion(resolvelib_version))
+
+
+@@ -220,7 +220,7 @@
+ Mapping of identifier, list of named tuple pairs.
+ The named tuples have the entries ``requirement`` and ``parent``.
+
+- resolvelib >=0.8.0, <= 0.8.1
++ resolvelib >=0.8.0, <= 1.0.1
+
+ :param identifier: The value returned by ``identify()``.
+
+diff -ruN a/requirements.txt b/requirements.txt
+--- a/requirements.txt 2023-03-27 19:29:13.000000000 +0200
++++ b/requirements.txt 2023-04-11 16:34:09.987613705 +0200
+@@ -12,4 +12,4 @@
+ # NOTE: Ref: https://github.com/sarugaku/resolvelib/issues/69
+ # NOTE: When updating the upper bound, also update the latest version used
+ # NOTE: in the ansible-galaxy-collection test suite.
+-resolvelib >= 0.5.3, < 0.9.0 # dependency resolver used by ansible-galaxy
++resolvelib >= 0.5.3, < 1.1.0 # dependency resolver used by ansible-galaxy
+diff -ruN a/test/lib/ansible_test/_data/requirements/ansible.txt
b/test/lib/ansible_test/_data/requirements/ansible.txt
+--- a/test/lib/ansible_test/_data/requirements/ansible.txt 2023-03-27
19:29:13.000000000 +0200
++++ b/test/lib/ansible_test/_data/requirements/ansible.txt 2023-04-10
22:11:39.433634202 +0200
+@@ -12,4 +12,4 @@
+ # NOTE: Ref: https://github.com/sarugaku/resolvelib/issues/69
+ # NOTE: When updating the upper bound, also update the latest version used
+ # NOTE: in the ansible-galaxy-collection test suite.
+-resolvelib >= 0.5.3, < 0.9.0 # dependency resolver used by ansible-galaxy
++resolvelib >= 0.5.3, < 1.1.0 # dependency resolver used by ansible-galaxy
