From 3ae276abb5c284dbc72ada2e03bb65ef84220b2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Armando=20Garc=C3=ADa=20Sancio?=
 <jsancio@gmail.com>
Date: Mon, 9 Mar 2015 14:18:39 -0700
Subject: [PATCH] Fix master build

TeamCity is running the latest version of flake8 which is catching more
syntax errors. This changes fixes those new errors. As part of this
change we are also running the syntax checks against the tests and
integrations directories.
---
 dcos/api/package.py             | 4 ++--
 integrations/cli/test_config.py | 2 +-
 integrations/cli/test_dcos.py   | 3 ++-
 integrations/cli/test_help.py   | 1 +
 tests/test_cmds.py              | 3 ++-
 tests/test_config.py            | 3 ++-
 tests/test_jsonitem.py          | 3 ++-
 tox.ini                         | 2 +-
 8 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/dcos/api/package.py b/dcos/api/package.py
index 6d31a4b..a6c9ca3 100644
--- a/dcos/api/package.py
+++ b/dcos/api/package.py
@@ -908,6 +908,6 @@ class IndexEntries():
         """
 
         return {
-          'source': self.source.url,
-          'packages': self.packages
+            'source': self.source.url,
+            'packages': self.packages
         }
diff --git a/integrations/cli/test_config.py b/integrations/cli/test_config.py
index 27bf19b..34a631d 100644
--- a/integrations/cli/test_config.py
+++ b/integrations/cli/test_config.py
@@ -1,6 +1,6 @@
 import os
-import pytest
 
+import pytest
 from common import exec_command
 
 
diff --git a/integrations/cli/test_dcos.py b/integrations/cli/test_dcos.py
index 29f8397..2f2be3c 100644
--- a/integrations/cli/test_dcos.py
+++ b/integrations/cli/test_dcos.py
@@ -1,8 +1,9 @@
 import os
 
-from common import exec_command
 from dcos.api import util
 
+from common import exec_command
+
 
 def test_help():
     returncode, stdout, stderr = exec_command(['dcos', '--help'])
diff --git a/integrations/cli/test_help.py b/integrations/cli/test_help.py
index 8f6ed32..5b7b334 100644
--- a/integrations/cli/test_help.py
+++ b/integrations/cli/test_help.py
@@ -1,4 +1,5 @@
 import os
+
 from common import exec_command
 
 
diff --git a/tests/test_cmds.py b/tests/test_cmds.py
index a1218a7..d5c2626 100644
--- a/tests/test_cmds.py
+++ b/tests/test_cmds.py
@@ -1,6 +1,7 @@
-import pytest
 from dcos.api import cmds, errors
 
+import pytest
+
 
 @pytest.fixture
 def args():
diff --git a/tests/test_config.py b/tests/test_config.py
index 81b95b4..9b70f60 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -1,6 +1,7 @@
-import pytest
 from dcos.api import config
 
+import pytest
+
 
 @pytest.fixture
 def conf():
diff --git a/tests/test_jsonitem.py b/tests/test_jsonitem.py
index 96a3da3..6153d7b 100644
--- a/tests/test_jsonitem.py
+++ b/tests/test_jsonitem.py
@@ -1,6 +1,7 @@
-import pytest
 from dcos.api import errors, jsonitem
 
+import pytest
+
 
 @pytest.fixture(params=range(6))
 def bad_object(request):
diff --git a/tox.ini b/tox.ini
index 0489ad6..dbf7ec7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -16,7 +16,7 @@ deps =
 
 commands =
   flake8 --verbose dcos tests integrations
-  isort --recursive --check-only --diff --verbose {envsitepackagesdir}/dcos
+  isort --recursive --check-only --diff --verbose dcos tests integrations
 
 [testenv:py27-unit]
 commands =