Skip to content

Commit d95b3f5

Browse files
committed
Refactor the documentation dependencies setup
Signed-off-by: tdruez <[email protected]>
1 parent b91127d commit d95b3f5

15 files changed

+15
-372
lines changed

Makefile

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,14 @@ envfile_dev: envfile
5858
@echo "-> Update the .env file for development"
5959
@echo DATABASE_PASSWORD=\"dejacode\" >> ${ENV_FILE}
6060

61+
doc_dependencies: virtualenv
62+
@echo "-> Configure and install decumentation dependencies"
63+
@${ACTIVATE} pip install --editable .[docs]
64+
6165
doc8:
62-
@echo "-> Run doc8 validation"
63-
@${ACTIVATE} doc8 --max-line-length 100 --ignore-path docs/_build/ \
64-
--ignore-path docs/installation_and_sysadmin/ \
65-
--quiet docs/
66+
@echo "-> Run documentation .rst validation"
67+
@$(MAKE) doc_dependencies > /dev/null 2>&1
68+
@${ACTIVATE} doc8 --max-line-length 100 --ignore-path docs/_build/ --quiet docs/
6669

6770
valid:
6871
@echo "-> Run Ruff format"
@@ -146,9 +149,9 @@ test:
146149
${MANAGE} test --noinput --parallel auto
147150

148151
docs:
149-
@echo "-> Builds the installation_and_sysadmin docs"
152+
@echo "-> Builds the documentation"
150153
rm -rf ${DOCS_LOCATION}/_build/
151-
@${ACTIVATE} pip install -r docs/requirements.txt
154+
@$(MAKE) doc_dependencies > /dev/null 2>&1
152155
@${ACTIVATE} sphinx-build -b singlehtml ${DOCS_LOCATION} ${DOCS_LOCATION}/_build/singlehtml/
153156
@${ACTIVATE} sphinx-build -b html ${DOCS_LOCATION} ${DOCS_LOCATION}/_build/html/
154157

@@ -172,4 +175,4 @@ log:
172175
createsuperuser:
173176
${DOCKER_EXEC} web ./manage.py createsuperuser
174177

175-
.PHONY: virtualenv conf dev envfile envfile_dev check doc8 valid check-deploy clean initdb postgresdb postgresdb_clean migrate upgrade run test docs build psql bash shell log createsuperuser
178+
.PHONY: virtualenv conf dev envfile envfile_dev doc_dependencies check doc8 valid check-deploy clean initdb postgresdb postgresdb_clean migrate upgrade run test docs build psql bash shell log createsuperuser

docs/requirements.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

pyproject.toml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -169,16 +169,14 @@ dependencies = [
169169
dev = [
170170
# Linter and Validation
171171
"ruff==0.14.0",
172-
# Documentation
173-
"doc8==1.1.2",
174-
"stevedore==5.4.1",
175-
"Pygments==2.19.2",
176-
"docutils==0.21.2",
177-
"restructuredtext-lint==1.4.0",
178-
"pbr==6.1.1",
179172
# Parallel testing
180173
"tblib==3.1.0"
181174
]
175+
docs = [
176+
"Sphinx==7.2.6",
177+
"furo==2023.9.10",
178+
"doc8==1.1.2",
179+
]
182180

183181
[project.urls]
184182
Homepage = "https://github.com/aboutcode-org/dejacode"
-25.2 KB
Binary file not shown.

thirdparty/dist/doc8-1.1.2-py3-none-any.whl.ABOUT

Lines changed: 0 additions & 15 deletions
This file was deleted.
-574 KB
Binary file not shown.

thirdparty/dist/docutils-0.21.2-py3-none-any.whl.ABOUT

Lines changed: 0 additions & 25 deletions
This file was deleted.
-106 KB
Binary file not shown.

thirdparty/dist/pbr-6.1.1-py2.py3-none-any.whl.ABOUT

Lines changed: 0 additions & 18 deletions
This file was deleted.
-1.17 MB
Binary file not shown.

0 commit comments

Comments
 (0)