From 016b7f71b10539c90ddbb3246f19f9cbf0e65428 Mon Sep 17 00:00:00 2001 From: Wong Hoi Sing Edison Date: Mon, 27 Mar 2023 22:19:23 +0800 Subject: [PATCH] ansible-galaxy - support `resolvelib >= 0.5.3, < 1.1.0` (#80196) * ansible-galaxy - support `resolvelib >= 0.5.3, < 1.1.0` released on 2023-03-09: - - Signed-off-by: Wong Hoi Sing Edison * Trigger CI by pinning resolvelib with latest version Since resolvelib is pre-installed in our test containers, we should temporarily pin the latest version allowed to force the tests to run with that version. Once the tests have passed that commit can be reverted. Please make those changes without force pushing, so that we keep the reference to the passing CI run. We can squash the commits when merging the PR so the temporary commits won't be in the final commit merged to the devel branch. Signed-off-by: Wong Hoi Sing Edison * https://github.com/ansible/ansible/pull/80196#discussion_r1136003637 Also test resolvelib with multiple supported versions. Signed-off-by: Wong Hoi Sing Edison * Revert "Trigger CI by pinning resolvelib with latest version" This reverts commit 5518e5dbca01b87d13850cee9ccdbdc1ee49188f. --------- Signed-off-by: Wong Hoi Sing Edison --- changelogs/fragments/80196-resolvelib_lt_1_1_0.yml | 2 ++ lib/ansible/galaxy/dependency_resolution/providers.py | 4 ++-- requirements.txt | 2 +- .../targets/ansible-galaxy-collection/vars/main.yml | 2 ++ test/lib/ansible_test/_data/requirements/ansible.txt | 2 +- test/sanity/code-smell/docs-build.requirements.in | 2 +- test/sanity/code-smell/docs-build.requirements.txt | 2 +- test/sanity/code-smell/package-data.requirements.in | 2 +- test/sanity/code-smell/package-data.requirements.txt | 2 +- 9 files changed, 12 insertions(+), 8 deletions(-) create mode 100644 changelogs/fragments/80196-resolvelib_lt_1_1_0.yml diff --git a/changelogs/fragments/80196-resolvelib_lt_1_1_0.yml b/changelogs/fragments/80196-resolvelib_lt_1_1_0.yml new file mode 100644 index 00000000000..6fd419f0d4f --- /dev/null +++ b/changelogs/fragments/80196-resolvelib_lt_1_1_0.yml @@ -0,0 +1,2 @@ +minor_changes: + - ansible-galaxy - support ``resolvelib >= 0.5.3, < 1.1.0``. diff --git a/lib/ansible/galaxy/dependency_resolution/providers.py b/lib/ansible/galaxy/dependency_resolution/providers.py index d52006b24d7..1dcaf1c8d2c 100644 --- a/lib/ansible/galaxy/dependency_resolution/providers.py +++ b/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.10.0") +RESOLVELIB_UPPERBOUND = SemanticVersion("1.1.0") RESOLVELIB_VERSION = SemanticVersion.from_loose_version(LooseVersion(resolvelib_version)) @@ -220,7 +220,7 @@ class CollectionDependencyProviderBase(AbstractProvider): Mapping of identifier, list of named tuple pairs. The named tuples have the entries ``requirement`` and ``parent``. - resolvelib >=0.8.0, <= 0.9.0 + resolvelib >=0.8.0, <= 1.0.1 :param identifier: The value returned by ``identify()``. diff --git a/requirements.txt b/requirements.txt index d096901ec2b..a07aa985063 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,4 +15,4 @@ importlib_resources >= 5.0, < 5.1; python_version < '3.10' # 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.10.0 # dependency resolver used by ansible-galaxy +resolvelib >= 0.5.3, < 1.1.0 # dependency resolver used by ansible-galaxy diff --git a/test/integration/targets/ansible-galaxy-collection/vars/main.yml b/test/integration/targets/ansible-galaxy-collection/vars/main.yml index 175d6696ef7..d3f188b9061 100644 --- a/test/integration/targets/ansible-galaxy-collection/vars/main.yml +++ b/test/integration/targets/ansible-galaxy-collection/vars/main.yml @@ -9,6 +9,8 @@ supported_resolvelib_versions: - "0.6.0" - "0.7.0" - "0.8.0" + - "0.9.0" + - "1.0.1" unsupported_resolvelib_versions: - "0.2.0" # Fails on import diff --git a/test/lib/ansible_test/_data/requirements/ansible.txt b/test/lib/ansible_test/_data/requirements/ansible.txt index d096901ec2b..a07aa985063 100644 --- a/test/lib/ansible_test/_data/requirements/ansible.txt +++ b/test/lib/ansible_test/_data/requirements/ansible.txt @@ -15,4 +15,4 @@ importlib_resources >= 5.0, < 5.1; python_version < '3.10' # 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.10.0 # dependency resolver used by ansible-galaxy +resolvelib >= 0.5.3, < 1.1.0 # dependency resolver used by ansible-galaxy diff --git a/test/sanity/code-smell/docs-build.requirements.in b/test/sanity/code-smell/docs-build.requirements.in index 738f7560bfd..c788827218e 100644 --- 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.10.0 +resolvelib < 1.1.0 sphinx == 5.3.0 sphinx-notfound-page sphinx-ansible-theme diff --git a/test/sanity/code-smell/docs-build.requirements.txt b/test/sanity/code-smell/docs-build.requirements.txt index d9eebf3b5e7..b1222322fbe 100644 --- a/test/sanity/code-smell/docs-build.requirements.txt +++ b/test/sanity/code-smell/docs-build.requirements.txt @@ -27,7 +27,7 @@ Pygments==2.14.0 pytz==2022.7.1 PyYAML==6.0 requests==2.28.2 -resolvelib==0.9.0 +resolvelib==1.0.1 rstcheck==5.0.0 semantic-version==2.10.0 sh==1.14.3 diff --git a/test/sanity/code-smell/package-data.requirements.in b/test/sanity/code-smell/package-data.requirements.in index acec62eff91..50e8568c5cf 100644 --- a/test/sanity/code-smell/package-data.requirements.in +++ b/test/sanity/code-smell/package-data.requirements.in @@ -1,6 +1,6 @@ docutils < 0.18 # match version required by sphinx in the docs-build sanity test jinja2 pyyaml # ansible-core requirement -resolvelib < 0.10.0 +resolvelib < 1.1.0 rstcheck < 6 # match version used in other sanity tests antsibull-changelog diff --git a/test/sanity/code-smell/package-data.requirements.txt b/test/sanity/code-smell/package-data.requirements.txt index 4f2cc4e8efe..8821e4cc157 100644 --- a/test/sanity/code-smell/package-data.requirements.txt +++ b/test/sanity/code-smell/package-data.requirements.txt @@ -5,7 +5,7 @@ Jinja2==3.1.2 MarkupSafe==2.1.2 packaging==23.0 PyYAML==6.0 -resolvelib==0.9.0 +resolvelib==1.0.1 rstcheck==5.0.0 semantic-version==2.10.0 types-docutils==0.18.3