fix: isort added as dependency (#57)

marcosschroh · Sep 3, 2020 · e56d234 · e56d234
1 parent 24fa2fd
commit e56d234
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 6 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -11,6 +11,6 @@ mypy
 
 # Testing
 # ------------------------------------------------------------------------------
-pytest==5.4.2
+pytest
 pytest_cases
 pytest-cookies
diff --git a/{{cookiecutter.project_slug}}/pyproject.toml b/{{cookiecutter.project_slug}}/pyproject.toml
@@ -1,3 +1,13 @@
 [tool.black]
 line-length = 120
 target_version = ['py37']
+
+[tool.isort]
+combine_as_imports = true
+from_first = false
+include_trailing_comma = true
+length_sort = false
+multi_line_output = 3
+order_by_type = true
+line_length = 120
+force_grid_wrap = 0
diff --git a/{{cookiecutter.project_slug}}/requirements/test.txt b/{{cookiecutter.project_slug}}/requirements/test.txt
@@ -4,11 +4,12 @@
 # ------------------------------------------------------------------------------
 black
 flake8
+isort
 
 # Testing
 # ------------------------------------------------------------------------------
 mypy
-pytest==5.4.2
+pytest
 pytest_cases
 pytest-cookies
-pytest-asyncio==0.11.0
+pytest-asyncio
diff --git a/{{cookiecutter.project_slug}}/scripts/lint b/{{cookiecutter.project_slug}}/scripts/lint
@@ -5,5 +5,5 @@ if [ -d 'venv' ] ; then
     export PREFIX="venv/bin/"
 fi
 
-${PREFIX}isort --multi-line=3 --trailing-comma --force-grid-wrap=0 --combine-as --line-width 120 --recursive --apply {{cookiecutter.project_slug}} tests
+${PREFIX}isort {{cookiecutter.project_slug}} tests
 ${PREFIX}black {{cookiecutter.project_slug}} tests
diff --git a/{{cookiecutter.project_slug}}/scripts/test b/{{cookiecutter.project_slug}}/scripts/test
@@ -9,5 +9,5 @@ export PYTHONPATH={{cookiecutter.project_slug}}
 export SIMPLE_SETTINGS=settings
 
 ${PREFIX}pytest ${1-"./tests"} ${2}
-${PREFIX}black {{cookiecutter.project_slug}} tests/ --check
+${PREFIX}black {{cookiecutter.project_slug}} tests/ --check --diff
 ${PREFIX}flake8 {{cookiecutter.project_slug}} tests/
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/settings.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/settings.py
@@ -20,7 +20,13 @@
         "version": 1,
         "disable_existing_loggers": False,
         "formatters": {"default": {"format": "%(asctime)s %(levelname)s %(name)s %(message)s"}},
-        "handlers": {"console": {"level": "{{cookiecutter.log_level}}", "class": "logging.StreamHandler", "formatter": "default",}},
+        "handlers": {
+            "console": {
+                "level": "{{cookiecutter.log_level}}",
+                "class": "logging.StreamHandler",
+                "formatter": "default",
+            }
+        },
         "loggers": {"page_views": {"handlers": ["console"], "level": "{{cookiecutter.log_level}}"}},
     }
 )