From 3585ee74f70afeacd37374f2206720cc718c01a3 Mon Sep 17 00:00:00 2001 From: David Wilson Date: Fri, 26 Oct 2018 12:47:30 +0100 Subject: [PATCH] tests: split out ansible_tests requirements Also remove hard-coded Ansible version, the tests don't need it, nor does local testing most of the time --- .travis/ansible_tests.py | 1 + dev_requirements.txt | 3 --- tests/ansible/requirements.txt | 2 ++ 3 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 tests/ansible/requirements.txt diff --git a/.travis/ansible_tests.py b/.travis/ansible_tests.py index 3b5e40db..efaca9fe 100755 --- a/.travis/ansible_tests.py +++ b/.travis/ansible_tests.py @@ -34,6 +34,7 @@ with ci_lib.Fold('job_setup'): os.chdir(TESTS_DIR) os.chmod('../data/docker/mitogen__has_sudo_pubkey.key', int('0600', 7)) + run("pip install -qr requirements.txt") # tests/ansible/requirements # Don't set -U as that will upgrade Paramiko to a non-2.6 compatible version. run("pip install -q ansible==%s", ci_lib.ANSIBLE_VERSION) diff --git a/dev_requirements.txt b/dev_requirements.txt index a6807488..0b2846ac 100644 --- a/dev_requirements.txt +++ b/dev_requirements.txt @@ -1,10 +1,8 @@ -r docs/docs-requirements.txt -ansible==2.6.1 coverage==4.5.1 Django==1.6.11 # Last version supporting 2.6. mock==2.0.0 pytz==2018.5 -paramiko==2.3.2 # Last 2.6-compat version. cffi==1.11.2 # Random pin to try and fix pyparser==2.18 not having effect pycparser==2.18 # Last version supporting 2.6. pytest-catchlog==1.2.2 @@ -16,4 +14,3 @@ unittest2==1.1.0 # Fix InsecurePlatformWarning while creating py26 tox environment # https://urllib3.readthedocs.io/en/latest/advanced-usage.html#ssl-warnings urllib3[secure]; python_version < '2.7.9' -google-api-python-client==1.6.5 diff --git a/tests/ansible/requirements.txt b/tests/ansible/requirements.txt new file mode 100644 index 00000000..fdabb0f6 --- /dev/null +++ b/tests/ansible/requirements.txt @@ -0,0 +1,2 @@ +paramiko==2.3.2 # Last 2.6-compat version. +google-api-python-client==1.6.5