ignore type annotation errors in flake8; add cph to local recipe

alexhall · Apr 17, 2019 · 16746ea · 16746ea
1 parent be34fea
commit 16746ea
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/conda/models/version.py b/conda/models/version.py
@@ -280,8 +280,8 @@ def __lt__(self, other):
                             # str < int
                             return True
                     elif isinstance(c2, string_types):
-                            # not (int < str)
-                            return False
+                        # not (int < str)
+                        return False
                     # c1 and c2 have the same type
                     return c1 < c2
         # self == other

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -30,6 +30,7 @@ requirements:
     - setuptools >=31.0.1
   run:
     - python
+    - conda-package-handling
     - enum34                       # [py<34]
     - futures >=3.0.0              # [py<34]
     - menuinst >=1.4.11,<2         # [win]

diff --git a/setup.cfg b/setup.cfg
@@ -33,7 +33,7 @@ exclude = build/*,.tox/*,devenv*/*,env/*,test_data/*,tests/*,ve/*,utils/*,*/_ven
 
 [flake8]
 max-line-length = 99
-ignore = E126,E133,E226,E241,E242,E302,E704,E731,E722,W503,E402,W504
+ignore = E126,E133,E226,E241,E242,E302,E704,E731,E722,W503,E402,W504,F821
 exclude =  .asv*,build/*,.tox/*,devenv*/*,env/*,test_data/*,tests/*,ve/*,utils/*,*/_vendor/*,conda/compat.py,conda/common/compat.py,conda_env/compat.py