Merge branch 'release/4.2.8'

.travis.yml

@@ -1,18 +1,23 @@
+sudo: false
 language: python
-env:
-  - TOXENV=isort-check
-  - TOXENV=py26
-  - TOXENV=py27
-  - TOXENV=py33
-  - TOXENV=py34
-  - TOXENV=pypy
 matrix:
   include:
-    - python: 3.5
-      env:
-      - TOXENV=py35
+  - env: TOXENV=isort-check
+  - python: 2.6
+    env: TOXENV=py26
+  - python: 2.7
+    env: TOXENV=py27
+  - python: 3.3
+    env: TOXENV=py33
+  - python: 3.4
+    env: TOXENV=py34
+  - python: 3.5
+    env: TOXENV=py35
+  - python: 3.6
+    env: TOXENV=py36
+  - python: pypy
+    env: TOXENV=pypy
 install:
   - pip install tox
 script:
   - tox -e $TOXENV
-sudo: false

ACKNOWLEDGEMENTS.md

@@ -67,7 +67,10 @@ Code Contributors
 - Dan Palmer (@danpalmer)
 - Andy Boot (@bootandy)
 - @m7v8
+- John Vandenberg (@jayvdb)
 - Adam Chainz (@adamchainz)
+- @Brightcells
+- Jonas Trappenberg (@teeberg)
 
 Documenters
 ===================

CHANGELOG.md

@@ -1,30 +1,46 @@
 Changelog
 =========
 
