Skip to content

Commit f45ecf6

Browse files
committed
Simplify management of documentation dependencies
1 parent 72bcef2 commit f45ecf6

File tree

4 files changed

+4
-7
lines changed

4 files changed

+4
-7
lines changed

.builds/tests-pypi.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ tasks:
2020
- setup: |
2121
sudo systemctl start docker
2222
cd vdirsyncer
23-
make -e install-dev -e install-docs
23+
make -e install-dev
2424
- test: |
2525
cd vdirsyncer
2626
# Non-system python is used for packages:

Makefile

+1-5
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,6 @@ ci-test-storage:
4040
done
4141
bash $(CODECOV_PATH) -c
4242

43-
install-docs:
44-
pip install -Ur docs-requirements.txt
45-
4643
release-deb:
4744
sh scripts/release-deb.sh debian jessie
4845
sh scripts/release-deb.sh debian stretch
@@ -53,8 +50,7 @@ release-deb:
5350
install-dev:
5451
pip install -U pip setuptools wheel
5552
pip install -e .
56-
pip install -Ur test-requirements.txt
57-
pip install pre-commit
53+
pip install -Ur test-requirements.txt -r docs-requirements.txt pre-commit
5854
set -xe && if [ "$(REQUIREMENTS)" = "minimal" ]; then \
5955
pip install -U --force-reinstall $$(python setup.py --quiet minimal_requirements); \
6056
fi

docs-requirements.txt

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# This file is used by readthedocs.org
12
sphinx != 1.4.7
23
sphinx_rtd_theme
34
setuptools_scm

docs/packaging.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ take care of the HTML docs' formatting.
7676
You can find a list of dependencies in ``docs-requirements.txt``. Again, you
7777
can install those using pip with::
7878

79-
make install-docs
79+
pip install -r docs-requirements.txt
8080

8181
Then change into the ``docs/`` directory and build whatever format you want
8282
using the ``Makefile`` in there (run ``make`` for the formats you can build).

0 commit comments

Comments
 (0)