diff --git a/requirements.txt b/requirements.txt index be2d2f44..67c5821a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,8 +5,9 @@ setuptools>=17.1 # setuptools needs to be upgraded below to ensure we have # a new enough setuptools version to support using >= # for the python_version marker -#crudini>=0.9.3 +iniparse>=0.5 +crudini>=0.9.3 paramiko>=2.7.0 sshtunnel<=0.1.3;python_version=='2.7' # MIT sshtunnel;python_version>='3.6' # MIT -pymysql \ No newline at end of file +pymysql diff --git a/roles/whitebox-common/tasks/main.yml b/roles/whitebox-common/tasks/main.yml index 6b346df0..3bd4820e 100644 --- a/roles/whitebox-common/tasks/main.yml +++ b/roles/whitebox-common/tasks/main.yml @@ -1,13 +1,7 @@ -# NOTE(artom) We need to install cruini and iniparse from source until -# https://github.com/pixelb/crudini/issues/58 and -# https://github.com/candlepin/python-iniparse/issues/5 are on fixed PyPi. -- name: crudini and iniparse +- name: crudini pip: - name: "{{ item }}" + name: crudini state: present - with_items: - - git+https://github.com/pixelb/crudini.git#egg=crudini - - git+https://github.com/candlepin/python-iniparse.git#egg=iniparse become: yes # NOTE(artom) The run-tempest role runs as the tempest user, so we need to give diff --git a/tox.ini b/tox.ini index 2aa18742..09024e77 100644 --- a/tox.ini +++ b/tox.ini @@ -14,14 +14,9 @@ setenv = usedevelop = True install_command = pip install -U {opts} {packages} whitelist_externals = * -# Until https://github.com/pixelb/crudini/issues/58 and -# https://github.com/candlepin/python-iniparse/issues/5 are on PyPi, install -# from GitHub. deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt - git+https://github.com/pixelb/crudini.git#egg=crudini - git+https://github.com/candlepin/python-iniparse.git#egg=iniparse commands = find . -type f -name "*.pyc" -delete stestr run {posargs}