Bug#1024713: ansible-core: Fails autopkgtests in unstable due to new resolvelib

2022-11-28 Thread Lee Garrett

Hi Scott,

I got around to fix the issue. I took the upstream patch as yours didn't 
apply cleanly to 2.14 anymore. I will upload the package in the next hour.


Thanks for bringing this to my attention!

Regards,
Lee

On 23/11/2022 17:17, Scott Kitterman wrote:

Package: ansible-core
Version: 2.13.4-1
Severity: serious
Tags: patch upstream ftbfs
Justification: fails to build from source (but built successfully in the past)

The current ansible-core package fails autopkgtest in unstable and would
fail in testing if python3-resolvelib were to migrate [1].  The issue
has been fixed upstream [2].  I have tested both on unstable and testing
with the upstream fix using the attached debdiff and it corrects the
test failures.  It also still works with the older resolvelib.

Using the ftbfs tag for this report since it is the closest thing we
have for test failures.

I do intend to NMU in a week to fix this as it blocks testing migration
for python-resolvelib.  Please let me know if you want to take care of
it or your would prefer I go ahead.

Scott K


[1] 
https://ci.debian.net/data/autopkgtest/testing/amd64/a/ansible-core/28587311/log.gz
[2] https://github.com/ansible/ansible/pull/79399/files




Bug#1024713: ansible-core: Fails autopkgtests in unstable due to new resolvelib

2022-11-23 Thread Lee Garrett

Hi Scott,

thanks for the bug report. A NMU is not needed, I'm currently preparing 
the newest upstream release and hopefully will upload it in the next 
days. If I don't upload within 7 days, feel free to NMU it.


Regards,
Lee


On 23/11/2022 17:17, Scott Kitterman wrote:

Package: ansible-core
Version: 2.13.4-1
Severity: serious
Tags: patch upstream ftbfs
Justification: fails to build from source (but built successfully in the past)

The current ansible-core package fails autopkgtest in unstable and would
fail in testing if python3-resolvelib were to migrate [1].  The issue
has been fixed upstream [2].  I have tested both on unstable and testing
with the upstream fix using the attached debdiff and it corrects the
test failures.  It also still works with the older resolvelib.

Using the ftbfs tag for this report since it is the closest thing we
have for test failures.

I do intend to NMU in a week to fix this as it blocks testing migration
for python-resolvelib.  Please let me know if you want to take care of
it or your would prefer I go ahead.

Scott K


[1] 
https://ci.debian.net/data/autopkgtest/testing/amd64/a/ansible-core/28587311/log.gz
[2] https://github.com/ansible/ansible/pull/79399/files




Bug#1024713: ansible-core: Fails autopkgtests in unstable due to new resolvelib

2022-11-23 Thread Scott Kitterman
Package: ansible-core
Version: 2.13.4-1
Severity: serious
Tags: patch upstream ftbfs
Justification: fails to build from source (but built successfully in the past)

The current ansible-core package fails autopkgtest in unstable and would
fail in testing if python3-resolvelib were to migrate [1].  The issue
has been fixed upstream [2].  I have tested both on unstable and testing
with the upstream fix using the attached debdiff and it corrects the
test failures.  It also still works with the older resolvelib.

Using the ftbfs tag for this report since it is the closest thing we
have for test failures.

I do intend to NMU in a week to fix this as it blocks testing migration
for python-resolvelib.  Please let me know if you want to take care of
it or your would prefer I go ahead.

Scott K


[1] 
https://ci.debian.net/data/autopkgtest/testing/amd64/a/ansible-core/28587311/log.gz
[2] https://github.com/ansible/ansible/pull/79399/files
diff -Nru ansible-core-2.13.4/debian/changelog 
ansible-core-2.13.4/debian/changelog
--- ansible-core-2.13.4/debian/changelog2022-09-13 14:41:09.0 
+
+++ ansible-core-2.13.4/debian/changelog2022-11-23 15:31:05.0 
+
@@ -1,3 +1,11 @@
+ansible-core (2.13.4-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add d/p/resolvelib_0_9_0_compat.patch to fix test failures with
+python3-resolvelib 0.9.0 (backport of upstream commit) 
+
+ -- Scott Kitterman   Wed, 23 Nov 2022 15:31:05 +
+
 ansible-core (2.13.4-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru ansible-core-2.13.4/debian/patches/resolvelib_0_9_0_compat.patch 
ansible-core-2.13.4/debian/patches/resolvelib_0_9_0_compat.patch
--- ansible-core-2.13.4/debian/patches/resolvelib_0_9_0_compat.patch
1970-01-01 00:00:00.0 +
+++ ansible-core-2.13.4/debian/patches/resolvelib_0_9_0_compat.patch
2022-11-23 15:30:19.0 +
@@ -0,0 +1,98 @@
+Description: Upstream change for resolvelib 0.9.0 compatibility
+ ansible-galaxy - support ``resolvelib >= 0.5.3, < 0.10.0`` (#79399)
+* Upgrade `resolvelib >= 0.5.3, < 0.10.0`
+https://pypi.org/project/resolvelib/0.9.0/ released on 2022-11-17:
+  * 
https://github.com/sarugaku/resolvelib/blob/master/CHANGELOG.rst#090-2022-11-17
+  * https://github.com/sarugaku/resolvelib/releases/tag/0.9.0
+Signed-off-by: Wong Hoi Sing Edison 
+ .
+ commit b148fd8dd74c8599f809f71117a86577ccfb0638
+Author: Wong Hoi Sing Edison 
+Date:   Wed Nov 23 21:57:24 2022 +0800
+Origin: vendor
+Last-Update: 2022-11-23
+
+--- /dev/null
 ansible-core-2.13.4/changelogs/fragments/79399-resolvelib_lt_0_10_0.yml
+@@ -0,0 +1,2 @@
++minor_changes:
++  - ansible-galaxy - support ``resolvelib >= 0.5.3, < 0.10.0``.
+--- 
ansible-core-2.13.4.orig/lib/ansible/galaxy/dependency_resolution/providers.py
 ansible-core-2.13.4/lib/ansible/galaxy/dependency_resolution/providers.py
+@@ -41,7 +41,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))
+ 
+ 
+@@ -219,7 +219,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()``.
+ 
+--- ansible-core-2.13.4.orig/requirements.txt
 ansible-core-2.13.4/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
+--- 
ansible-core-2.13.4.orig/test/lib/ansible_test/_data/requirements/ansible.txt
 ansible-core-2.13.4/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, < 0.9.0  # dependency resolver used by ansible-galaxy
++resolvelib >= 0.5.3, < 0.10.0  # dependency resolver used by ansible-galaxy
+--- ansible-core-2.13.4.orig/test/sanity/code-smell/docs-build.requirements.in
 ansible-core-2.13.4/test/sanity/code-smell/docs-build.requirements.in
+@@ -1,6 +1,6 @@
+ jinja2
+ pyyaml
+-resolvelib < 0.9.0
++resolvelib < 0.10.0
+ sphinx == 4.2.0
+ sphinx-notfound-page
+