Merge branch 'release/4.2.3'

.env

@@ -12,6 +12,34 @@ fi
 export PROJECT_NAME=$OPEN_PROJECT_NAME
 export PROJECT_DIR="$PWD"
 
+if [ ! -d "venv" ]; then
+     if ! hash pyvenv 2>/dev/null; then
+        function pyvenv()
+        {
+            if hash pyvenv-3.5 2>/dev/null; then
+                pyvenv-3.5 $@
+            fi
+            if hash pyvenv-3.4 2>/dev/null; then
+                pyvenv-3.4 $@
+            fi
+            if hash pyvenv-3.3 2>/dev/null; then
+                pyvenv-3.3 $@
+            fi
+            if hash pyvenv-3.2 2>/dev/null; then
+                pyvenv-3.2 $@
+            fi
+        }
+    fi
+
+    echo "Making venv for $PROJECT_NAME"
+    pyvenv venv
+    . venv/bin/activate
+    python setup.py install
+    pip install -r requirements.txt
+fi
+
+. venv/bin/activate
+
 # Let's make sure this is a hubflow enabled repo
 yes | git hf init >/dev/null 2>/dev/null
 
@@ -20,11 +48,12 @@ alias root="cd $PROJECT_DIR"
 alias project="root; cd $PROJECT_NAME"
 
 # Commands
-alias test="root; py.test -s"
+alias test="root; py.test test_isort.py -s"
 alias install="_install_project"
 alias distribute="python setup.py sdist upload; python setup.py bdist_wheel upload"
 alias leave="_leave_project"
 
+
 function _install_project()
 {
     CURRENT_DIRECTORY="$PWD"
@@ -34,6 +63,19 @@ function _install_project()
     cd $CURRENT_DIRECTORY
 }
 
+
+function load {
+    (root
+     python setup.py install)
+}
+
+
+function interact {
+    (load
+     ipython -c "import isort" -i)
+}
+
+
 function _leave_project()
 {
     export PROJECT_NAME=""
@@ -45,4 +87,9 @@ function _leave_project()
     unalias install
     unalias distribute
     unalias leave
+
+    unset -f load
+    unset -f interact
+
+    deactivate
 }

.gitignore

@@ -62,9 +62,5 @@ atlassian-ide-plugin.xml
 pip-selfcheck.json
 
 # Python3 Venv Files
-bin/
-include/
-lib/
-lib64
+venv/
 pyvenv.cfg
-share/

.travis.yml

@@ -3,11 +3,16 @@ env:
   - TOXENV=isort-check
   - TOXENV=py26
   - TOXENV=py27
-  - TOXENV=py32
   - TOXENV=py33
   - TOXENV=py34
   - TOXENV=pypy
+matrix:
+  include:
+    - python: 3.5
+      env:
+      - TOXENV=py35
 install:
   - pip install tox
 script:
   - tox -e $TOXENV
+sudo: false

ACKNOWLEDGEMENTS.md

@@ -59,6 +59,13 @@ Code Contributors
 - Ankur Dedania (@AbsoluteMSTR)
 - Lee Packham (@leepa)
 - Jesse Mullan (@jmullan)
+- Kwok-kuen Cheung (@cheungpat)
+- Johan Bloemberg (@aequitas)
+- Dan Watson (@dcwatson)
+- Éric Araujo (@merwok)
+- Dan Palmer (@danpalmer)
+- Andy Boot (@bootandy)
+- @m7v8
 
 Documenters
 ===================
@@ -67,6 +74,7 @@ Documenters
 - Elliott Sales de Andrade (@QuLogic)
 - Brian Peiris (@brianpeiris)
 - Tim Graham (@timgraham)
+- Josh Soref (@jsoref)
 
 --------------------------------------------
 

CHANGELOG.md

@@ -28,7 +28,7 @@ Changelog
 
 ### 4.2.0
 - Added option "NOQA" Do not wrap lines, but add a noqa statement at the end
-- Added support for runnning isort recursively, simply with a standalone `isort` command
+- Added support for running isort recursively, simply with a standalone `isort` command
 - Added support to run isort library as a module
 - Added compatibility for Python 3.5
 - Fixed performance issue (#338) when running on project with lots of skipped directories
@@ -43,5 +43,8 @@ Changelog
 
 ### 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, independant of import_type, when `force_sort_within_sections` option is set
+- 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.3
+- Fixed a large number of priority bugs - bug fix only release

README.rst

@@ -381,7 +381,7 @@ to your preference:
 
     sections=FUTURE,STDLIB,FIRSTPARTY,THIRDPARTY,LOCALFOLDER
 
-You also can define your own sections and thier order.
+You also can define your own sections and their order.
 
 Example:
 
@@ -548,10 +548,11 @@ To cause the commit to fail if there are isort errors (strict mode), include the
 
 .. code-block:: python
 
+    #!/usr/bin/env python
+    import sys
     from isort.hooks import git_hook
 
-    if __name__ == '__main__':
-        sys.exit(git_hook(strict=True))
+    sys.exit(git_hook(strict=True))
 
 If you just want to display warnings, but allow the commit to happen anyway, call ``git_hook`` without
 the `strict` parameter.

isort/__init__.py

@@ -25,4 +25,4 @@
 from . import settings
 from .isort import SortImports
 
-__version__ = "4.2.2"
+__version__ = "4.2.3"