From 0e18e45ab9cf2a7cb2bce06c86fe180599d90fcb Mon Sep 17 00:00:00 2001 From: Sergii Golovatiuk Date: Wed, 6 Jun 2018 09:21:03 +0200 Subject: [PATCH] Remove == for pip, setuptools. Bump versions. There shouldn't be strict comparison, bump miminal version of pip to 10 as well as setuptools to 39 Change-Id: Ia24fe5994a2011e79e9c2afc7b3766010ca612ad --- infrared/common/roles/shade/tasks/main.yml | 4 ++-- requirements.txt | 6 +++--- tox.ini | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/infrared/common/roles/shade/tasks/main.yml b/infrared/common/roles/shade/tasks/main.yml index 8f4e028b8f..8d72106445 100644 --- a/infrared/common/roles/shade/tasks/main.yml +++ b/infrared/common/roles/shade/tasks/main.yml @@ -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: diff --git a/requirements.txt b/requirements.txt index 97ece58548..3655e90bb8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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 @@ -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 \ No newline at end of file +junit_xml>=1.8 # Required by 'junit' callback plugin diff --git a/tox.ini b/tox.ini index 1c011953f0..1d16e994a7 100644 --- a/tox.ini +++ b/tox.ini @@ -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