Use isort 5

giacomd · Jul 6, 2020 · 2d35606 · 2d35606
1 parent 30be7ba
commit 2d35606
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/.isort.cfg b/.isort.cfg
@@ -5,6 +5,5 @@ force_grid_wrap=0
 use_parentheses=True
 line_length=88
 lines_after_imports=2
-not_skip=__init__.py
 skip=newdle/client/node_modules
 known_third_party=exchangelib
diff --git a/Makefile b/Makefile
@@ -107,7 +107,7 @@ newdb:
 	@${FLASK} db migrate -m 'Create initial tables' --rev-id 000000000000
 	@sed -i -e '/^Revises: $$/d' newdle/migrations/versions/????????_????_000000000000_create_initial_tables.py
 	@sed -i -e '/^    # ### /d' newdle/migrations/versions/????????_????_000000000000_create_initial_tables.py
-	@${VENV}/bin/isort --recursive newdle/migrations/versions/
+	@${VENV}/bin/isort newdle/migrations/versions/
 	@${VENV}/bin/black newdle/migrations/versions/
 	@git add newdle/migrations/versions/????????_????_000000000000_create_initial_tables.py
 	@${FLASK} db upgrade head

diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "scripts": {
     "prettier": "prettier --write 'newdle/client/src/**/*.{js,jsx,json,scss,css}'",
     "prettier:check": "prettier --check 'newdle/client/src/**/*.{js,jsx,json,scss,css}'",
-    "isort": "isort --recursive setup.py conftest.py newdle/ tests/",
+    "isort": "isort setup.py conftest.py newdle/ tests/",
     "isort:check": "npm run isort -- --diff --check-only",
     "black": "black setup.py conftest.py newdle/ tests/",
     "black:check": "npm run black -- --diff --check",

diff --git a/requirements.dev.txt b/requirements.dev.txt
@@ -2,7 +2,7 @@ black
 flake8
 flask-shell-ipython
 ipython
-isort
+isort>=5.0.3
 pycodestyle
 pytest
 pytest-cov