summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLee Garrett <lgarrett@rocketjump.eu>2023-06-16 16:06:08 +0200
committerLee Garrett <lgarrett@rocketjump.eu>2023-06-16 16:06:08 +0200
commitd6ed54d535bdc8d2490ae7ae11a4473264aae7f1 (patch)
treeb59d5cb26a952e498dc7c64052f85a75a4ae7292
parenta01110c196fb4ba464239941ec93ae402ab12dbf (diff)
downloaddebian-ansible-core-d6ed54d535bdc8d2490ae7ae11a4473264aae7f1.zip
d/patches/: Update resolvelib patch
-rw-r--r--debian/patches/0009-resolvelib_compat.patch20
1 files changed, 10 insertions, 10 deletions
diff --git a/debian/patches/0009-resolvelib_compat.patch b/debian/patches/0009-resolvelib_compat.patch
index 3b4c9550..24339cec 100644
--- a/debian/patches/0009-resolvelib_compat.patch
+++ b/debian/patches/0009-resolvelib_compat.patch
@@ -1,9 +1,9 @@
Description: ansible-galaxy - support resolvelib >= 0.5.3, < 0.10.0
Author: Wong Hoi Sing Edison <hswong3i@gmail.com>
-Origin: upstream, https://github.com/ansible/ansible/pull/79399
+Origin: upstream, https://github.com/ansible/ansible/pull/80196
Applied-Upstream: yes
Reviewed-by: Lee Garrett <debian@rocketjump.eu>
-Last-Update: 2022-11-29
+Last-Update: 2023-06-16
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- /dev/null
@@ -18,7 +18,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
# 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_UPPERBOUND = SemanticVersion("1.1.0")
RESOLVELIB_VERSION = SemanticVersion.from_loose_version(LooseVersion(resolvelib_version))
@@ -27,7 +27,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
The named tuples have the entries ``requirement`` and ``parent``.
- resolvelib >=0.8.0, <= 0.8.1
-+ resolvelib >=0.8.0, <= 0.9.0
++ resolvelib >=0.8.0, <= 1.1.0
:param identifier: The value returned by ``identify()``.
@@ -38,7 +38,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
# 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
++resolvelib >= 0.5.3, < 1.1.0 # dependency resolver used by ansible-galaxy
--- a/test/lib/ansible_test/_data/requirements/ansible.txt
+++ b/test/lib/ansible_test/_data/requirements/ansible.txt
@@ -12,4 +12,4 @@
@@ -46,14 +46,14 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
# 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
++resolvelib >= 0.5.3, < 1.1.0 # dependency resolver used by ansible-galaxy
--- a/test/sanity/code-smell/docs-build.requirements.in
+++ b/test/sanity/code-smell/docs-build.requirements.in
@@ -1,6 +1,6 @@
jinja2
pyyaml
-resolvelib < 0.9.0
-+resolvelib < 0.10.0
++resolvelib < 1.1.0
sphinx == 4.2.0
sphinx-notfound-page
sphinx-ansible-theme
@@ -64,7 +64,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
PyYAML==6.0
requests==2.28.1
-resolvelib==0.8.1
-+resolvelib==0.9.0
++resolvelib < 1.1.0
rstcheck==3.5.0
semantic-version==2.10.0
sh==1.14.3
@@ -75,7 +75,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
jinja2
pyyaml # ansible-core requirement
-resolvelib < 0.9.0
-+resolvelib < 0.10.0
++resolvelib < 1.1.0
rstcheck < 4 # match version used in other sanity tests
straight.plugin
antsibull-changelog
@@ -86,7 +86,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
pyparsing==3.0.9
PyYAML==6.0
-resolvelib==0.8.1
-+resolvelib==0.9.0
++resolvelib==1.0.1
rstcheck==3.5.0
semantic-version==2.10.0
straight.plugin==1.5.0