summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Finish fixing issue #654feature/fix-issue-654Timothy Crosley2018-02-021-0/+6
* Fix indentation erroTimothy Crosley2018-02-011-4/+4
* Implement fix for issue #654 while still supporting mode described in pull re...Timothy Crosley2018-02-014-9/+19
* Add test case for issue #654Timothy Crosley2018-02-011-0/+7
* Merge pull request #656 from asottile/patch-14.3.0Timothy Edmund Crosley2018-02-011-1/+1
|\
| * Correct `extras_require` for conditional installAnthony Sottile2018-02-011-1/+1
|/
* Merge pull request #648 from rouge8/skip-ioerrorTimothy Edmund Crosley2018-02-012-3/+13
|\
| * Don't attempt to process files we can't openAndy Freeland2018-01-312-3/+13
* | Fix syntax errorTimothy Crosley2018-02-011-1/+1
* | Fix Python2 installTimothy Crosley2018-02-011-1/+6
* | Conditonal dependency for futuresTimothy Crosley2018-02-012-4/+1
|/
* Bump version to 4.3.0Timothy Crosley2018-01-311-1/+1
* Update ACKNOWLEDGEMENTS.mdTimothy Edmund Crosley2018-01-251-0/+1
* Merge pull request #645 from gaul/typoTimothy Edmund Crosley2018-01-251-1/+1
|\
| * Correct typo in usage textAndrew Gaul2018-01-251-1/+1
|/
* Add Kathryn Lingel (@katlings) to acknowledgementsTimothy Crosley2018-01-241-0/+1
* Merge pull request #644 from katlings/issue-575Timothy Edmund Crosley2018-01-242-0/+24
|\
| * Use correct spacing between testKathryn Lingel2018-01-241-0/+2
| * Handle parenthetically enclosed imports starting after an escaped lineKathryn Lingel2018-01-242-1/+23
|/
* Merge pull request #642 from akonsta/Fix606Timothy Edmund Crosley2018-01-244-1/+10
|\
| * Fix 606, adding -k parameter to keep both direct and as imports and included ...Andrew Konstantaras2018-01-241-2/+3
| * Fix 606, adding -k parameter to keep both direct and as imports and included ...Andrew Konstantaras2018-01-241-4/+2
| * Fix 606, adding -k parameter to keep both direct and as imports and included ...Andrew Konstantaras2018-01-241-1/+1
| * Fix 606, adding -k parameter to keep both direct and as imports and included ...Andrew Konstantaras2018-01-241-0/+5
| * Fix 606, adding -k parameter to keep both direct and as importsAndrew Konstantaras2018-01-243-0/+5
* | Merge pull request #641 from jasonbrackman/developTimothy Edmund Crosley2018-01-242-3/+26
|\ \
| * | added a test for imports created at load time, such as six.moves.jasonbrackman2018-01-241-0/+24
| * | added a test for imports created at load time, such as six.moves.jasonbrackman2018-01-241-3/+2
* | | Merge pull request #640 from akonsta/Fix638Timothy Edmund Crosley2018-01-242-3/+10
|\ \ \ | | |/ | |/|
| * | Fix 638 and 613 by cleaning line earlier and fixing typo and adding \nAndrew Konstantaras2018-01-241-2/+2
| * | Fix 638 and 613 by cleaning line earlier and fixing typoAndrew Konstantaras2018-01-241-2/+2
| * | Fix 638 and 613 by cleaning line earlierAndrew Konstantaras2018-01-241-3/+3
| * | Added test for 613 and allow "from.import" syntaxAndrew Konstantaras2018-01-241-1/+0
| * | Added test for 613 and allow "from.import" syntaxAndrew Konstantaras2018-01-242-1/+9
* | | Add Andrew Konstantaras (@akonsta) and Jason Brackman (@jasonbrackman) to con...Timothy Crosley2018-01-241-0/+2
* | | Merge pull request #637 from akonsta/Fix613Timothy Edmund Crosley2018-01-241-0/+1
|\ \ \ | |/ /
| * | Fix 613 Addresses error recognizing "from .import foo"Andrew Konstantaras2018-01-241-0/+1
* | | Merge pull request #636 from jasonbrackman/developTimothy Edmund Crosley2018-01-241-1/+1
|\ \ \ | | |/ | |/|
| * | Updating test to account for django being installed on local machine.jasonbrackman2018-01-241-1/+1
* | | Merge pull request #635 from akonsta/ChangeRequest598Timothy Edmund Crosley2018-01-241-83/+83
|\ \ \ | |/ / |/| / | |/
| * Sorted command line argumentsAndrew Konstantaras2018-01-241-83/+83
|/
* Merge pull request #631 from obmarg/fix/extra-line-breaksTimothy Edmund Crosley2018-01-232-4/+18
|\
| * Update test_isort.pyTimothy Edmund Crosley2018-01-231-1/+0
| * Don't add un-neccesary line break in grouped vertical grid.Graeme Coupar2018-01-192-4/+19
* | Merge pull request #632 from obmarg/fix/smart-linesTimothy Edmund Crosley2018-01-232-0/+15
|\ \
| * | Smart newlines no longer skips multi-line string assignmentsGraeme Coupar2018-01-192-0/+15
* | | Merge pull request #626 from jdufresne/py33Timothy Edmund Crosley2018-01-231-4/+0
|\ \ \
| * | | Remove additional references to Python 3.3Jon Dufresne2018-01-111-4/+0
| | |/ | |/|
* | | Merge pull request #624 from jdufresne/pyreqTimothy Edmund Crosley2018-01-231-0/+1
|\ \ \
| * | | Pass python_requires argument to setuptoolsJon Dufresne2018-01-101-0/+1
| |/ /
View Lorry Controller Status