Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/timothycrosley/isort into…
Browse files Browse the repository at this point in the history
… issue/1556/remove-uneeded-new-line
  • Loading branch information
timothycrosley committed Oct 13, 2020
2 parents 49bb9ba + 491b346 commit 54187d0
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 6 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@ Changelog
NOTE: isort follows the [semver](https://semver.org/) versioning standard.
Find out more about isort's release policy [here](https://pycqa.github.io/isort/docs/major_releases/release_policy/).

### 5.6.3 October TBD, 2020
### 5.6.4 October TBD, 2020
- Fixed #1556: Empty line added between imports that should be skipped.

### 5.6.3 October 11, 2020
- Improved packaging of test files alongside source distribution (see: https://github.com/PyCQA/isort/pull/1555).

### 5.6.2 October 10, 2020
- Fixed #1548: On rare occasions an unecessary empty line can be added when an import is marked as skipped.
- Fixed #1542: Bug in VERTICAL_PREFIX_FROM_MODULE_IMPORT wrap mode.
Expand Down
1 change: 1 addition & 0 deletions docs/contributing/4.-acknowledgements.md
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ Code Contributors
- Andrew Howe (@howeaj)
- Sang-Heon Jeon (@lntuition)
- Denis Veselov (@saippuakauppias)
- James Curtin (@jamescurtin)

Documenters
===================
Expand Down
2 changes: 1 addition & 1 deletion isort/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "5.6.2"
__version__ = "5.6.3"
10 changes: 6 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ line-length = 100

[tool.poetry]
name = "isort"
version = "5.6.2"
version = "5.6.3"
description = "A Python utility / library to sort Python imports."
authors = ["Timothy Crosley <timothy.crosley@gmail.com>"]
license = "MIT"
Expand Down Expand Up @@ -33,7 +33,9 @@ classifiers = [
urls = { Changelog = "https://github.com/pycqa/isort/blob/master/CHANGELOG.md" }
packages = [
{ include = "isort" },
{ include = "tests", format = "sdist" },
]
include = [
{ path = "tests", format = "sdist" },
]

[tool.poetry.dependencies]
Expand Down Expand Up @@ -99,5 +101,5 @@ logo = "art/logo.png"
palette = {scheme = "isort"}

[build-system]
requires = ["poetry>=0.12"]
build-backend = "poetry.masonry.api"
requires = ["poetry-core>=1.0.0"]
build-backend = "poetry.core.masonry.api"

0 comments on commit 54187d0

Please sign in to comment.