summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix syntax errorTimothy Crosley2019-03-081-1/+1
* Merge branch 'develop' of https://github.com/timothycrosley/isort into developTimothy Crosley2019-03-077-12/+54
|\
| * Merge in changelog updateTimothy Crosley2019-03-061-0/+5
| * Implement conda environment supportTimothy Crosley2019-03-062-7/+23
| * Merge pull request #884 from emilmelnikov/patch-1Timothy Edmund Crosley2019-03-062-1/+18
| |\
| | * Do not print file names when in the quiet modeEmil Melnikov2019-03-062-1/+18
| * | Merge in hot fix releaseTimothy Crosley2019-03-064-4/+8
| |/
* | Fix logic error in skip checkTimothy Crosley2019-03-071-1/+1
* | Fix file skipping in particular with globsTimothy Crosley2019-03-074-12/+34
* | Add first additional test caseTimothy Crosley2019-03-071-1/+8
|/
* Merge in fallback encoding supportTimothy Crosley2019-03-061-1/+1
* Allow fallback to OS encodingTimothy Crosley2019-03-061-6/+18
* Fix open usageTimothy Crosley2019-03-061-1/+1
* Update to include binary/pex improvementTimothy Crosley2019-03-062-4/+15
* Merge in improvement for safe skipsTimothy Edmund Crosley2019-03-067-19/+29
* Merge pull request #875 from Tenzer/toml-integer-valuesTimothy Edmund Crosley2019-03-041-1/+1
|\
| * Support integer values for `multi_line_output` from TOML filesJeppe Fihl-Pearson2019-03-041-1/+1
* | Merge branch 'develop' of https://github.com/timothycrosley/isort into developTimothy Crosley2019-03-0410-53/+112
|\ \ | |/
| * Add downloads linkTimothy Crosley2019-03-031-0/+3
| * Merge pull request #850 from mkurnikov/split-sort-imports-cherry-pickedTimothy Edmund Crosley2019-03-034-48/+59
| |\
| | * rename original_length -> original_num_of_linesMaxim Kurnikov2019-02-262-5/+5
| | * extract infer_line_separator methodMaxim Kurnikov2019-02-262-6/+10
| | * rename should_skip -> file_should_be_skippedMaxim Kurnikov2019-02-263-6/+6
| | * extract config preparation in separate functionMaxim Kurnikov2019-02-262-32/+39
| * | Merge pull request #872 from timothycrosley/feature/merge-in-latest-masterTimothy Edmund Crosley2019-03-036-5/+50
| |\ \
| | * | Re-add missing environment varieableTimothy Crosley2019-03-031-0/+1
| | * | Pull request to merge in latest hotfix master changes into develop branchTimothy Crosley2019-03-036-6/+50
| |/ /
* | | Merge in fix for issue #876Brian May2019-03-041-0/+1
|/ /
* | Merge pull request #871 from blueyed/codecovTimothy Edmund Crosley2019-03-031-0/+10
|\ \
| * | ci: add codecov.ymlDaniel Hahler2019-03-031-0/+10
* | | Merge pull request #870 from blueyed/pytest-cfgTimothy Edmund Crosley2019-03-033-11/+31
|\ \ \ | |/ / |/| |
| * | ci: AppVeyor: remove python --versionDaniel Hahler2019-03-031-1/+0
| * | ci: AppVeyor: use Python 3.7Daniel Hahler2019-03-031-1/+1
| * | fixup! ci: AppVeyor: use separate builds with coverageDaniel Hahler2019-03-031-0/+12
| * | ci: AppVeyor: use separate builds with coverageDaniel Hahler2019-03-031-1/+9
| * | ci: Travis: remove deprecated sudo=falseDaniel Hahler2019-03-031-1/+0
| * | ci: Travis: use Python 3.7 by defaultDaniel Hahler2019-03-031-6/+4
| * | ci: set PYTEST_ADDOPTS=-vvDaniel Hahler2019-03-032-0/+4
| * | tox.ini: rely on pytest configDaniel Hahler2019-03-031-1/+1
|/ /
* | Merge pull request #864 from blueyed/covTimothy Edmund Crosley2019-03-025-8/+37
|\ \
| * \ Merge branch 'develop' into covTimothy Edmund Crosley2019-03-0211-73/+200
| |\ \
| * | | Report coverageDaniel Hahler2019-03-015-9/+38
| | |/ | |/|
* | | Sort importsTimothy Crosley2019-03-021-1/+1
| |/ |/|
* | Merge pull request #854 from mkurnikov/fix-enum-bug-cherry-pickTimothy Edmund Crosley2019-03-022-2/+23
|\ \
| * | fix bug with parsing WrapModes from config fileMaxim Kurnikov2019-02-272-2/+23
| |/
* | Merge pull request #862 from blueyed/fix-no_lines_before-with-empty-sectionTimothy Edmund Crosley2019-03-022-7/+27
|\ \
| * | Fix no_lines_before with empty sectionDaniel Hahler2019-03-012-7/+27
| |/
* | Merge pull request #867 from jpgrayson/developTimothy Edmund Crosley2019-03-024-8/+26
|\ \
| * | Add -rr/--reverse-relative option (issue #417)Peter Grayson2019-03-014-8/+26
| |/
* | Merge pull request #861 from blueyed/fix-test_inconsistent_behavior_in_python...Timothy Edmund Crosley2019-03-021-1/+2
|\ \