From 4b8628f87c5790012023814e44a92df94232c252 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Wed, 3 Jun 2020 13:19:07 +0200 Subject: [PATCH] remove tox and test only with latest stable ansible release --- .drone.jsonnet | 10 ++++++---- .drone.yml | 39 +++++++++++++++++++++++++-------------- tox.ini | 18 ------------------ 3 files changed, 31 insertions(+), 36 deletions(-) delete mode 100644 tox.ini diff --git a/.drone.jsonnet b/.drone.jsonnet index ddac207..e5b09de 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -1,12 +1,15 @@ local PythonVersion(pyversion='2.7') = { - name: 'python' + std.strReplace(pyversion, '.', '') + '-ansible', + name: 'python' + std.strReplace(pyversion, '.', '') + '-pytest', image: 'python:' + pyversion, environment: { PY_COLORS: 1, }, commands: [ - 'pip install tox -qq', - 'tox -e $(tox -l | grep py' + std.strReplace(pyversion, '.', '') + " | xargs | sed 's/ /,/g') -q", + 'pip install -r dev-requirements.txt -qq', + 'pip install -qq .', + 'pytest ansiblelater --cov=ansiblelater --no-cov-on-fail', + 'ansible-later --help', + 'ansible-later --version', ], depends_on: [ 'clone', @@ -60,7 +63,6 @@ local PipelineTest = { }, commands: [ 'pip install codecov -qq', - 'coverage combine .tox/py*/.coverage', 'codecov --required -X gcov', ], depends_on: [ diff --git a/.drone.yml b/.drone.yml index a8712b7..e96bdbc 100644 --- a/.drone.yml +++ b/.drone.yml @@ -31,41 +31,53 @@ platform: arch: amd64 steps: -- name: python35-ansible +- name: python35-pytest image: python:3.5 commands: - - pip install tox -qq - - tox -e $(tox -l | grep py35 | xargs | sed 's/ /,/g') -q + - pip install -r dev-requirements.txt -qq + - pip install -qq . + - pytest ansiblelater --cov=ansiblelater --no-cov-on-fail + - ansible-later --help + - ansible-later --version environment: PY_COLORS: 1 depends_on: - clone -- name: python36-ansible +- name: python36-pytest image: python:3.6 commands: - - pip install tox -qq - - tox -e $(tox -l | grep py36 | xargs | sed 's/ /,/g') -q + - pip install -r dev-requirements.txt -qq + - pip install -qq . + - pytest ansiblelater --cov=ansiblelater --no-cov-on-fail + - ansible-later --help + - ansible-later --version environment: PY_COLORS: 1 depends_on: - clone -- name: python37-ansible +- name: python37-pytest image: python:3.7 commands: - - pip install tox -qq - - tox -e $(tox -l | grep py37 | xargs | sed 's/ /,/g') -q + - pip install -r dev-requirements.txt -qq + - pip install -qq . + - pytest ansiblelater --cov=ansiblelater --no-cov-on-fail + - ansible-later --help + - ansible-later --version environment: PY_COLORS: 1 depends_on: - clone -- name: python38-ansible +- name: python38-pytest image: python:3.8 commands: - - pip install tox -qq - - tox -e $(tox -l | grep py38 | xargs | sed 's/ /,/g') -q + - pip install -r dev-requirements.txt -qq + - pip install -qq . + - pytest ansiblelater --cov=ansiblelater --no-cov-on-fail + - ansible-later --help + - ansible-later --version environment: PY_COLORS: 1 depends_on: @@ -75,7 +87,6 @@ steps: image: python:3.8 commands: - pip install codecov -qq - - coverage combine .tox/py*/.coverage - codecov --required -X gcov environment: CODECOV_TOKEN: @@ -484,6 +495,6 @@ depends_on: --- kind: signature -hmac: e24f32f31953d936d86eb3e75e9a76521ac5a6066e98ce0ad66c0c79286ecd7e +hmac: 1aa29dfec526c097fdefe018bd59133a5fe2d0579cb4cb94f888daca8243e6ca ... diff --git a/tox.ini b/tox.ini deleted file mode 100644 index 57396fb..0000000 --- a/tox.ini +++ /dev/null @@ -1,18 +0,0 @@ -[tox] -minversion = 3.7.0 -envlist = - py{35,36,37,38}-ansible{latest,devel} - -isolated_build = True - -[testenv] -usedevelop = True -passenv = PY_COLORS -setenv = COVERAGE_FILE={envdir}/.coverage -deps = - -rdev-requirements.txt - ansiblelatest: ansible - ansibledevel: git+https://github.com/ansible/ansible.git -commands = - ansible-later --help - pytest ansiblelater --cov={toxinidir}/ansiblelater --no-cov-on-fail