Merge branch 'release/4.1.1'

Author: timothycrosley

ACKNOWLEDGEMENTS.md

@@ -52,6 +52,7 @@ Code Contributors
 - Benjamin ABEL (@benjaminabel)
 - Dan Baragan (@danbaragan)
 - Rob Cowie (@robcowie)
+- Amit Shah (@Amwam)
 
 Documenters
 ===================

CHANGELOG.md

@@ -17,3 +17,8 @@ Changelog
 - Fixed issue #310: Ensure comments don't get duplicated when reformatting imports
 - Fixed issue #289: Sections order not being respected
 - Fixed issue #296: Made it more clear how to set arguments more then once
+
+### 4.1.1
+- Added support for partial file match skips (thanks to @Amwam)
+- Added support for --quiet option to only show errors when running isort
+- Fixed issue #316: isort added new lines incorrectly when a top-of line comment is present

isort/__init__.py

@@ -25,4 +25,4 @@
 from . import settings
 from .isort import SortImports
 
-__version__ = "4.1.0"
+__version__ = "4.1.1"

isort/isort.py

@@ -198,8 +198,9 @@ def _strip_top_comments(lines):
 
     def _should_skip(self, filename):
         """Returns True if the file should be skipped based on the loaded settings."""
-        if filename in self.config['skip']:
-            return True
+        for skip_path in self.config['skip']:
+            if skip_path.endswith(filename):
+                return True
 
         position = os.path.split(filename)
         while position[1]:
@@ -795,6 +796,8 @@ def _parse(self):
                                 last = self.out_lines[-1].rstrip()
                             else:
                                 last = ""
+                        if self.index - 1 == self.import_index:
+                            self.import_index -= len(self.comments['above']['from'].get(import_from, []))
 
                     if root.get(import_from, False):
                         root[import_from].update(imports)
@@ -816,6 +819,8 @@ def _parse(self):
                                     last = self.out_lines[-1].rstrip()
                                 else:
                                     last = ""
+                            if self.index - 1 == self.import_index:
+                                self.import_index -= len(self.comments['above']['straight'].get(module, []))
                         self.imports[self.place_module(module)][import_type].add(module)
 
 

isort/main.py

@@ -193,6 +193,8 @@ def create_parser():
     parser.add_argument('-v', '--version', action='version', version='isort {0}'.format(__version__))
     parser.add_argument('-vb', '--verbose', action='store_true', dest="verbose",
                         help='Shows verbose output, such as when files are skipped or when a check is successful.')
+    parser.add_argument('-q', '--quiet', action='store_true', dest="quiet",
+                        help='Shows extra quiet output, only errors are outputted.')
     parser.add_argument('-sp', '--settings-path',  dest="settings_path",
                         help='Explicitly set the settings path instead of auto determining based on file location.')
     parser.add_argument('-ff', '--from-first', dest='from_first',
@@ -219,7 +221,8 @@ def main():
         if arguments.get('recursive', False):
             file_names = iter_source_code(file_names)
         num_skipped = 0
-        print(INTRO)
+        if not arguments.get('quiet', False):
+            print(INTRO)
         for file_name in file_names:
             try:
                 sort_attempt = SortImports(file_name, **arguments)
@@ -233,7 +236,7 @@ def main():
         if wrong_sorted_files:
             exit(1)
 
-        if num_skipped:
+        if num_skipped and not arguments.get('quiet', False):
             print("Skipped {0} files".format(num_skipped))
 
 if __name__ == "__main__":

isort/settings.py

@@ -92,7 +92,8 @@
            'combine_star': False,
            'include_trailing_comma': False,
            'from_first': False,
-           'verbose': False}
+           'verbose': False,
+           'quiet': False}
 
 
 @lru_cache()

setup.py

@@ -39,13 +39,13 @@ def run(self):
    readme = f.read()
 
 setup(name='isort',
-      version='4.1.0',
+      version='4.1.1',
       description='A Python utility / library to sort Python imports.',
       long_description=readme,
       author='Timothy Crosley',
       author_email='[email protected]',
       url='https://github.com/timothycrosley/isort',
-      download_url='https://github.com/timothycrosley/isort/archive/4.1.0.tar.gz',
+      download_url='https://github.com/timothycrosley/isort/archive/4.1.1.tar.gz',
       license="MIT",
       entry_points={
         'console_scripts': [

test_isort.py

@@ -1507,3 +1507,11 @@ def test_basic_comment():
                   '# Foo\n'
                   'import os\n')
     assert SortImports(file_contents=test_input).output == test_input
+
+
+def test_shouldnt_add_lines():
+    """Ensure that isort doesn't add a blank line when a top of import comment is present, issue #316"""
+    test_input = ('"""Text"""\n'
+                  '# This is a comment\n'
+                 'import pkg_resources\n')
+    assert SortImports(file_contents=test_input).output == test_input