Skip to content

Commit

Permalink
Remove == for pip, setuptools. Bump versions.
Browse files Browse the repository at this point in the history
There shouldn't be strict comparison, bump miminal version of pip to 10 as well
as setuptools to 39

Change-Id: Ia24fe5994a2011e79e9c2afc7b3766010ca612ad
  • Loading branch information
holser committed Jun 6, 2018
1 parent c0c7a79 commit 0e18e45
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions infrared/common/roles/shade/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
virtualenv: "{{ shade_path_venv }}"
virtualenv_command: "{{ ansible_env.HOME }}/.local/bin/virtualenv"
with_items:
- setuptools==17.0
- pip==9.0.1
- setuptools>=39.0.0
- pip>=10.0.1

- name: shade virtualenv deps
pip:
Expand Down
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
# or set env var VIRTUALENV_NO_DOWNLOAD=1
six
# ----
setuptools>=11.3
pip
setuptools>=39.0.0
pip>=10.0.1
ansible>=2.4.0.0,<2.4.4.0
shade>=1.25 # avoid broken os_router module due to https://storyboard.openstack.org/#!/story/2001265
colorlog>=2.7.0
Expand All @@ -23,4 +23,4 @@ PyGithub>=1.25.2
jsonschema==2.6.0
python-bugzilla>=2.1.0 # Required by 'fetch_bz' Ansible module
passlib; sys_platform == 'darwin' # Avoid 'password_hash requires the passlib python module to generate password hashes on Mac OS X/Darwin'
junit_xml>=1.8 # Required by 'junit' callback plugin
junit_xml>=1.8 # Required by 'junit' callback plugin
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ whitelist_externals =
# This must work for both cases: installing with/without --upgrade
deps =
commands =
bash -c "PIP_LOG={envdir}/log/pip-conflicts-1.log python -m pip install -q 'pip>=9.0.1'"
bash -c "PIP_LOG={envdir}/log/pip-conflicts-1.log python -m pip install -q 'pip>=10.0.1'"
- python -m pip check
bash -c "PIP_LOG={envdir}/log/pip-conflicts-2.log python -m pip install -q -e ."
python -m pip check
Expand Down

0 comments on commit 0e18e45

Please sign in to comment.