diff options
| -rw-r--r-- | changelogs/fragments/update-resolvelib-lt-2_0_0.yml | 2 | ||||
| -rw-r--r-- | lib/ansible/galaxy/dependency_resolution/providers.py | 2 | ||||
| -rw-r--r-- | requirements.txt | 2 | ||||
| -rw-r--r-- | test/integration/targets/ansible-galaxy-collection/vars/main.yml | 14 | ||||
| -rw-r--r-- | test/lib/ansible_test/_data/requirements/ansible.txt | 2 |
5 files changed, 13 insertions, 9 deletions
diff --git a/changelogs/fragments/update-resolvelib-lt-2_0_0.yml b/changelogs/fragments/update-resolvelib-lt-2_0_0.yml new file mode 100644 index 0000000000..10c4f1a083 --- /dev/null +++ b/changelogs/fragments/update-resolvelib-lt-2_0_0.yml @@ -0,0 +1,2 @@ +minor_changes: + - ansible-galaxy - support ``resolvelib >= 0.5.3, < 2.0.0`` (https://github.com/ansible/ansible/issues/84217). diff --git a/lib/ansible/galaxy/dependency_resolution/providers.py b/lib/ansible/galaxy/dependency_resolution/providers.py index 7578cae785..d336c3441e 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("2.0.0") RESOLVELIB_VERSION = SemanticVersion.from_loose_version(LooseVersion(resolvelib_version)) diff --git a/requirements.txt b/requirements.txt index 5eaf9f2cbc..45c9c01b80 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, < 2.0.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 066d2678bc..c865871c4f 100644 --- a/test/integration/targets/ansible-galaxy-collection/vars/main.yml +++ b/test/integration/targets/ansible-galaxy-collection/vars/main.yml @@ -4,13 +4,15 @@ gpg_homedir: "{{ galaxy_dir }}/gpg" offline_server: https://test-hub.demolab.local/api/galaxy/content/api/ +# Test oldest and most recently supported, and versions with notable changes. +# The last breaking change for a feature ansible-galaxy uses was in 0.8.0. +# It would be redundant to test every minor version since 0.8.0, so we just test against the latest minor release. +# NOTE: If ansible-galaxy incorporates new resolvelib features, this matrix should be updated to verify the features work on all supported versions. supported_resolvelib_versions: - - "0.5.3" # Oldest supported - - "0.6.0" - - "0.7.0" - - "0.8.0" - - "0.9.0" - - "1.0.1" + - "0.5.3" # test CollectionDependencyProvider050 + - "0.6.0" # test CollectionDependencyProvider060 + - "0.7.0" # test CollectionDependencyProvider070 + - "<2.0.0" # test CollectionDependencyProvider080 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 5eaf9f2cbc..45c9c01b80 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, < 2.0.0 # dependency resolver used by ansible-galaxy |