From bb91fd3375df00271fe2713c0d9c6e70ad9f057c Mon Sep 17 00:00:00 2001 From: Jeff Ohrstrom Date: Tue, 26 Apr 2022 10:58:46 -0400 Subject: [PATCH] update to sphinx 2.4. (#670) This uses the image used to build documentation from which has the incompatible sphinx 2.4. We'd need to backport this commit to any release branch we update. --- .github/workflows/publish.yml | 2 +- README.md | 2 +- Rakefile | 2 +- source/customizations.rst | 16 ++++------------ 4 files changed, 7 insertions(+), 15 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0f72b7abb..3fa2383b0 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -15,7 +15,7 @@ jobs: uses: actions/checkout@v2 - name: Make Html - run: docker run --rm -v "${PWD}:/doc" -u "$(id -u):$(id -g)" ohiosupercomputer/docker-sphinx make html + run: docker run --rm -v "${PWD}:/doc" -u "$(id -u):$(id -g)" ohiosupercomputer/ood-doc-build:v2.0.0 make html - name: Publish to the test repo run: GITHUB_TOKEN=${{ secrets.OSC_WIAG_PUB_REPO_TOKEN }} /bin/bash push.sh "ood-documentation-test" diff --git a/README.md b/README.md index 82e577934..38d85e016 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ Currently all builds are generated using the built using the following command from the root of this repo: ```bash -docker run --rm -i -t -v "${PWD}:/doc" -u "$(id -u):$(id -g)" ohiosupercomputer/docker-sphinx make html +docker run --rm -i -t -v "${PWD}:/doc" -u "$(id -u):$(id -g)" ohiosupercomputer/ood-doc-build make html ``` Or use the rake task added: diff --git a/Rakefile b/Rakefile index 44bbf9e9f..8f1203b3e 100644 --- a/Rakefile +++ b/Rakefile @@ -24,7 +24,7 @@ namespace :docker do desc "Build docs using docker" task :build do - exec 'docker run --rm -i -t -v "${PWD}:/doc" -u "$(id -u):$(id -g)" ohiosupercomputer/docker-sphinx make html' + exec 'docker run --rm -i -t -v "${PWD}:/doc" -u "$(id -u):$(id -g)" ohiosupercomputer/ood-doc-build make html' end end diff --git a/source/customizations.rst b/source/customizations.rst index c40d0c855..9c2609a15 100644 --- a/source/customizations.rst +++ b/source/customizations.rst @@ -783,12 +783,8 @@ that lists all user quotas. The JSON schema for version `1` is given as: "version": 1, "timestamp": 1525361263, "quotas": [ - { - ... - }, - { - ... - } + {}, + {} ] } @@ -879,12 +875,8 @@ that lists all user balances. The JSON schema for version `1` is given as: "project_type": "project" }, "balances": [ - { - ... - }, - { - ... - } + {}, + {} ] }