Merge pull request #2027 from PyCQA/prepare-release-6.0.0b2

Prepare release
PyCQA · Dec 12, 2022 · 9e5f8f0 · 9e5f8f0
2 parents a52a2c1 + 54b089f
commit 9e5f8f0
Show file tree

Hide file tree

Showing 9 changed files with 926 additions and 1,426 deletions.
diff --git a/example_isort_formatting_plugin/poetry.lock b/example_isort_formatting_plugin/poetry.lock
diff --git a/example_isort_formatting_plugin/pyproject.toml b/example_isort_formatting_plugin/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "example_isort_formatting_plugin"
-version = "0.0.5"
+version = "0.1.0"
 description = "An example plugin that modifies isort formatting using black."
 authors = ["Timothy Crosley <timothy.crosley@gmail.com>"]
 license = "MIT"
@@ -9,9 +9,9 @@ license = "MIT"
 example = "example_isort_formatting_plugin:black_format_import_section"
 
 [tool.poetry.dependencies]
-python = ">=3.6.2"
-isort = "^5.1.4"
-black = ">20.08b1"
+python = ">=3.7.0"
+isort = { version = ">5.10.1", allow-prereleases = true }
+black = ">=22.6.0"
 
 [tool.poetry.dev-dependencies]
 

diff --git a/example_isort_sorting_plugin/poetry.lock b/example_isort_sorting_plugin/poetry.lock
diff --git a/example_isort_sorting_plugin/pyproject.toml b/example_isort_sorting_plugin/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "example_isort_sorting_plugin"
-version = "0.0.4"
+version = "0.1.0"
 description = "An example plugin that modifies isorts sorting order to provide an even more natural sort by utilizing natsort."
 authors = ["Timothy Crosley <timothy.crosley@gmail.com>"]
 license = "MIT"
@@ -9,7 +9,7 @@ license = "MIT"
 natural_plus = "example_isort_sorting_plugin:natural_plus"
 
 [tool.poetry.dependencies]
-python = ">=3.6"
+python = ">=3.7"
 natsort = ">=7.1.1"
 
 [tool.poetry.dev-dependencies]

diff --git a/example_shared_isort_profile/pyproject.toml b/example_shared_isort_profile/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "example_shared_isort_profile"
-version = "0.0.2"
+version = "0.1.0"
 description = "An example shared isort profile"
 authors = ["Timothy Crosley <timothy.crosley@gmail.com>"]
 license = "MIT"
@@ -9,7 +9,7 @@ license = "MIT"
 example = "example_shared_isort_profile:PROFILE"
 
 [tool.poetry.dependencies]
-python = ">=3.6"
+python = ">=3.7"
 
 [tool.poetry.dev-dependencies]
 

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -3,7 +3,7 @@ line-length = 100
 
 [tool.poetry]
 name = "isort"
-version = "5.10.1"
+version = "6.0.0b2"
 description = "A Python utility / library to sort Python imports."
 authors = ["Timothy Crosley <timothy.crosley@gmail.com>"]
 license = "MIT"
@@ -39,7 +39,7 @@ include = [
 ]
 
 [tool.poetry.dependencies]
-python = ">=3.7.0,<4.0"
+python = ">=3.7.0"
 pipreqs = {version = "*", optional = true}
 requirementslib = {version = "*", optional = true}
 pip-api = {version = "*", optional = true}
@@ -54,19 +54,22 @@ plugins = ["setuptools"]
 
 [tool.poetry.dev-dependencies]
 bandit = "^1.6"
-flake8-bugbear = "^19.8"
 black = ">=22.6.0"
 coverage = {version = ">=6.5.0", extras = ["toml"]}
-mypy = "^0.902"
+#cruft = { version = "^2.2" }
+example-isort-formatting-plugin = ">=0.1.0"
+example-isort-sorting-plugin = ">=0.1.0"
+example-shared-isort-profile = ">=0.1.0"
+flake8 = "^3.8.4"
+flake8-bugbear = "^19.8"
+hypothesmith = "^0.1.3"
+#hypothesis-auto = { version = "^1.0.0" }
 ipython = "^7.16"
+mypy = "^0.902"
 pytest = "^6.0"
 pytest-mock = "^1.10"
 pep8-naming = "^0.8.2"
-hypothesis-auto = { version = "^1.0.0" }
-hypothesmith = "^0.1.3"
-examples = { version = "^1.0.0" }
-cruft = { version = "^2.2" }
-portray = { version = "^1.6.0" }
+#portray = { version = ">=1.7.0" }
 mkdocs = { version = "1.2.1" }
 pipfile = "^0.0.2"
 requirementslib = "^1.5"
@@ -80,10 +83,6 @@ safety = "^2.2.0"
 smmap2 = "^3.0.1"
 gitdb2 = "^4.0.2"
 httpx = "^0.13.3"
-example_shared_isort_profile = "^0.0.1"
-example_isort_formatting_plugin = "^0.0.4"
-example_isort_sorting_plugin = "^0.0.3"
-flake8 = "^3.8.4"
 hypothesis = "^6.10.1"
 libcst = "^0.3.18"
 mypy-extensions = "^0.4.3"
@@ -120,7 +119,7 @@ requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.mypy]
-python_version = 3.6
+python_version = 3.7
 strict = true
 follow_imports = "silent"
 exclude = "isort/_vendored|tests/unit/example_projects|tests/unit/example_crlf_file.py"

diff --git a/scripts/lint.sh b/scripts/lint.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -euxo pipefail
 
-poetry run cruft check
+#poetry run cruft check
 poetry run mypy -p isort -p tests
 poetry run black --target-version py37 --check .
 poetry run isort --profile hug --check --diff isort/ tests/

diff --git a/tests/unit/profiles/test_black.py b/tests/unit/profiles/test_black.py
@@ -10,7 +10,7 @@ def black_format(code: str, is_pyi: bool = False, line_length: int = 88) -> str:
         return black.format_file_contents(
             code,
             fast=True,
-            mode=black.FileMode(  # type: ignore
+            mode=black.FileMode(
                 is_pyi=is_pyi,
                 line_length=line_length,
             ),