summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | * 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
| |\ \ | | | | | | | | Pull request to merge in latest hotfix master changes into develop br…
| | * | 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.yml
| * | ci: add codecov.ymlDaniel Hahler2019-03-031-0/+10
| | |
* | | Merge pull request #870 from blueyed/pytest-cfgTimothy Edmund Crosley2019-03-033-11/+31
|\ \ \ | |/ / |/| | ci/tests: revisit config/setup
| * | ci: AppVeyor: remove python --versionDaniel Hahler2019-03-031-1/+0
| | | | | | | | | | | | | | | | | | This is confusing, as it was still displaying "Python 2.7.15". `tox` reports the used version correctly.
| * | ci: AppVeyor: use Python 3.7Daniel Hahler2019-03-031-1/+1
| | | | | | | | | | | | Python 2.7 is not supported by isort anymore.
| * | 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
|/ / | | | | | | | | | | | | It sets testpaths since e5572e9, and it looks like `-vv -s` was left from debugging Windows failures remotely?! If `-vv -s` or a variant should be kept, it would better go into pytest's `addopts` setting - or could be set on CI via `PYTEST_ADDOPTS`.
* | Merge pull request #864 from blueyed/covTimothy Edmund Crosley2019-03-025-8/+37
|\ \ | | | | | | Setup coverage
| * \ Merge branch 'develop' into covTimothy Edmund Crosley2019-03-0211-73/+200
| |\ \
| * | | Report coverageDaniel Hahler2019-03-015-9/+38
| | |/ | |/| | | | | | | | | | | | | | | | - add coverage factor to tox - report coverage to codecov.io - configure testpaths for pytest, instead of passing it through tox command
* | | 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 file
| * | 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 section
| * | Fix no_lines_before with empty sectionDaniel Hahler2019-03-012-7/+27
| |/ | | | | | | | | This fixes "no_lines_before" to also be respected from previous empty sections.
* | Merge pull request #867 from jpgrayson/developTimothy Edmund Crosley2019-03-024-8/+26
|\ \ | | | | | | Add -rr/--reverse-relative option (issue #417)
| * | Add -rr/--reverse-relative option (issue #417)Peter Grayson2019-03-014-8/+26
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This new option changes the sort order of relative imports. The new default sort order is from furthest to closest (most dots to least dots): from ... import a from ...foo import x from .. import b from ..bar import y from . import c from .baz import z With the new -rr/--reverse-relative option, the order of the relative import *levels* (inter-order) is reversed, but the ordering within each relative import level (intra-order) remains the same (i.e. normal lexical order). from . import c from .baz import z from .. import b from ..bar import y from ... import a from ...foo import x Signed-off-by: Peter Grayson <pete@jpgrayson.net>
* | Merge pull request #861 from ↵Timothy Edmund Crosley2019-03-021-1/+2
|\ \ | | | | | | | | | | | | blueyed/fix-test_inconsistent_behavior_in_python_2_and_3_issue_479 Fix test_inconsistent_behavior_in_python_2_and_3_issue_479
| * | Fix test_inconsistent_behavior_in_python_2_and_3_issue_479Daniel Hahler2019-03-011-1/+2
| |/ | | | | | | | | | | | | | | | | This also failed for me with "future" being installed. Not sure if it makes sense to keep it in the first place, since isort appears to require py34 now. Ref: https://github.com/timothycrosley/isort/issues/479#issuecomment-316235116
* | Merge pull request #863 from blueyed/fix-default_settings_pathTimothy Edmund Crosley2019-03-021-2/+3
|\ \ | | | | | | tests: fix default_settings_path
| * | tests: fix default_settings_pathDaniel Hahler2019-03-011-2/+3
| |/ | | | | | | | | | | | | Restore `chdir` after tests. This is relevant for when pytest-cov would display coverage in the end, and would use absolute paths due to this.
* | Merge pull request #860 from anderson-dan-w/allow-named-multiline-argTimothy Edmund Crosley2019-03-021-2/+2
|\ \ | | | | | | allow named multi_line_import arguments
| * | maybeDan W Anderson2019-02-281-1/+1
| | |
| * | from setting.cfg tooDan W Anderson2019-02-281-1/+1
| | |
| * | allow named multi_line_import argumentsDan W Anderson2019-02-281-1/+1
| |/
* | Merge pull request #859 from pfhayes/patch-2Timothy Edmund Crosley2019-03-021-1/+1
|\ \ | | | | | | Fix include_trailing_comma docs
| * | Fix include_trailing_comma docsPatrick Hayes2019-02-281-1/+1
| |/
* | Merge pull request #858 from Tenzer/RequirementsFinder-lru-cache-2Timothy Edmund Crosley2019-03-021-1/+11
|\ \ | | | | | | Add LRU cache to RequirementsFinder._get_names
| * | Switch RequiementsFinder._get_names back return an iteratorJeppe Fihl-Pearson2019-02-281-2/+3
| | | | | | | | | | | | | | | This is in order to satisfy mypy as the return type should be the same as the super class.
| * | Add LRU cache to RequirementsFinder._get_namesJeppe Fihl-Pearson2019-02-281-2/+12
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This caches the result of the function for future invocations with the same input, which can massively speed up future invocations if they have the same input as previous calls. In the case of this function this happens a lot, and each invocation is quite expensive as the requirements file is parsed every time. This gives a quite significant performance boost. I've tried running `isort` with and without this patch on two different applications on Python 3.7.2 and one one application the run time drops from 12.67 seconds to 1.3 seconds and on the other it drops from 28.29 seconds to 2.1 seconds. This optimisation is similiar to the one which was done for the 4.3.x branch here: https://github.com/timothycrosley/isort/pull/856.
* | Adding missing editor config file backTimothy Crosley2019-03-021-0/+20
| |
* | Fix return failureTimothy Crosley2019-03-021-9/+6
| |
* | Add back missing importTimothy Crosley2019-03-021-0/+1
| |
* | Merge in latest from masterTimothy Crosley2019-03-017-48/+86
|\ \ | |/ |/|
| * Merge pull request #868 from timothycrosley/feature/fix-windows-supportTimothy Edmund Crosley2019-03-013-38/+61
| |\ | | | | | | Feature/fix windows support
| | * Remove bare exceptTimothy Crosley2019-03-011-2/+0
| | |
| | * Fix finders testTimothy Crosley2019-03-011-5/+6
| | |
| | * Attempt to restore full windows compatiblityTimothy Crosley2019-03-012-10/+16
| | |
| | * Fix syntaxfeature/fix-windows-supportTimothy Crosley2019-02-281-1/+1
| | |
| | * Try printing fileTimothy Crosley2019-02-281-0/+4
| | |
View Lorry Controller Status