CVS commit: pkgsrc/sysutils/ansible-core

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Jan 13 13:48:45 UTC 2023

Modified Files:
        pkgsrc/sysutils/ansible-core: Makefile distinfo
Added Files:
        pkgsrc/sysutils/ansible-core/patches:
            patch-lib_ansible_galaxy_dependency__resolution_providers.py
            patch-requirements.txt

Log Message:
ansible-core: allow newer py-resolvelib; fixes ansible-galaxy


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/sysutils/ansible-core/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/sysutils/ansible-core/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/ansible-core/patches/patch-lib_ansible_galaxy_dependency__resolution_providers.py \
    pkgsrc/sysutils/ansible-core/patches/patch-requirements.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/ansible-core/Makefile
diff -u pkgsrc/sysutils/ansible-core/Makefile:1.11 pkgsrc/sysutils/ansible-core/Makefile:1.12
--- pkgsrc/sysutils/ansible-core/Makefile:1.11  Thu Dec  8 14:11:04 2022
+++ pkgsrc/sysutils/ansible-core/Makefile       Fri Jan 13 13:48:44 2023
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2022/12/08 14:11:04 adam Exp $
+# $NetBSD: Makefile,v 1.12 2023/01/13 13:48:44 adam Exp $
 
 DISTNAME=      ansible-core-2.14.1
+PKGREVISION=   1
 CATEGORIES=    sysutils python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=a/ansible-core/}
 

Index: pkgsrc/sysutils/ansible-core/distinfo
diff -u pkgsrc/sysutils/ansible-core/distinfo:1.9 pkgsrc/sysutils/ansible-core/distinfo:1.10
--- pkgsrc/sysutils/ansible-core/distinfo:1.9   Thu Dec  8 14:11:04 2022
+++ pkgsrc/sysutils/ansible-core/distinfo       Fri Jan 13 13:48:44 2023
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.9 2022/12/08 14:11:04 adam Exp $
+$NetBSD: distinfo,v 1.10 2023/01/13 13:48:44 adam Exp $
 
 BLAKE2s (ansible-core-2.14.1.tar.gz) = 704ecb941b8724d3b7de98cfc6e1ad688a41943182148e4e2f301b06a137b1df
 SHA512 (ansible-core-2.14.1.tar.gz) = d3710aff1dbb04746b663b7c987c3597005dd8633df82f645312e20ddb9c679e7315968c0cf2876ae22ba91d17e4c54ef9cbdb6b825ee1d6f4229e887f8b4571
 Size (ansible-core-2.14.1.tar.gz) = 14000906 bytes
+SHA1 (patch-lib_ansible_galaxy_dependency__resolution_providers.py) = 9b56e9be39607ac7566f659f6a93f5b060dbd7ac
 SHA1 (patch-lib_ansible_module__utils_facts_hardware_netbsd.py) = cdc41b104bffab7badd00446a9d0cdecba32cca2
+SHA1 (patch-requirements.txt) = e0bdb2f2128aaba0e26930ef11b138a2424b4e7f

Added files:

Index: pkgsrc/sysutils/ansible-core/patches/patch-lib_ansible_galaxy_dependency__resolution_providers.py
diff -u /dev/null pkgsrc/sysutils/ansible-core/patches/patch-lib_ansible_galaxy_dependency__resolution_providers.py:1.1
--- /dev/null   Fri Jan 13 13:48:45 2023
+++ pkgsrc/sysutils/ansible-core/patches/patch-lib_ansible_galaxy_dependency__resolution_providers.py   Fri Jan 13 13:48:45 2023
@@ -0,0 +1,25 @@
+$NetBSD: patch-lib_ansible_galaxy_dependency__resolution_providers.py,v 1.1 2023/01/13 13:48:45 adam Exp $
+
+Support newer resolvelib.
+https://github.com/ansible/ansible/pull/79576
+
+--- lib/ansible/galaxy/dependency_resolution/providers.py.orig 2023-01-13 13:17:02.000000000 +0000
++++ lib/ansible/galaxy/dependency_resolution/providers.py
+@@ -42,7 +42,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("0.9.0")
++RESOLVELIB_UPPERBOUND = SemanticVersion("0.10.0")
+ RESOLVELIB_VERSION = SemanticVersion.from_loose_version(LooseVersion(resolvelib_version))
+ 
+ 
+@@ -220,7 +220,7 @@ class CollectionDependencyProviderBase(A
+             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, <= 0.9.0
+ 
+         :param identifier: The value returned by ``identify()``.
+ 
Index: pkgsrc/sysutils/ansible-core/patches/patch-requirements.txt
diff -u /dev/null pkgsrc/sysutils/ansible-core/patches/patch-requirements.txt:1.1
--- /dev/null   Fri Jan 13 13:48:45 2023
+++ pkgsrc/sysutils/ansible-core/patches/patch-requirements.txt Fri Jan 13 13:48:45 2023
@@ -0,0 +1,13 @@
+$NetBSD: patch-requirements.txt,v 1.1 2023/01/13 13:48:45 adam Exp $
+
+Support newer resolvelib.
+https://github.com/ansible/ansible/pull/79576
+
+--- requirements.txt.orig      2023-01-13 13:14:07.000000000 +0000
++++ 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, < 0.9.0  # dependency resolver used by ansible-galaxy
++resolvelib >= 0.5.3, < 0.10.0  # dependency resolver used by ansible-galaxy