Merge pull request #365 from TezRomacH:I-361

Migrate pytest config to pyproject.toml #361
TezRomacH · Aug 23, 2021 · 7641822 · 7641822
2 parents b1d4ff8 + 275d563
commit 7641822
Show file tree

Hide file tree

Showing 8 changed files with 117 additions and 132 deletions.
diff --git a/Makefile b/Makefile
@@ -35,7 +35,7 @@ formatting: codestyle
 #* Linting
 .PHONY: test
 test:
-	poetry run pytest
+	poetry run pytest -c pyproject.toml
 
 .PHONY: check-codestyle
 check-codestyle:

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -5,7 +5,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "python-package-template"
-version = "1.0.11"
+version = "1.1.0"
 description = "Cookiecutter template for Python cli/packages"
 readme = "README.md"
 authors = ["Roman Tezikov <[email protected]>"]
@@ -40,11 +40,11 @@ darglint = "^1.8.0"
 isort = {extras = ["colors"], version = "^5.9.3"}
 mypy = "^0.910"
 mypy-extensions = "^0.4.3"
-pre-commit = "^2.13.0"
+pre-commit = "^2.14.0"
 pydocstyle = "^6.1.1"
-pylint = "^2.9.6"
+pylint = "^2.10.2"
 pytest = "^6.2.4"
-pyupgrade = "^2.23.3"
+pyupgrade = "^2.24.0"
 safety = "^1.10.3"
 
 [tool.black]
@@ -84,7 +84,7 @@ color_output = true
 
 
 [tool.mypy]
-# mypy configurations: https://mypy.readthedocs.io/en/latest/config_file.html#using-a-pyproject-toml-file
+# https://mypy.readthedocs.io/en/latest/config_file.html#using-a-pyproject-toml-file
 python_version = 3.7
 pretty = true
 show_traceback = true
@@ -108,3 +108,18 @@ warn_return_any = true
 warn_unreachable = true
 warn_unused_configs = true
 warn_unused_ignores = true
+
+
+[tool.pytest.ini_options]
+# https://docs.pytest.org/en/6.2.x/customize.html#pyproject-toml
+# Directories that are not visited by pytest collector:
+norecursedirs =["{{ cookiecutter.project_name }}", "hooks", "*.egg", ".eggs", "dist", "build", "docs", ".tox", ".git", "__pycache__"]
+doctest_optionflags = ["NUMBER", "NORMALIZE_WHITESPACE", "IGNORE_EXCEPTION_DETAIL"]
+
+# Extra options:
+addopts = [
+  "--strict-markers",
+  "--tb=short",
+  "--doctest-modules",
+  "--doctest-continue-on-failure",
+]
diff --git a/requirements.txt b/requirements.txt
diff --git a/setup.cfg b/setup.cfg
@@ -1,16 +1,4 @@
 [darglint]
-# darglint configuration: https://github.com/terrencepreilly/darglint
+# https://github.com/terrencepreilly/darglint
 strictness = long
 docstring_style = google
-
-[tool:pytest]
-# Directories that are not visited by pytest collector:
-norecursedirs = "{{ cookiecutter.project_name }}" hooks *.egg .eggs dist build docs .tox .git __pycache__
-doctest_optionflags = NUMBER NORMALIZE_WHITESPACE IGNORE_EXCEPTION_DETAIL
-
-# Extra options:
-addopts =
-  --strict-markers
-  --tb=short
-  --doctest-modules
-  --doctest-continue-on-failure
diff --git a/{{ cookiecutter.project_name }}/Makefile b/{{ cookiecutter.project_name }}/Makefile
@@ -39,7 +39,7 @@ formatting: codestyle
 #* Linting
 .PHONY: test
 test:
-	poetry run pytest
+	poetry run pytest -c pyproject.toml
 
 .PHONY: check-codestyle
 check-codestyle:

diff --git a/{{ cookiecutter.project_name }}/pyproject.toml b/{{ cookiecutter.project_name }}/pyproject.toml
@@ -44,7 +44,7 @@ python = "^{{ cookiecutter.minimal_python_version }}"
 {% if cookiecutter.minimal_python_version == '3.7' -%}importlib_metadata = {version = "^4.5.0", python = "<3.8"}{%- endif -%}
 {%+ if cookiecutter.create_example_template == 'cli' %}
 typer = {extras = ["all"], version = "^0.3.2"}
-rich = "^10.6.0"
+rich = "^10.7.0"
 {% endif %}
 [tool.poetry.dev-dependencies]
 bandit = "^1.7.0"
@@ -53,11 +53,11 @@ darglint = "^1.8.0"
 isort = {extras = ["colors"], version = "^5.9.3"}
 mypy = "^0.910"
 mypy-extensions = "^0.4.3"
-pre-commit = "^2.13.0"
+pre-commit = "^2.14.0"
 pydocstyle = "^6.1.1"
-pylint = "^2.9.6"
+pylint = "^2.10.2"
 pytest = "^6.2.4"
-pyupgrade = "^2.23.3"
+pyupgrade = "^2.24.0"
 safety = "^1.10.3"
 
 [tool.black]
@@ -96,7 +96,7 @@ indent = 4
 color_output = true
 
 [tool.mypy]
-# mypy configurations: https://mypy.readthedocs.io/en/latest/config_file.html#using-a-pyproject-toml-file
+# https://mypy.readthedocs.io/en/latest/config_file.html#using-a-pyproject-toml-file
 python_version = {{ cookiecutter.minimal_python_version }}
 pretty = true
 show_traceback = true
@@ -119,4 +119,19 @@ warn_redundant_casts = true
 warn_return_any = true
 warn_unreachable = true
 warn_unused_configs = true
-warn_unused_ignores = true
+warn_unused_ignores = true
+
+
+[tool.pytest.ini_options]
+# https://docs.pytest.org/en/6.2.x/customize.html#pyproject-toml
+# Directories that are not visited by pytest collector:
+norecursedirs =["hooks", "*.egg", ".eggs", "dist", "build", "docs", ".tox", ".git", "__pycache__"]
+doctest_optionflags = ["NUMBER", "NORMALIZE_WHITESPACE", "IGNORE_EXCEPTION_DETAIL"]
+
+# Extra options:
+addopts = [
+  "--strict-markers",
+  "--tb=short",
+  "--doctest-modules",
+  "--doctest-continue-on-failure",
+]
diff --git a/{{ cookiecutter.project_name }}/setup.cfg b/{{ cookiecutter.project_name }}/setup.cfg
@@ -1,16 +1,4 @@
 [darglint]
-# darglint configuration: https://github.com/terrencepreilly/darglint
+# https://github.com/terrencepreilly/darglint
 strictness = long
 docstring_style = google
-
-[tool:pytest]
-# Directories that are not visited by pytest collector:
-norecursedirs = *.egg .eggs dist build docs .tox .git __pycache__
-doctest_optionflags = NUMBER NORMALIZE_WHITESPACE IGNORE_EXCEPTION_DETAIL
-
-# Extra options:
-addopts =
-  --strict-markers
-  --tb=short
-  --doctest-modules
-  --doctest-continue-on-failure