Skip to content

Commit 9e5f8f0

Browse files
staticdevstaticdev
authored
Merge pull request #2027 from PyCQA/prepare-release-6.0.0b2
Prepare release
2 parents a52a2c1 + 54b089f commit 9e5f8f0

File tree

9 files changed

+926
-1426
lines changed

9 files changed

+926
-1426
lines changed

‎example_isort_formatting_plugin/poetry.lock

+121-184
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎example_isort_formatting_plugin/pyproject.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "example_isort_formatting_plugin"
3-
version = "0.0.5"
3+
version = "0.1.0"
44
description = "An example plugin that modifies isort formatting using black."
55
authors = ["Timothy Crosley <[email protected]>"]
66
license = "MIT"
@@ -9,9 +9,9 @@ license = "MIT"
99
example = "example_isort_formatting_plugin:black_format_import_section"
1010

1111
[tool.poetry.dependencies]
12-
python = ">=3.6.2"
13-
isort = "^5.1.4"
14-
black = ">20.08b1"
12+
python = ">=3.7.0"
13+
isort = { version = ">5.10.1", allow-prereleases = true }
14+
black = ">=22.6.0"
1515

1616
[tool.poetry.dev-dependencies]
1717

‎example_isort_sorting_plugin/poetry.lock

+10-10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎example_isort_sorting_plugin/pyproject.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "example_isort_sorting_plugin"
3-
version = "0.0.4"
3+
version = "0.1.0"
44
description = "An example plugin that modifies isorts sorting order to provide an even more natural sort by utilizing natsort."
55
authors = ["Timothy Crosley <[email protected]>"]
66
license = "MIT"
@@ -9,7 +9,7 @@ license = "MIT"
99
natural_plus = "example_isort_sorting_plugin:natural_plus"
1010

1111
[tool.poetry.dependencies]
12-
python = ">=3.6"
12+
python = ">=3.7"
1313
natsort = ">=7.1.1"
1414

1515
[tool.poetry.dev-dependencies]

‎example_shared_isort_profile/pyproject.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "example_shared_isort_profile"
3-
version = "0.0.2"
3+
version = "0.1.0"
44
description = "An example shared isort profile"
55
authors = ["Timothy Crosley <[email protected]>"]
66
license = "MIT"
@@ -9,7 +9,7 @@ license = "MIT"
99
example = "example_shared_isort_profile:PROFILE"
1010

1111
[tool.poetry.dependencies]
12-
python = ">=3.6"
12+
python = ">=3.7"
1313

1414
[tool.poetry.dev-dependencies]
1515

‎poetry.lock

+772-1,208
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pyproject.toml

+13-14
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ line-length = 100
33

44
[tool.poetry]
55
name = "isort"
6-
version = "5.10.1"
6+
version = "6.0.0b2"
77
description = "A Python utility / library to sort Python imports."
88
authors = ["Timothy Crosley <[email protected]>"]
99
license = "MIT"
@@ -39,7 +39,7 @@ include = [
3939
]
4040

4141
[tool.poetry.dependencies]
42-
python = ">=3.7.0,<4.0"
42+
python = ">=3.7.0"
4343
pipreqs = {version = "*", optional = true}
4444
requirementslib = {version = "*", optional = true}
4545
pip-api = {version = "*", optional = true}
@@ -54,19 +54,22 @@ plugins = ["setuptools"]
5454

5555
[tool.poetry.dev-dependencies]
5656
bandit = "^1.6"
57-
flake8-bugbear = "^19.8"
5857
black = ">=22.6.0"
5958
coverage = {version = ">=6.5.0", extras = ["toml"]}
60-
mypy = "^0.902"
59+
#cruft = { version = "^2.2" }
60+
example-isort-formatting-plugin = ">=0.1.0"
61+
example-isort-sorting-plugin = ">=0.1.0"
62+
example-shared-isort-profile = ">=0.1.0"
63+
flake8 = "^3.8.4"
64+
flake8-bugbear = "^19.8"
65+
hypothesmith = "^0.1.3"
66+
#hypothesis-auto = { version = "^1.0.0" }
6167
ipython = "^7.16"
68+
mypy = "^0.902"
6269
pytest = "^6.0"
6370
pytest-mock = "^1.10"
6471
pep8-naming = "^0.8.2"
65-
hypothesis-auto = { version = "^1.0.0" }
66-
hypothesmith = "^0.1.3"
67-
examples = { version = "^1.0.0" }
68-
cruft = { version = "^2.2" }
69-
portray = { version = "^1.6.0" }
72+
#portray = { version = ">=1.7.0" }
7073
mkdocs = { version = "1.2.1" }
7174
pipfile = "^0.0.2"
7275
requirementslib = "^1.5"
@@ -80,10 +83,6 @@ safety = "^2.2.0"
8083
smmap2 = "^3.0.1"
8184
gitdb2 = "^4.0.2"
8285
httpx = "^0.13.3"
83-
example_shared_isort_profile = "^0.0.1"
84-
example_isort_formatting_plugin = "^0.0.4"
85-
example_isort_sorting_plugin = "^0.0.3"
86-
flake8 = "^3.8.4"
8786
hypothesis = "^6.10.1"
8887
libcst = "^0.3.18"
8988
mypy-extensions = "^0.4.3"
@@ -120,7 +119,7 @@ requires = ["poetry-core>=1.0.0"]
120119
build-backend = "poetry.core.masonry.api"
121120

122121
[tool.mypy]
123-
python_version = 3.6
122+
python_version = 3.7
124123
strict = true
125124
follow_imports = "silent"
126125
exclude = "isort/_vendored|tests/unit/example_projects|tests/unit/example_crlf_file.py"

‎scripts/lint.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
set -euxo pipefail
33

4-
poetry run cruft check
4+
#poetry run cruft check
55
poetry run mypy -p isort -p tests
66
poetry run black --target-version py37 --check .
77
poetry run isort --profile hug --check --diff isort/ tests/

‎tests/unit/profiles/test_black.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ def black_format(code: str, is_pyi: bool = False, line_length: int = 88) -> str:
1010
return black.format_file_contents(
1111
code,
1212
fast=True,
13-
mode=black.FileMode( # type: ignore
13+
mode=black.FileMode(
1414
is_pyi=is_pyi,
1515
line_length=line_length,
1616
),

0 commit comments

Comments
 (0)