Skip to content

Commit

Permalink
Merge pull request #235 from simonsobs/koopman/rtd-config
Browse files Browse the repository at this point in the history
Create rtd config file, split requirements, pin versions, and
remove docs test builds from workflows.
  • Loading branch information
BrianJKoopman authored Oct 29, 2021
2 parents e7c9351 + b5e7156 commit fce3eb9
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 17 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@ jobs:
coverage report
coveralls --service=github
- name: Test documentation build
run: |
docker run --rm ocs sh -c "make -C docs/ html"
# Dockerize
- name: Build and push development docker image
env:
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/official-docker-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ jobs:
run: |
docker run -v $PWD:/coverage --rm ocs sh -c "COVERAGE_FILE=/coverage/.coverage.docker python3 -m pytest -m 'not integtest' --cov /app/ocs/ocs/ ./tests/"
- name: Test documentation build
run: |
docker run --rm ocs sh -c "make -C docs/ html"
# Dockerize
- name: Build and push official docker image
env:
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,3 @@ jobs:
coverage combine
coverage report
coveralls --service=github
- name: Test documentation build
run: |
docker run --rm ocs sh -c "make -C docs/ html"
10 changes: 10 additions & 0 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
version: 2

sphinx:
configuration: docs/conf.py

python:
version: 3.7
install:
- requirements: docs/requirements.txt
- requirements: requirements.txt
6 changes: 4 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,12 @@ be considered unstable.

Documentation
-------------
The OCS documentation can be built using sphinx once you have performed the
installation::
The OCS documentation can be built using Sphinx. There is a separate
``requirements.txt`` file in the ``docs/`` directory to install Sphinx and any
additional documentation dependencies::

$ cd docs/
$ pip3 install -r requirements.txt
$ make html

You can then open ``docs/_build/html/index.html`` in your preferred web
Expand Down
3 changes: 3 additions & 0 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
sphinx==4.2.0
sphinx_rtd_theme==1.0.0
sphinx-argparse==0.3.1
4 changes: 1 addition & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ numpy
pyserial

# Documentation generation
sphinx
sphinx-argparse
sphinx_rtd_theme
# see docs/requirements.txt

# checkdata
progress
Expand Down

0 comments on commit fce3eb9

Please sign in to comment.