round 12

Arrowbox · Aug 11, 2016 · 748c2bf · 748c2bf
1 parent e27a1ff
commit 748c2bf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/setup.py b/setup.py
@@ -29,7 +29,7 @@
 sys.path.insert(0, src_dir)
 
 import conda  # NOQA
-from conda._vendor.auxlib import packaging
+from conda._vendor.auxlib import packaging  # NOQA
 
 with open(os.path.join(here, "README.rst")) as f:
     long_description = f.read()

diff --git a/utils/travis-run-install.sh b/utils/travis-run-install.sh
@@ -71,12 +71,11 @@ miniconda_install() {
 
 
 if [[ $FLAKE8 == true ]]; then
-    flake8_extras
     main_install
+    flake8_extras
 elif [[ $CONDA_BUILD == true ]]; then
     miniconda_install
 else
-    test_extras
     main_install
-
+    test_extras
 fi