1 new commit in tox:
https://bitbucket.org/hpk42/tox/commits/17f5a90a5fd9/
Changeset: 17f5a90a5fd9
User: aostr123
Date: 2016-06-20 15:27:44+00:00
Summary: Merged in issue336 (pull request #198)
#336 make flakes pass
Affected #: 5 files
diff -r 9f48a8fc624684ca6b5ea93ff36463850b3854b7 -r
17f5a90a5fd9c6f394e84228f3f97095c3eb2098 tests/test_config.py
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -1490,7 +1490,7 @@
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 = """
diff -r 9f48a8fc624684ca6b5ea93ff36463850b3854b7 -r
17f5a90a5fd9c6f394e84228f3f97095c3eb2098 tox.ini
--- a/tox.ini
+++ b/tox.ini
@@ -34,7 +34,7 @@
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 @@
# E731 - do not assign a lambda expression, use a def
pep8ignore =
*.py W503 E402 E731
+flakes-ignore = ImportStarUsage
diff -r 9f48a8fc624684ca6b5ea93ff36463850b3854b7 -r
17f5a90a5fd9c6f394e84228f3f97095c3eb2098 tox/_pytestplugin.py
--- a/tox/_pytestplugin.py
+++ b/tox/_pytestplugin.py
@@ -195,7 +195,7 @@
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 -r 9f48a8fc624684ca6b5ea93ff36463850b3854b7 -r
17f5a90a5fd9c6f394e84228f3f97095c3eb2098 tox/config.py
--- a/tox/config.py
+++ b/tox/config.py
@@ -523,10 +523,10 @@
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 -r 9f48a8fc624684ca6b5ea93ff36463850b3854b7 -r
17f5a90a5fd9c6f394e84228f3f97095c3eb2098 tox/session.py
--- a/tox/session.py
+++ b/tox/session.py
@@ -537,7 +537,6 @@
# 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,
Repository URL: https://bitbucket.org/hpk42/tox/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
pytest-commit mailing list
pytest-commit@python.org
https://mail.python.org/mailman/listinfo/pytest-commit
