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..9dacf9a6b 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,9 +23,8 @@ 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 + {envpython} -m pytest --cov=tendrl {posargs:tendrl/ceph_integration/tests} cover: codecov # Runs PEP8 checks on the source code via flake8 tool