Merge docs-requirements.txt into pyproject.toml

Keep requirements definitions all in one place.

.readthedocs.yaml

@@ -12,4 +12,5 @@ python:
   install:
     - method: pip
       path: .
-    - requirements: docs-requirements.txt
+      extra_requirements:
+        - docs

Makefile

@@ -49,8 +49,8 @@ release-deb:
 
 install-dev:
 	pip install -U pip setuptools wheel
-	pip install -e '.[test]'
+	pip install -e '.[test,docs]'
-	pip install -U -r docs-requirements.txt pre-commit
+	pip install -U pre-commit
 	set -xe && if [ "$(REQUIREMENTS)" = "minimal" ]; then \
 		pip install pyproject-dependencies && \
 		pip install -U --force-reinstall $$(pyproject-dependencies . | sed 's/>/=/'); \

docs-requirements.txt

@@ -1,4 +0,0 @@
-# This file is used by readthedocs.org
-sphinx != 1.4.7
-sphinx_rtd_theme
-setuptools_scm

docs/packaging.rst

@@ -74,10 +74,11 @@ Using Sphinx_ you can generate the documentation you're reading right now in a
 variety of formats, such as HTML, PDF, or even as a manpage. That said, I only
 take care of the HTML docs' formatting.
 
-You can find a list of dependencies in ``docs-requirements.txt``. Again, you
+You can find a list of dependencies in ``pyproject.toml``, in the
-can install those using pip with::
+``project.optional-dependencies`` section as ``docs``. Again, you can install
+those using pip with::
 
-    pip install -r docs-requirements.txt
+    pip install '.[docs]'
 
 Then change into the ``docs/`` directory and build whatever format you want
 using the ``Makefile`` in there (run ``make`` for the formats you can build).

pyproject.toml

@@ -53,6 +53,11 @@ test = [
   "pytest-asyncio",
   "aioresponses",
 ]
+docs = [
+  "sphinx!=1.4.7",
+  "sphinx_rtd_theme",
+  "setuptools_scm",
+]
 
 [project.scripts]
 vdirsyncer = "vdirsyncer.cli:app"