Skip to content

Commit 9bd3a50

Browse files
authored
Merge pull request #218 from ipums/docs-cleanup
Clean up Sphinx docs workflow
2 parents 660da27 + 20f8229 commit 9bd3a50

Some content is hidden

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

60 files changed

+11
-26626
lines changed

doc/developer.md

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,21 @@ Then move the built Scala jar over to the hlink directory with `mv target/scala-
4040
## Working with the Sphinx Docs
4141

4242
We use Sphinx to generate the hlink documentation at [hlink.docs.ipums.org](hlink.docs.ipums.org).
43-
These docs live in the `sphinx-docs` directory as Markdown files, and Sphinx converts them to html
44-
files that live in the `docs` directory. To write out the Sphinx docs to the `docs` folder, run
43+
These docs live in the `sphinx-docs` directory as Markdown files, and a GitHub Actions
44+
workflow automatically builds them with Sphinx on pushes to main. To manually generate
45+
a local copy of the HTML documentation, run
4546

4647
```
4748
cd sphinx-docs
48-
make
49+
make html
4950
```
5051

51-
To test out your changes without having to push to the official site, Python's `http.server` module
52-
works nicely.
52+
This will output the documentation to the \_build/html/ subdirectory of
53+
sphinx-docs/ by default. To test out your changes without having to push to the
54+
official site, Python's `http.server` module works nicely.
5355

5456
```
55-
python -m http.server -d docs <port>
57+
python -m http.server -d _build/html <port>
5658
```
5759

5860
starts up an HTTP server running on port `<port>` on the local machine.
@@ -78,7 +80,7 @@ Here are the steps to follow when creating the new version.
7880
- Decide on the new version number A.B.C, following the scheme above.
7981
- Set the new version number in `pyproject.toml`.
8082
- Reinstall hlink with `pip install -e .[dev]` to update the version. Confirm that this worked by running `hlink --version`.
81-
- Update sphinx-docs/changelog.md with the new version number, then regenerate the Sphinx docs so that they show the correct hlink version number.
83+
- Update sphinx-docs/changelog.md with the new version number and make sure that it is up to date.
8284
- After committing your changes, create a git tag `vA.B.C` and push it to GitHub.
8385
- Finally, create a GitHub release for the tag. This is intended for record-keeping
8486
for developers, so it's fine to automatically generate the release notes. The user-

docs/.buildinfo

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

docs/.buildinfo.bak

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

docs/.nojekyll

Whitespace-only changes.

docs/CNAME

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)