From 5ab50deb4c784e8c07e8600a4a95aafb3b146f75 Mon Sep 17 00:00:00 2001 From: Daniel Schadt Date: Fri, 9 Dec 2022 21:07:20 +0100 Subject: fix tox and poetry interaction The Poetry FAQ[1] gives some options on how tox and poetry can be used together, since both of them want to do the virtual env managing. Since we mostly want to use tox as a venv manager and to easily run multiple linters, and we want to have poetry do the dependency management, the method of explicitely using `poetry install` seems to be the most reasonable. This means we don't have to generate a requirements.txt file or make duplicated listings of our dependencies in tox.ini. [1]: https://python-poetry.org/docs/master/faq/#is-tox-supported --- pyproject.toml | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) (limited to 'pyproject.toml') diff --git a/pyproject.toml b/pyproject.toml index 6f178fa..067631f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,7 +24,7 @@ repository = "https://gitlab.com/dunj3/fietsboek" keywords = ["web", "gpx"] [tool.poetry.dependencies] -python = "^3.7" +python = "^3.7.2" pyramid = "^2" pyramid_jinja2 = "^2.10" @@ -51,9 +51,6 @@ bleach = "^5" Click = "^8.1" requests = "^2.28.1" -WebTest = {version = "^3", optional = true} -pytest = {version = "^7.2", optional = true} -pytest-cov = {version = "*", optional = true} pydantic = "^1.10.2" termcolor = "^2.1.1" @@ -63,8 +60,31 @@ optional = true [tool.poetry.group.docs.dependencies] Sphinx = "^5.3" -[tool.poetry.extras] -testing = ["WebTest", "pytest", "pytest-cov"] +[tool.poetry.group.testing] +optional = true + +[tool.poetry.group.testing.dependencies] +pytest = "^7.2.0" +webtest = "^3.0.0" +pytest-cov = "^4.0.0" + +[tool.poetry.group.linters] +optional = true + +[tool.poetry.group.linters.dependencies] +pylint = "^2.15.8" +black = "^22.12.0" + +[tool.poetry.group.types] +optional = true + +[tool.poetry.group.types.dependencies] +mypy = "^0.991" +types-markdown = "^3.4.2.1" +types-requests = "^2.28.11.5" +types-bleach = "^5.0.3.1" +types-babel = "^2.11.0.7" +types-redis = "^4.3.21.6" [tool.poetry.scripts] fietsctl = "fietsboek.scripts.fietsctl:main" -- cgit v1.2.3