Skip to content

Commit 8542e48

Browse files
authored
chore(deps): replace sphinx with mkdocs (#18977)
* chore(deps): replace sphinx with mkdocs Signed-off-by: Mike Fiedler <[email protected]>
1 parent 99f4495 commit 8542e48

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+2980
-3797
lines changed

bin/dev-docs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#!/bin/bash
22
set -ex
33

4-
make -C docs/dev/ doctest SPHINXOPTS="-W"
5-
make -C docs/dev/ html SPHINXOPTS="-W"
4+
mkdocs build -f docs/mkdocs-dev-docs.yml --strict

bin/rtd-docs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ set -e
55
set -x
66

77
if [ "${READTHEDOCS_PROJECT}" = "warehouse" ]; then
8-
if [ "$READTHEDOCS_VERSION_TYPE" = "external" ] && git diff --quiet origin/main -- docs/dev requirements/docs-dev.txt .readthedocs.yaml; then
8+
if [ "$READTHEDOCS_VERSION_TYPE" = "external" ] && git diff --quiet origin/main -- docs/dev requirements/docs-dev.txt .readthedocs.yaml docs/mkdocs-dev-docs.yml; then
99
echo "Nothing relevant changed, skipping build..."
1010
exit 183;
1111
fi
1212
pip install -r requirements/docs-dev.txt
1313
asdf reshim
14-
make -C docs/dev/ html
15-
mkdir _readthedocs && mv docs/dev/_build/html _readthedocs/html
14+
mkdocs build -f docs/mkdocs-dev-docs.yml
15+
mkdir _readthedocs && mv docs/dev-site _readthedocs/html
1616
fi
1717

1818
if [ "${READTHEDOCS_PROJECT}" = "docspypiorg" ]; then

docker-compose.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,9 +256,11 @@ services:
256256
context: .
257257
target: docs
258258
image: warehouse:docker-compose-docs
259-
command: sphinx-autobuild --host 0.0.0.0 "docs/dev/" "docs/dev/_build"
259+
command: mkdocs serve -a 0.0.0.0:8000 -f docs/mkdocs-dev-docs.yml
260+
stop_signal: SIGINT
260261
volumes:
261262
- ./bin:/opt/warehouse/src/bin:z
263+
- ./docs/mkdocs-dev-docs.yml:/opt/warehouse/src/docs/mkdocs-dev-docs.yml:z
262264
- ./docs:/opt/warehouse/src/docs:z
263265
ports:
264266
- "10002:8000"

docs/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
user-site
22
blog-site
3+
dev-site

docs/dev/Makefile

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

docs/dev/_static/css/extra.css

Lines changed: 0 additions & 1 deletion
This file was deleted.
-35.8 KB
Binary file not shown.

docs/dev/api-reference/index.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# API reference
2+
3+
!!! note
4+
All API documentation except for [XML-RPC](xml-rpc.md) has been moved to the
5+
[user documentation site](https://docs.pypi.org/api/).

docs/dev/api-reference/index.rst

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

0 commit comments

Comments
 (0)