diff options
| author | Timothy Crosley <timothy.crosley@gmail.com> | 2020-01-04 22:55:56 -0800 |
|---|---|---|
| committer | Timothy Crosley <timothy.crosley@gmail.com> | 2020-01-04 22:55:56 -0800 |
| commit | aaaf8ea99bd0b418e656cb75c45721e3797b18e5 (patch) | |
| tree | 9ec26f3b1b59d75c5bf381331cdfc3dc1112478a | |
| parent | 4565cdedaa186bf8902c676fa99f8a34a40f15cc (diff) | |
| parent | 35bc8f34d2f6a584f9abeeadc84933e2e66617f6 (diff) | |
| download | isort-aaaf8ea99bd0b418e656cb75c45721e3797b18e5.tar.gz | |
Merge branch 'develop' of https://github.com/timothycrosley/isort into feature/fix-issue-252
| -rw-r--r-- | .cruft.json | 2 | ||||
| -rw-r--r-- | isort/profiles.py | 1 | ||||
| -rw-r--r-- | pyproject.toml | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/.cruft.json b/.cruft.json index 37fced16..267b8fcb 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,6 +1,6 @@ { "template": "https://github.com/timothycrosley/cookiecutter-python/", - "commit": "2d559dc6413338a6ee05f4239039a88a17e7d2a9", + "commit": "5f2c774c99969c8483d7f329e38db5b1a7fc5050", "context": { "cookiecutter": { "full_name": "Timothy Crosley", diff --git a/isort/profiles.py b/isort/profiles.py index 669c8277..1210c8ef 100644 --- a/isort/profiles.py +++ b/isort/profiles.py @@ -6,6 +6,7 @@ black = { "include_trailing_comma": True, "force_grid_wrap": 0, "use_parentheses": True, + "ensure_newline_before_comments": True, } django = { "combine_as_imports": True, diff --git a/pyproject.toml b/pyproject.toml index fd6d075e..9b7ba816 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -47,7 +47,7 @@ vulture = "^1.0" bandit = "^1.6" safety = "^1.8" flake8-bugbear = "^19.8" -black = {version = "^18.3-alpha.0", allows-prereleases = true} +black = {version = "^18.3-alpha.0", allow-prereleases = true} mypy = "^0.730.0" ipython = "^7.7" pytest = "^5.0" |