Merge 739d6a4 into f52a347

.isort.cfg

@@ -0,0 +1,4 @@
+[settings]
+force_alphabetical_sort=True
+force_single_line=True
+lines_after_imports=2

CHANGES.rst

@@ -32,6 +32,11 @@ Change history
 - Remove leftovers from utf-8 checker removal.
   [gforcada]
 
+- Remove imports checker,
+  `flake8-isort <https://pypi.python.org/pypi/flake8-isort>`_
+  does the same job.
+  [tisto] [gforcada]
+
 2.0.2 (2015-09-03)
 ------------------
 

MANIFEST.in

@@ -12,3 +12,4 @@ include bootstrap-buildout.py
 include buildout.cfg
 include extras.cfg
 include travis.cfg
+include .isort.cfg

README.rst

@@ -99,7 +99,6 @@ This configuration looks like this:
     # Conventions
     clean-lines = True
     clean-lines-exclude = ${:jscs-exclude}
-    imports = True
     # i18n
     find-untranslated = True
     i18ndude-bin = ${buildout:bin-directory}/i18ndude
@@ -394,15 +393,6 @@ The recipe supports the following options:
     Allows you to specify directories and/or files which you don't want to be
     checked. Default is none.
 
-**imports**
-    If set to True, checks that imports in Python files follow `plone.api
-    conventions`_. This also includes checking for alphabetically sorted
-    import statements. Default is ``False``.
-
-**imports-exclude**
-    Allows you to specify directories and/or files which you don't want to be
-    checked. Default is none.
-
 **return-status-codes**
     If set to True, the ``bin/code-analysis`` script returns an error code
     that Continuous Integration servers (like Travis CI) can use to fail or

buildout.cfg

@@ -41,9 +41,9 @@ flake8-extensions =
     flake8-blind-except
     flake8-coding
     flake8-debugger
+    flake8-isort
     flake8-quotes
     pep8-naming
-imports = True
 jshint = False
 jshint-bin = ${buildout:directory}/bin/jshint
 return-status-codes = False
@@ -66,3 +66,4 @@ zc.buildout =
 zc.recipe.egg =
 zope.testrunner = 4.0.4
 transaction = 1.2.0
+isort = 4.2.0

plone/recipe/codeanalysis/__init__.py

@@ -4,7 +4,6 @@
 from plone.recipe.codeanalysis.csslint import CSSLint
 from plone.recipe.codeanalysis.flake8 import Flake8
 from plone.recipe.codeanalysis.i18ndude import I18NDude
-from plone.recipe.codeanalysis.imports import Imports
 from plone.recipe.codeanalysis.jscs import JSCS
 from plone.recipe.codeanalysis.jshint import JSHint
 from plone.recipe.codeanalysis.zptlint import ZPTLint
@@ -22,7 +21,6 @@
     CleanLines,
     Flake8,
     I18NDude,
-    Imports,
     JSCS,
     JSHint,
     ZPTLint,
@@ -71,8 +69,6 @@ def __init__(self, buildout, name, options):
         # clean lines
         self.options.setdefault('clean-lines', 'False')
         self.options.setdefault('clean-lines-exclude', '')
-        # imports
-        self.options.setdefault('imports', 'False')
         # Jenkins output
         self.options.setdefault('jenkins', 'False')
         self.options.setdefault('flake8-filesystem', 'False')

plone/recipe/codeanalysis/analyser.py

@@ -3,6 +3,7 @@
 from abc import abstractproperty
 from tempfile import TemporaryFile
 from time import time
+
 import os
 import re
 import subprocess

plone/recipe/codeanalysis/check_manifest.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from plone.recipe.codeanalysis.analyser import Analyser
 from plone.recipe.codeanalysis.analyser import console_factory
+
 import os
 import re
 import subprocess

plone/recipe/codeanalysis/clean_lines.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from plone.recipe.codeanalysis.analyser import Analyser
 from plone.recipe.codeanalysis.analyser import console_factory
+
 import re
 
 

plone/recipe/codeanalysis/csslint.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from plone.recipe.codeanalysis.analyser import Analyser
 from plone.recipe.codeanalysis.analyser import console_factory
+
 import re
 
 

plone/recipe/codeanalysis/flake8.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from plone.recipe.codeanalysis.analyser import Analyser
 from plone.recipe.codeanalysis.analyser import console_factory
+
 import os
 
 

plone/recipe/codeanalysis/jscs.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from plone.recipe.codeanalysis.analyser import Analyser
 from plone.recipe.codeanalysis.analyser import console_factory
+
 import re
 
 

plone/recipe/codeanalysis/jshint.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from plone.recipe.codeanalysis.analyser import Analyser
 from plone.recipe.codeanalysis.analyser import console_factory
+
 import re
 
 

plone/recipe/codeanalysis/testing.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from shutil import rmtree
 from tempfile import mkdtemp
+
 import os
 import unittest
 

plone/recipe/codeanalysis/tests/test_csslint.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
-from plone.recipe.codeanalysis.csslint import CSSLint
 from plone.recipe.codeanalysis.csslint import console_script
+from plone.recipe.codeanalysis.csslint import CSSLint
 from plone.recipe.codeanalysis.testing import CodeAnalysisTestCase
 from shutil import rmtree
 from tempfile import mkdtemp

plone/recipe/codeanalysis/tests/test_docs.py

@@ -1,11 +1,13 @@
 # -*- coding: utf-8 -*-
 from zope.testing import renormalizing
+
 import doctest
 import os
 import unittest
 import zc.buildout.testing
 import zc.buildout.tests
 
+
 optionflags = (
     doctest.ELLIPSIS |
     doctest.NORMALIZE_WHITESPACE |

plone/recipe/codeanalysis/tests/test_flake8.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
-from plone.recipe.codeanalysis.flake8 import Flake8
 from plone.recipe.codeanalysis.flake8 import console_script
+from plone.recipe.codeanalysis.flake8 import Flake8
 from plone.recipe.codeanalysis.testing import CodeAnalysisTestCase
 from shutil import rmtree
 from tempfile import mkdtemp

plone/recipe/codeanalysis/tests/test_i18ndude.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
-from plone.recipe.codeanalysis.i18ndude import I18NDude
 from plone.recipe.codeanalysis.i18ndude import console_script
+from plone.recipe.codeanalysis.i18ndude import I18NDude
 from plone.recipe.codeanalysis.testing import CodeAnalysisTestCase
 from testfixtures import OutputCapture