Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pip - Fix check_mode for prerelease packages #68690

Merged
merged 2 commits into from Apr 6, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelogs/fragments/68592-pip-check_mode-prereleases.yml
@@ -0,0 +1,2 @@
bugfixes:
- "pip - check_mode with ``state: present`` now returns the correct state for pre-release versioned packages"
2 changes: 1 addition & 1 deletion lib/ansible/modules/packaging/language/pip.py
Expand Up @@ -555,7 +555,7 @@ def is_satisfied_by(self, version_to_test):
if not self._plain_package:
return False
try:
return self._requirement.specifier.contains(version_to_test)
return self._requirement.specifier.contains(version_to_test, prereleases=True)
except AttributeError:
# old setuptools has no specifier, do fallback
version_to_test = LooseVersion(version_to_test)
Expand Down
35 changes: 35 additions & 0 deletions test/integration/targets/pip/tasks/pip.yml
Expand Up @@ -516,3 +516,38 @@
assert:
that: "'distribute' in remove_distribute.cmd"
when: ansible_python.version.major == 2

# https://github.com/ansible/ansible/issues/68592
# Handle pre-release version numbers in check_mode for already-installed
# packages.
# TODO: Limiting to py3 test boxes for now so the example of 'black' installs,
# we should probably find another package to use with a similar versioning
# scheme or make a small one and enable this test for py2 as well.
- block:
- name: Install a beta version of a package
pip:
name: black
version: 19.10b0
state: present

- name: Use check_mode and ensure that the package is shown as installed
check_mode: true
pip:
name: black
state: present
register: pip_prereleases

- name: Uninstall the beta package if we need to
pip:
name: black
version: 19.10b0
state: absent
when: pip_prereleases is changed

- assert:
that:
- pip_prereleases is successful
- pip_prereleases is not changed
- '"black==19.10b0" in pip_prereleases.stdout_lines'

when: ansible_python.version.major == 3
2 changes: 1 addition & 1 deletion test/integration/targets/pip/vars/main.yml
Expand Up @@ -3,7 +3,7 @@ pip_test_packages:
- sampleproject
- jiphy
pip_test_pkg_ver:
- sampleproject<=100, !=9.0.0,>=0.0.1
- sampleproject<=100, !=9.0.0,>=0.0.1
- jiphy<100 ,!=9,>=0.0.1
pip_test_pkg_ver_unsatisfied:
- sampleproject>= 999.0.0
Expand Down