Fix pylint/isort/black version incompatability

See pylint-dev/pylint#3725 Additionally fixes the py3 intersphinx inventory url, which was throwing an error, and explicitly adds pylint to the dev requirements.
bnbalsamo · Oct 12, 2020 · efeca7a · efeca7a
1 parent dc8f26e
commit efeca7a
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/{{ cookiecutter.project_name }}/docs/conf.py b/{{ cookiecutter.project_name }}/docs/conf.py
@@ -175,4 +175,4 @@
 
 
 # Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'https://docs.python.org/': None}
+intersphinx_mapping = {'https://docs.python.org/3/': None}
diff --git a/{{ cookiecutter.project_name }}/docs/index.rst b/{{ cookiecutter.project_name }}/docs/index.rst
@@ -1,5 +1,5 @@
 .. {{cookiecutter.project_name}} documentation master file, created by
-   sphinx-quickstart on Wed Jan 10 15:24:36 2018.
+   sphinx-quickstart.
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 

diff --git a/{{ cookiecutter.project_name }}/pyproject.toml b/{{ cookiecutter.project_name }}/pyproject.toml
@@ -3,7 +3,6 @@ requires = ["setuptools>=40.6.0", "wheel"]
 build-backend = "setuptools.build_meta"
 
 [tool.isort]
-not_skip = "__init__.py"
 multi_line_output = 3
 include_trailing_comma = true
 force_grid_wrap = 0

diff --git a/{{ cookiecutter.project_name }}/requirements/requirements_dev.txt b/{{ cookiecutter.project_name }}/requirements/requirements_dev.txt
@@ -3,7 +3,8 @@
 -r requirements_tests.txt
 bump2version
 invoke
-isort[pyproject]
+isort[pyproject] >= 5.0.0
+pylint >= 2.6.0
 black
 wheel
 pep517

diff --git a/{{ cookiecutter.project_name }}/tox.ini b/{{ cookiecutter.project_name }}/tox.ini
@@ -36,8 +36,8 @@ commands =
 [testenv:pylint]
 description = Run pylint against the code
 deps =
-    isort[pyproject]
-    pylint
+    isort[pyproject] >= 5.0.0
+    pylint >= 2.6.0
 commands =
     python -m pylint {posargs:src/{{ cookiecutter.slug_name }}}
 
@@ -74,11 +74,10 @@ commands =
 
 [testenv:check_isort]
 description = Check sorting of import statements
-skip_install = true
 deps =
-    isort[pyproject]
+    isort[pyproject] >= 5.0.0
 commands =
-    python -m isort -c {posargs:--diff -rc src tests}
+    python -m isort -c {posargs:--diff src tests}
 
 [testenv:check_black]
 description = Check code formatting