From 0735c714320e062a43c8bce7a202a17d95e846c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleksi=20H=C3=A4kli?= Date: Fri, 19 Dec 2025 21:54:43 +0200 Subject: [PATCH] chore: use single requirements file Multiple files seem to break some IDEs and package management solutions --- pyproject.toml | 4 ++-- requirements-qa.txt | 3 --- requirements-test.txt | 7 ------- requirements.txt | 11 +++++++++-- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index d39ebc2..c930d27 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -35,7 +35,7 @@ DJANGO = # Normal test environment runs pytest which orchestrates other tools [testenv] deps = - -r requirements-test.txt + -r requirements.txt dj42: django>=4.2,<5 dj52: django>=5.2,<6 dj60: django>=6.0,<7 @@ -52,7 +52,7 @@ ignore_errors = # QA runs type checks, linting, and code formatting checks [testenv:py312-djqa] -deps = -r requirements-qa.txt +deps = -r requirements.txt commands = mypy axes prospector diff --git a/requirements-qa.txt b/requirements-qa.txt index 41c6594..e69de29 100644 --- a/requirements-qa.txt +++ b/requirements-qa.txt @@ -1,3 +0,0 @@ -black==25.11.0 -mypy==1.19.1 -prospector==1.17.3 diff --git a/requirements-test.txt b/requirements-test.txt index 51e8f33..e69de29 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1,7 +0,0 @@ --e . -django-ipware>=3 -coverage==7.10.7 -pytest==8.4.2 -pytest-cov==6.2.1 -pytest-django==4.11.1 -pytest-subtests==0.15.0 diff --git a/requirements.txt b/requirements.txt index b268ed8..989c389 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,12 @@ -e . --r requirements-qa.txt --r requirements-test.txt +black==25.11.0 +coverage==7.10.7 +django-ipware>=3 +mypy==1.19.1 +prospector==1.17.3 +pytest-cov==6.2.1 +pytest-django==4.11.1 +pytest-subtests==0.15.0 +pytest==8.4.2 sphinx_rtd_theme==3.0.2 tox==4.30.3