Robin Candau pushed to branch main at Arch Linux / Packaging / Packages / ansible-core
Commits: 55405bd0 by Robin Candau at 2024-11-05T12:52:38+01:00 upgpkg: 2.18.0-1: New upstream release + Add a patch to allow the build and checks to pass with python-resolvelib 1.1.0 For now, upstream has set the upper version bound for resolvelib at < 1.1.0 See https://github.com/ansible/ansible/blob/devel/requirements.txt#L10-L15 And https://github.com/ansible/ansible/blob/devel/lib/ansible/galaxy/dependency_resolution/providers.py#L40-L43 - - - - - 3 changed files: - .SRCINFO - PKGBUILD - + bump_resolvelib_upper_version_bound.patch Changes: ===================================== .SRCINFO ===================================== @@ -1,6 +1,6 @@ pkgbase = ansible-core pkgdesc = Radically simple IT automation platform - pkgver = 2.17.5 + pkgver = 2.18.0 pkgrel = 1 url = https://www.ansible.com arch = any @@ -43,8 +43,11 @@ pkgbase = ansible-core provides = python-ansible provides = ansible-base replaces = ansible-base - source = ansible-core-2.17.5.tar.gz::https://github.com/ansible/ansible/archive/refs/tags/v2.17.5.tar.gz - sha512sums = 7e4ba2aecda5440754274f3df7e66c86580c8e500f479a18dbad68a97f3344222e899f7317eeea94b03ed19772c14ca97d0454dd7f6cdfbc69a2acb6df0463ee - b2sums = 201b3e680be5361c23621f59f18ca7de5b2b2070102ad83e9e9a2bd111ba06dd9d667f3579ffeed7ea0d31102243ce8d0f74584b5010aaee32ba68ff3749043a + source = ansible-core-2.18.0.tar.gz::https://github.com/ansible/ansible/archive/refs/tags/v2.18.0.tar.gz + source = bump_resolvelib_upper_version_bound.patch + sha512sums = 3c5c620778ad4120c8f231be88c3e018bc902718ece4b05dce009d40709da7a3d97640155de074432d17aad620a74700a71b87c055d9cfb03a1e4f6d8168b1ef + sha512sums = 420d03e64a189043c7fbaa6a5799eed04ea28c4c2729197b4a51467ec672ab73325f6ea46d02a0ad84bc89aa1a8ffc4d23c716003215029eb60fc68577154e5c + b2sums = 1bfd7b1b06f9fed1aa3b0f79cc9f934048f64a91f50477d5a0f16ed93256a71b21ead353ce9bf3cfc27f3fadef3248037274238678a30dc3101383ec8a949d41 + b2sums = f2885491361673f067716b0d130a9043843715513f55bcb6fefc86159169056b567922f642816a2cfbbb7b6d31efc94c1f204f72865dc33881cf13886aa3967b pkgname = ansible-core ===================================== PKGBUILD ===================================== @@ -9,7 +9,7 @@ pkgname=ansible-core _pkgname=ansible -pkgver=2.17.5 +pkgver=2.18.0 pkgrel=1 pkgdesc='Radically simple IT automation platform' arch=('any') @@ -61,9 +61,22 @@ optdepends=( ) provides=('python-ansible' 'ansible-base') replaces=('ansible-base') -source=("${pkgname}-${pkgver}.tar.gz::https://github.com/ansible/ansible/archive/refs/tags/v${pkgver}.tar.gz";) -sha512sums=('7e4ba2aecda5440754274f3df7e66c86580c8e500f479a18dbad68a97f3344222e899f7317eeea94b03ed19772c14ca97d0454dd7f6cdfbc69a2acb6df0463ee') -b2sums=('201b3e680be5361c23621f59f18ca7de5b2b2070102ad83e9e9a2bd111ba06dd9d667f3579ffeed7ea0d31102243ce8d0f74584b5010aaee32ba68ff3749043a') +source=("${pkgname}-${pkgver}.tar.gz::https://github.com/ansible/ansible/archive/refs/tags/v${pkgver}.tar.gz"; + bump_resolvelib_upper_version_bound.patch) +sha512sums=('3c5c620778ad4120c8f231be88c3e018bc902718ece4b05dce009d40709da7a3d97640155de074432d17aad620a74700a71b87c055d9cfb03a1e4f6d8168b1ef' + '420d03e64a189043c7fbaa6a5799eed04ea28c4c2729197b4a51467ec672ab73325f6ea46d02a0ad84bc89aa1a8ffc4d23c716003215029eb60fc68577154e5c') +b2sums=('1bfd7b1b06f9fed1aa3b0f79cc9f934048f64a91f50477d5a0f16ed93256a71b21ead353ce9bf3cfc27f3fadef3248037274238678a30dc3101383ec8a949d41' + 'f2885491361673f067716b0d130a9043843715513f55bcb6fefc86159169056b567922f642816a2cfbbb7b6d31efc94c1f204f72865dc33881cf13886aa3967b') + +prepare() { + cd "${_pkgname}-${pkgver}" + + # Temporary patch to allow build / checks to pass with resolvelib 1.1.0 + # For now, upstream has set the upper version bound for it at `< 1.1.0` + # See https://github.com/ansible/ansible/blob/devel/requirements.txt#L10-L15 + # And https://github.com/ansible/ansible/blob/devel/lib/ansible/galaxy/dependency_resolution/providers.py#L40-L43 + patch -Np1 < "${srcdir}/bump_resolvelib_upper_version_bound.patch" +} build() { cd "${_pkgname}-${pkgver}" ===================================== bump_resolvelib_upper_version_bound.patch ===================================== @@ -0,0 +1,33 @@ +diff --git a/lib/ansible/galaxy/dependency_resolution/providers.py b/lib/ansible/galaxy/dependency_resolution/providers.py +index 7578cae785..ae86b2a715 100644 +--- a/lib/ansible/galaxy/dependency_resolution/providers.py ++++ b/lib/ansible/galaxy/dependency_resolution/providers.py +@@ -39,7 +39,7 @@ except ImportError: + + # 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("1.1.0") ++RESOLVELIB_UPPERBOUND = SemanticVersion("1.1.1") + RESOLVELIB_VERSION = SemanticVersion.from_loose_version(LooseVersion(resolvelib_version)) + + +diff --git a/requirements.txt b/requirements.txt +index 5eaf9f2cbc..92bd8e3977 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -12,4 +12,4 @@ packaging + # 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, < 1.1.0 # dependency resolver used by ansible-galaxy ++resolvelib >= 0.5.3, < 1.1.1 # dependency resolver used by ansible-galaxy +diff --git a/test/lib/ansible_test/_data/requirements/ansible.txt b/test/lib/ansible_test/_data/requirements/ansible.txt +index 5eaf9f2cbc..92bd8e3977 100644 +--- a/test/lib/ansible_test/_data/requirements/ansible.txt ++++ b/test/lib/ansible_test/_data/requirements/ansible.txt +@@ -12,4 +12,4 @@ packaging + # 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, < 1.1.0 # dependency resolver used by ansible-galaxy ++resolvelib >= 0.5.3, < 1.1.1 # dependency resolver used by ansible-galaxy View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/ansible-core/-/commit/55405bd0324c46b5e63a6965cac151149829a9d1 -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/ansible-core/-/commit/55405bd0324c46b5e63a6965cac151149829a9d1 You're receiving this email because of your account on gitlab.archlinux.org.