-### 4.0.0
-- Removed all external dependencies
+### 4.2.8 - In progress
+IMPORTANT NOTE: This will be the last release with Python 2.6 support, subsequent releases will be 2.7+ only
+- Added `--virtual-env` switch command line option
+- Added --enforce-whitespace option to go along with --check-only for more exact checks (issue #423)
+- Fixed imports with a tailing '\' and no space in-between getting removed (issue #425)
+- Fixed issue #299: long lines occasionally not wrapped
+- Fixed issue #432: No longer add import inside class when class starts at top of file after encoding comment
+- Fixed issue #440: Added missing `--use-parentheses` option to command line tool and documentation
+- Fixed issue #496: import* imports now get successfully identified and reformatted instead of deleted
+- Fixed issue #491: Non ending parentheses withing single line comments no longer cause formatting issues
+- Fixed issue #471: Imports that wrap the maximum line length and contain comments on the last line are no longer rendered incorrectly
+- Fixed issue #436: Force sort within section no longer rearranges comments
+- Fixed issue #473: Force_to_top and force_sort_within_sections now work together
+- Fixed issue #484 & #472: Consistent output with imports of same spelling but different case
+- Fixed issue #433: No longer incorrectly add an extra new-line when comment between imports and function definition
+- Fixed issue #419: Path specification for skipped paths is not Unix/Windows inter-operable.
+Breaking Changes:
+    - Fixed issue #511: All command line options with an underscore, have had the underscore replaced with a dash for consistency. This effects: multi-line, add-import, remove-import, force-adds, --force-single-line-imports, and length-sort.
+    - Replaced the `--enforce-whitespace` option with `--ignore-whitespace` to restore original behavior of strict whitespace by default
 
-### 4.1.0
-- Started keeping a log of all changes between releases
-- Added the isort logo to the command line interface
-- Added example usage gif to README
-- Implemented issue #292: skip setting now supports glob patterns
-- Implemented issue #271: Add option to sort imports purely alphabetically
-- Implemented issue #301: Readme is now natively in RST format, making it easier for Python tooling to pick up
-- Implemented pylama isort extension
-- Fixed issue #260: # encoding lines at the top of the file are now correctly supported
-- Fixed issue #284: Sticky comments above first import are now supported
-- 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.2.5
+- Fixed an issue that caused modules to inccorectly be matched as thirdparty when they simply had `src` in the leading path, even if they weren't withing $VIRTUALENV/src #414
 
-### 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
+### 4.2.4
+- Fixed an issue that caused module that contained functions before doc strings, to incorrectly place imports
+- Fixed regression in how `force_alphabetical_sort` was being interpretted (issue #409)
+- Fixed stray print statement printing skipped files (issue #411)
+- Added option for forcing imports into a single bucket: `no_sections`
+- Added option for new lines between import types (from, straight): `lines_between_sections`
 
-### 4.1.2
-- Fixed issue #323: Accidental default configuration change introduced
+### 4.2.3
+- Fixed a large number of priority bugs - bug fix only release
+
+### 4.2.2
+- Give an error message when isort is unable to determine where to place a module
+- Allow imports to be sorted by module, independent of import_type, when `force_sort_within_sections` option is set
+- Fixed an issue that caused Python files with 2 top comments not to be sorted
+
+### 4.2.1
+- Hot fix release to fix code error when skipping globs
 
 ### 4.2.0
 - Added option "NOQA" Do not wrap lines, but add a noqa statement at the end
@@ -38,23 +54,27 @@ Changelog
 - Skip files even when file_contents is provided if they are explicitly in skip list
 - Removed always showing isort banner, keeping it for when the version is requested, verbose is used, or show_logo setting is set.
 
-### 4.2.1
-- Hot fix release to fix code error when skipping globs
-
-### 4.2.2
-- Give an error message when isort is unable to determine where to place a module
-- Allow imports to be sorted by module, independent of import_type, when `force_sort_within_sections` option is set
-- Fixed an issue that caused Python files with 2 top comments not to be sorted
+### 4.1.2
+- Fixed issue #323: Accidental default configuration change introduced
 
-### 4.2.3
-- Fixed a large number of priority bugs - bug fix only release
+### 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
 
-### 4.2.4
-- Fixed an issue that caused module that contained functions before doc strings, to incorrectly place imports
-- Fixed regression in how `force_alphabetical_sort` was being interpretted (issue #409)
-- Fixed stray print statement printing skipped files (issue #411)
-- Added option for forcing imports into a single bucket: `no_sections`
-- Added option for new lines between import types (from, straight): `lines_between_sections`
+### 4.1.0
+- Started keeping a log of all changes between releases
+- Added the isort logo to the command line interface
+- Added example usage gif to README
+- Implemented issue #292: skip setting now supports glob patterns
+- Implemented issue #271: Add option to sort imports purely alphabetically
+- Implemented issue #301: Readme is now natively in RST format, making it easier for Python tooling to pick up
+- Implemented pylama isort extension
+- Fixed issue #260: # encoding lines at the top of the file are now correctly supported
+- Fixed issue #284: Sticky comments above first import are now supported
+- 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.2.5
-- Fixed an issue that caused modules to inccorectly be matched as thirdparty when they simply had `src` in the leading path, even if they weren't withing $VIRTUALENV/src #414
+### 4.0.0
+- Removed all external dependencies

MANIFEST.in

@@ -0,0 +1,4 @@
+include ACKNOWLEDGEMENTS.md
+include CHANGELOG.md
+include LICENSE
+include test_isort.py

README.rst

@@ -3,11 +3,11 @@
 
 ########
 
-.. image:: https://badge.fury.io/py/isort.png
+.. image:: https://badge.fury.io/py/isort.svg
     :target: http://badge.fury.io/py/isort
     :alt: PyPI version
 
-.. image:: https://travis-ci.org/timothycrosley/isort.png?branch=master
+.. image:: https://travis-ci.org/timothycrosley/isort.svg?branch=master
     :target: https://travis-ci.org/timothycrosley/isort
     :alt: Build Status
 
@@ -29,7 +29,7 @@ isort your python imports for you so you don't have to.
 
 isort is a Python utility / library to sort imports alphabetically, and automatically separated into sections.
 It provides a command line utility, Python library and `plugins for various editors <https://github.com/timothycrosley/isort/wiki/isort-Plugins>`_ to quickly sort all your imports.
-It currently cleanly supports Python 2.6 - 3.5 using `pies <https://github.com/timothycrosley/pies>`_ to achieve this without ugly hacks and/or py2to3.
+It currently cleanly supports Python 2.6 - 3.5 without any dependencies.
 
 .. image:: https://raw.github.com/timothycrosley/isort/develop/example.gif
    :alt: Example Usage
@@ -235,9 +235,9 @@ To configure isort for a single user create a ``~/.isort.cfg`` file:
     default_section=FIRSTPARTY
 
 Additionally, you can specify project level configuration simply by placing a ``.isort.cfg`` file at the root of your
-project. isort will look up to 25 directories up, from the the file it is ran against, to find a project specific configuration.
+project. isort will look up to 25 directories up, from the file it is ran against, to find a project specific configuration.
 
-Or, if you prefer, you can add an isort section to your project's ``setup.cfg`` with any desired settings.
+Or, if you prefer, you can add an isort section to your project's ``setup.cfg`` or ``tox.ini`` file with any desired settings.
 
 You can then override any of these settings by using command line arguments, or by passing in override values to the
 SortImports class.

appveyor.yml

@@ -0,0 +1,12 @@
+init:
+  - "SET PATH=C:\\Python27\\Scripts;%PATH%"
+  - "ECHO PATH=%PATH%"
+  - python --version
+
+build: off
+
+install:
+  - pip install tox
+
+test_script:
+  - tox -e isort-check,py26,py27,py33,py34,py35,py36

isort/__init__.py

@@ -25,4 +25,4 @@
 from . import settings
 from .isort import SortImports
 
-__version__ = "4.2.5"
+__version__ = "4.2.8"