Date: Monday, May 15, 2023 @ 22:36:27 Author: antiz Revision: 1461886
upgpkg: ansible-core 2.15.0-1: new upstream release Modified: ansible-core/trunk/PKGBUILD Deleted: ansible-core/trunk/ansible-core-2.14.4-resolvelib_1.1.patch ------------------------------------------+ PKGBUILD | 20 ++------------ ansible-core-2.14.4-resolvelib_1.1.patch | 39 ----------------------------- 2 files changed, 4 insertions(+), 55 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-05-15 21:42:45 UTC (rev 1461885) +++ PKGBUILD 2023-05-15 22:36:27 UTC (rev 1461886) @@ -8,7 +8,7 @@ # Contributor: atweiden <[email protected]> pkgname=ansible-core -pkgver=2.14.5 +pkgver=2.15.0 pkgrel=1 pkgdesc='Radically simple IT automation platform' arch=('any') @@ -62,22 +62,10 @@ 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=('130a0de925c7229dee350ddbf4382d87802d86aab4817ed595105db8ed5071153847dac0478f20a994670e59e53a07b77d0bf35855d309ebc222fbb61233b7db' - 'cdf1335d49ecec7bb4fff6b29cc0217d0dfa50ca9dc23338717bcbf807d06e7db8bb2c8037f8c613299f92d7db8733ce3e08f343dac33def3bf1612bd6e6bfca') -b2sums=('d006f773e1c2b28582143a4f08f699e5744fba492130388fa5463053cdf8f0cc7056296daa213c72884ea0c0ba454a3e04ef118c184faba8c8d3c281ae65345a' - '712bc0366da99e8176bd80b7abbc2cdc3d9960911a39fedb7f1ae460577151bf13af9ca1225c28fa63c8feae30226cbc686765511459b81bc253745bf28ae246') +source=("https://pypi.python.org/packages/source/a/ansible-core/ansible-core-${pkgver}.tar.gz";) +sha512sums=('aebb43840380854e7759656a0b08579a8fbdddbf2d204c47fb16cdb73ffd540df5ad56e5bf4a78a338804a3d40f9b042ea50b2b1853aaef6b7c2f0aab7a95432') +b2sums=('58d92d3d8cbc87d9c2c606317bae3b6841c66b9600153b38be912b02dbc19069ff8e755daa574e394ac5d12c04859640f0e2af17ed0adeb8a12da76979c163d3') -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 Deleted: ansible-core-2.14.4-resolvelib_1.1.patch =================================================================== --- ansible-core-2.14.4-resolvelib_1.1.patch 2023-05-15 21:42:45 UTC (rev 1461885) +++ ansible-core-2.14.4-resolvelib_1.1.patch 2023-05-15 22:36:27 UTC (rev 1461886) @@ -1,39 +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/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
