diff options
| author | Oliver Bestwalter <oliver.bestwalter@avira.com> | 2016-06-20 17:18:50 +0200 |
|---|---|---|
| committer | Oliver Bestwalter <oliver.bestwalter@avira.com> | 2016-06-20 17:18:50 +0200 |
| commit | 03dd843fba44bc2fad91da6f2f7bb828a98ab923 (patch) | |
| tree | e2d7d92f2208acc450979961030a523dc801f8d1 | |
| parent | df580330eaa1bbce79012f8cfaa5c4d0a5ddf93d (diff) | |
| download | tox-03dd843fba44bc2fad91da6f2f7bb828a98ab923.tar.gz | |
make flakes pass
| -rw-r--r-- | tests/test_config.py | 2 | ||||
| -rw-r--r-- | tox.ini | 3 | ||||
| -rw-r--r-- | tox/_pytestplugin.py | 2 | ||||
| -rw-r--r-- | tox/config.py | 8 | ||||
| -rw-r--r-- | tox/session.py | 1 |
5 files changed, 8 insertions, 8 deletions
diff --git a/tests/test_config.py b/tests/test_config.py index ffc8343..82248d8 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -1441,7 +1441,7 @@ class TestGlobalOptions: minversion = 10.0 """ with py.test.raises(tox.exception.MinVersionError): - config = newconfig([], inisource) + newconfig([], inisource) def test_skip_missing_interpreters_true(self, tmpdir, newconfig, monkeypatch): inisource = """ @@ -34,7 +34,7 @@ platform=linux deps = pytest-flakes>=0.2 pytest-pep8 -commands = +commands = py.test --flakes -m flakes tox tests py.test --pep8 -m pep8 tox tests @@ -60,3 +60,4 @@ pep8maxlinelength = 99 # E731 - do not assign a lambda expression, use a def pep8ignore = *.py W503 E402 E731 +flakes-ignore = ImportStarUsage diff --git a/tox/_pytestplugin.py b/tox/_pytestplugin.py index 4dfc497..785070d 100644 --- a/tox/_pytestplugin.py +++ b/tox/_pytestplugin.py @@ -195,7 +195,7 @@ class Cmd: return py.std.subprocess.Popen(argv, stdout=stdout, stderr=stderr, **kw) def run(self, *argv): - if argv[0] == "tox" and sys.version_info[:2] < (2,7): + if argv[0] == "tox" and sys.version_info[:2] < (2, 7): pytest.skip("can not run tests involving calling tox on python2.6. " "(and python2.6 is about to be deprecated anyway)") argv = [str(x) for x in argv] diff --git a/tox/config.py b/tox/config.py index 1fd702c..f4c65dc 100644 --- a/tox/config.py +++ b/tox/config.py @@ -520,10 +520,10 @@ def tox_addoption(parser): parser.add_testenv_attribute_obj(InstallcmdOption()) parser.add_testenv_attribute( - name = "list_dependencies_command", - type = "argv", - default = "python -m pip freeze", - help = "list dependencies for a virtual environment") + name="list_dependencies_command", + type="argv", + default="python -m pip freeze", + help="list dependencies for a virtual environment") parser.add_testenv_attribute_obj(DepOption()) diff --git a/tox/session.py b/tox/session.py index 1d51b92..cb5cc66 100644 --- a/tox/session.py +++ b/tox/session.py @@ -537,7 +537,6 @@ class Session: # write out version dependency information action = self.newaction(venv, "envreport") with action: - python = venv.getcommandpath("python") args = venv.envconfig.list_dependencies_command output = venv._pcall(args, cwd=self.config.toxinidir, |