diff --git a/Makefile b/Makefile index 42c2431..2ab8435 100644 --- a/Makefile +++ b/Makefile @@ -49,8 +49,8 @@ release-deb: install-dev: pip install -U pip setuptools wheel - pip install -e . - pip install -Ur test-requirements.txt -r docs-requirements.txt pre-commit + pip install -e '.[test]' + pip install -U -r docs-requirements.txt pre-commit set -xe && if [ "$(REQUIREMENTS)" = "minimal" ]; then \ pip install pyproject-dependencies && \ pip install -U --force-reinstall $$(pyproject-dependencies . | sed 's/>/=/'); \ diff --git a/docs/packaging.rst b/docs/packaging.rst index 66bcd3b..301d505 100644 --- a/docs/packaging.rst +++ b/docs/packaging.rst @@ -46,8 +46,9 @@ You can install the all development dependencies with:: make install-dev You probably don't want this since it will use pip to download the -dependencies. Alternatively you can find the testing dependencies in -``test-requirements.txt``, again with lower-bound version requirements. +dependencies. Alternatively test dependencies are listed as ``test`` optional +dependencies in ``pyproject.toml``, again with lower-bound version +requirements. You also have to have vdirsyncer fully installed at this point. Merely ``cd``-ing into the tarball will not be sufficient. diff --git a/pyproject.toml b/pyproject.toml index b8b473a..6d7a0ea 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -43,6 +43,15 @@ dynamic = ["version"] [project.optional-dependencies] google = ["aiohttp-oauthlib"] +test = [ + "hypothesis>=6.72.0,<7.0.0", + "pytest", + "pytest-cov", + "pytest-httpserver", + "trustme", + "pytest-asyncio", + "aioresponses", +] [project.scripts] vdirsyncer = "vdirsyncer.cli:app" diff --git a/test-requirements.txt b/test-requirements.txt deleted file mode 100644 index be40a37..0000000 --- a/test-requirements.txt +++ /dev/null @@ -1,7 +0,0 @@ -hypothesis>=6.72.0,<7.0.0 -pytest -pytest-cov -pytest-httpserver -trustme -pytest-asyncio -aioresponses