fix flake8

alexhall · Sep 6, 2017 · 7d4baa7 · 7d4baa7
1 parent 441219f
commit 7d4baa7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/conda/models/channel.py b/conda/models/channel.py
@@ -4,8 +4,7 @@
 from itertools import chain
 from logging import getLogger
 
-from ..base.constants import (DEFAULTS_CHANNEL_NAME, DEFAULT_CHANNELS_UNIX, DEFAULT_CHANNELS_WIN,
-                              MAX_CHANNEL_PRIORITY, UNKNOWN_CHANNEL)
+from ..base.constants import (DEFAULTS_CHANNEL_NAME, MAX_CHANNEL_PRIORITY, UNKNOWN_CHANNEL)
 from ..base.context import context
 from ..common.compat import ensure_text_type, isiterable, iteritems, odict, with_metaclass
 from ..common.path import is_path, win_path_backout

diff --git a/setup.cfg b/setup.cfg
@@ -1,7 +1,7 @@
 [tool:pytest]
 minversion = 3.0
 testpaths = conda tests
-norecursedirs = .* *.egg* build dist conda/_vendor/* conda_env/*
+norecursedirs = .* *.egg* build dist env ve conda/_vendor/* conda_env/*
 addopts =
     --ignore setup.py
     --ignore conda/__main__.py
@@ -22,13 +22,13 @@ markers =
 [pep8]
 max-line-length = 99
 ignore = E126,E133,E226,E241,E242,E302,E704,E731,W503
-exclude = build/*,.tox/*,tests/*,ve/*,*/_vendor/*,conda/compat.py,conda/common/compat.py,conda_env/compat.py
+exclude = build/*,.tox/*,env/*,tests/*,ve/*,*/_vendor/*,conda/compat.py,conda/common/compat.py,conda_env/compat.py
 
 
 [flake8]
 max-line-length = 99
 ignore = E126,E133,E226,E241,E242,E302,E704,E731,W503
-exclude = build/*,.tox/*,tests/*,ve/*,*/_vendor/*,conda/compat.py,conda/common/compat.py,conda_env/compat.py
+exclude = build/*,.tox/*,env/*,tests/*,ve/*,*/_vendor/*,conda/compat.py,conda/common/compat.py,conda_env/compat.py
 
 
 [coverage:report]