diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 87cbc92..7f6b9bb 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -24,7 +24,7 @@ jobs: pip install 'Django ${{ matrix.django-version }}' - name: Run lint checks run: | - poetry run isort -rc -c --diff + poetry run isort --profile black -c --diff . poetry run flake8 . poetry run black --check . - name: Run tests diff --git a/.isort.cfg b/.isort.cfg deleted file mode 100644 index ba2778d..0000000 --- a/.isort.cfg +++ /dev/null @@ -1,6 +0,0 @@ -[settings] -multi_line_output=3 -include_trailing_comma=True -force_grid_wrap=0 -use_parentheses=True -line_length=88 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b3ada52..9b4ab7a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -11,6 +11,6 @@ Development Tasks: * Install dependencies: `poetry install` * Run the test suite: `./run_tests.py` -* Sort imports: `isort -rc .` +* Sort imports: `isort --profile black .` * Run lint checks: `flake8 .` * Auto-format: `black .` diff --git a/poetry.lock b/poetry.lock index a408019..ad2a3fa 100644 --- a/poetry.lock +++ b/poetry.lock @@ -188,14 +188,12 @@ category = "dev" description = "A Python utility / library to sort Python imports." name = "isort" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "4.3.21" +python-versions = ">=3.6,<4.0" +version = "5.0.3" [package.extras] -pipfile = ["pipreqs", "requirementslib"] -pyproject = ["toml"] -requirements = ["pipreqs", "pip-api"] -xdg_home = ["appdirs (>=1.4.0)"] +pipfile_deprecated_finder = ["pipreqs", "requirementslib", "tomlkit (>=0.5.3)"] +requirements_deprecated_finder = ["pipreqs", "pip-api"] [[package]] category = "main" @@ -342,7 +340,7 @@ docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] testing = ["jaraco.itertools", "func-timeout"] [metadata] -content-hash = "0abaa3f68b4678c5fdb562b81c3e021dca5aaefa7ead17fdbe77a27a39e3c1f6" +content-hash = "9ebb5da014ab2fd03dc10d615cbd6b20f765351331a471c1c81349996ab29e27" python-versions = "^3.6" [metadata.files] @@ -461,8 +459,8 @@ importlib-metadata = [ {file = "importlib_metadata-1.6.0.tar.gz", hash = "sha256:34513a8a0c4962bc66d35b359558fd8a5e10cd472d37aec5f66858addef32c1e"}, ] isort = [ - {file = "isort-4.3.21-py2.py3-none-any.whl", hash = "sha256:6e811fcb295968434526407adb8796944f1988c5b65e8139058f2014cbe100fd"}, - {file = "isort-4.3.21.tar.gz", hash = "sha256:54da7e92468955c4fceacd0c86bd0ec997b0e1ee80d97f67c35a78b719dccab1"}, + {file = "isort-5.0.3-py3-none-any.whl", hash = "sha256:3fbfad425b0a08a2969c5e1821d88785c210a08656c029c28931a1620f2d0f12"}, + {file = "isort-5.0.3.tar.gz", hash = "sha256:4c48d4cd773a6226baaaa176839e6f7ff82ef7c7842f6c54374fe2b14df4024b"}, ] markdown2 = [ {file = "markdown2-2.3.9-py2.py3-none-any.whl", hash = "sha256:e6b401ec80b75e76a6b3dbb2c8ade513156fa55fa6c30b9640a1abf6184a07c8"}, diff --git a/pyproject.toml b/pyproject.toml index 714ffc5..1577454 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,7 +26,7 @@ cffi = "^1.0.0" refract = "==0.4.0" [tool.poetry.dev-dependencies] -isort = "^4.3" +isort = "^5.0" flake8 = "^3.8.3" black = { version = "==19.10b0", allow-prereleases = true, python = "^3.6" } coveralls = "^2.0.0"