From a3c67ed6c9ea0f6009933121c22e46f51d0f0f7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Bal=C3=A1k?= Date: Mon, 7 Aug 2017 13:19:33 -0400 Subject: [PATCH 1/3] remove test integration with develop branch --- .travis.yml | 1 - requirements.develop.txt | 3 --- tox.ini | 5 ++--- 3 files changed, 2 insertions(+), 7 deletions(-) delete mode 100644 requirements.develop.txt diff --git a/.travis.yml b/.travis.yml index b38c8fdee..9f47ab788 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,5 +31,4 @@ env: - TOXENV=pep8 - TOXENV=check_commit_msg - TOXENV=py27-cover-master - - TOXENV=py27-cover-develop - TOXENV=docs diff --git a/requirements.develop.txt b/requirements.develop.txt deleted file mode 100644 index 8b0be49a5..000000000 --- a/requirements.develop.txt +++ /dev/null @@ -1,3 +0,0 @@ -# use latest version from develop branch on github -git+https://github.com/Tendrl/commons.git@develop --e . diff --git a/tox.ini b/tox.ini index ab265501a..a62fa9c3e 100644 --- a/tox.ini +++ b/tox.ini @@ -3,8 +3,8 @@ [tox] minversion = 2.0 -# envlist = {py26,py27,py34}-{master,develop},pep8,docs -envlist = py27-{master,develop},pep8,docs +# envlist = {py26,py27,py34}-master,pep8,docs +envlist = py27-master,pep8,docs # Test env defaults, runs unit tests via pytest. # In this case, the "default" means that py34, py27 or other test enviroment @@ -23,7 +23,6 @@ deps = pytest-cov cover: codecov master: -r{toxinidir}/requirements.master.txt - develop: -r{toxinidir}/requirements.develop.txt commands = python -m pytest --cov=tendrl tendrl/ceph_integration/tests cover: codecov From 28344f1f10a9bcbfd586d3ccb60a33d40c2c5fdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Bal=C3=A1k?= Date: Mon, 7 Aug 2017 13:20:20 -0400 Subject: [PATCH 2/3] tox: make sure python from tox env is used --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index a62fa9c3e..cb796f689 100644 --- a/tox.ini +++ b/tox.ini @@ -24,7 +24,7 @@ deps = cover: codecov master: -r{toxinidir}/requirements.master.txt commands = - python -m pytest --cov=tendrl tendrl/ceph_integration/tests + {envpython} -m pytest --cov=tendrl tendrl/ceph_integration/tests cover: codecov # Runs PEP8 checks on the source code via flake8 tool From 3f52ff337cdf76fc98392d70d0530faa3a150e47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Bal=C3=A1k?= Date: Mon, 7 Aug 2017 13:20:53 -0400 Subject: [PATCH 3/3] tox: allow changing pytest arguments from tox cli --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index cb796f689..9dacf9a6b 100644 --- a/tox.ini +++ b/tox.ini @@ -24,7 +24,7 @@ deps = cover: codecov master: -r{toxinidir}/requirements.master.txt commands = - {envpython} -m pytest --cov=tendrl tendrl/ceph_integration/tests + {envpython} -m pytest --cov=tendrl {posargs:tendrl/ceph_integration/tests} cover: codecov # Runs PEP8 checks on the source code via flake8 tool