From 230855f4bd319383d55b6e51a152f79d3d99c04c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 6 Jul 2020 06:52:18 +0000
Subject: [PATCH 1/2] Bump isort from 4.3.21 to 5.0.3

Bumps [isort](https://github.com/timothycrosley/isort) from 4.3.21 to 5.0.3.
- [Release notes](https://github.com/timothycrosley/isort/releases)
- [Changelog](https://github.com/timothycrosley/isort/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/timothycrosley/isort/compare/4.3.21...5.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 poetry.lock    | 16 +++++++---------
 pyproject.toml |  2 +-
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 1613818..4c2b95a 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -156,14 +156,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 = "dev"
@@ -315,7 +313,7 @@ docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"]
 testing = ["jaraco.itertools", "func-timeout"]
 
 [metadata]
-content-hash = "763498fc3e8d626147cf2552b57becbbc2d26b3cdaf624bdcc49ae496dffcbbc"
+content-hash = "dc118b6a81f28c42cb01abe7ccdab083e45dd9bb33dee0b425840644a3c60c2c"
 python-versions = "^3.6"
 
 [metadata.files]
@@ -399,8 +397,8 @@ importlib-metadata = [
     {file = "importlib_metadata-1.6.1.tar.gz", hash = "sha256:0505dd08068cfec00f53a74a0ad927676d7757da81b7436a6eefe4c7cf75c545"},
 ]
 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"},
 ]
 mccabe = [
     {file = "mccabe-0.6.1-py2.py3-none-any.whl", hash = "sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42"},
diff --git a/pyproject.toml b/pyproject.toml
index dbae553..86a3d5d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -15,7 +15,7 @@ Shapely = "^1.6.4"
 pyshp = "^2.1.0"
 
 [tool.poetry.dev-dependencies]
-isort = "^4.3"
+isort = "^5.0"
 flake8 = "^3.8.3"
 black = { version = "==19.10b0", allow-prereleases = true }
 coveralls = "^2.0.0"

From 56b4252df3d73adba3c3201dcbbe263293fde309 Mon Sep 17 00:00:00 2001
From: chris48s <chris.shaw480@gmail.com>
Date: Mon, 6 Jul 2020 21:15:59 +0100
Subject: [PATCH 2/2] update isort config

---
 .isort.cfg      | 6 ------
 .travis.yml     | 2 +-
 CONTRIBUTING.md | 2 +-
 3 files changed, 2 insertions(+), 8 deletions(-)
 delete mode 100644 .isort.cfg

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/.travis.yml b/.travis.yml
index f7dd746..cf01ece 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ install:
   - poetry install
 script:
   - coverage run --source=geometry_to_spatialite ./run_tests.py
-  - isort -rc -c --diff .
+  - isort --profile black -c --diff .
   - flake8 .
   - black --check .
   - poetry build
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1796b1f..c96571f 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 .`