From 4954859d686d3344623e23877934d843bbec0f73 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 17 Feb 2024 12:53:41 +0100 Subject: [PATCH] chore: Prepare merge of postgrest-docs into postgrest main repo This avoids some merge conflicts to allow git blame to detect renames properly. --- .github/workflows/{ci.yaml => docs.yaml} | 14 +++++++------- .readthedocs.yaml | 2 +- .gitignore => docs/.gitignore | 2 +- README.md => docs/README.md | 0 {diagrams => docs/_diagrams}/README.md | 4 ++-- {diagrams => docs/_diagrams}/boxoffice.er | 0 {diagrams => docs/_diagrams}/db.tex | 0 {diagrams => docs/_diagrams}/employees.er | 0 {diagrams => docs/_diagrams}/film.er | 0 {diagrams => docs/_diagrams}/orders.er | 0 {diagrams => docs/_diagrams}/premieres.er | 0 {diagrams => docs/_diagrams}/presidents.er | 0 {diagrams => docs/_diagrams}/users.er | 0 build.sh => docs/build.sh | 2 +- default.nix => docs/default.nix | 11 ++++++++--- livereload_docs.py => docs/livereload_docs.py | 2 +- postgrest.dict => docs/postgrest.dict | 0 requirements.txt => docs/requirements.txt | 0 shell.nix => docs/shell.nix | 0 19 files changed, 21 insertions(+), 16 deletions(-) rename .github/workflows/{ci.yaml => docs.yaml} (80%) rename .gitignore => docs/.gitignore (80%) rename README.md => docs/README.md (100%) rename {diagrams => docs/_diagrams}/README.md (91%) rename {diagrams => docs/_diagrams}/boxoffice.er (100%) rename {diagrams => docs/_diagrams}/db.tex (100%) rename {diagrams => docs/_diagrams}/employees.er (100%) rename {diagrams => docs/_diagrams}/film.er (100%) rename {diagrams => docs/_diagrams}/orders.er (100%) rename {diagrams => docs/_diagrams}/premieres.er (100%) rename {diagrams => docs/_diagrams}/presidents.er (100%) rename {diagrams => docs/_diagrams}/users.er (100%) rename build.sh => docs/build.sh (94%) rename default.nix => docs/default.nix (83%) rename livereload_docs.py => docs/livereload_docs.py (89%) rename postgrest.dict => docs/postgrest.dict (100%) rename requirements.txt => docs/requirements.txt (100%) rename shell.nix => docs/shell.nix (100%) diff --git a/.github/workflows/ci.yaml b/.github/workflows/docs.yaml similarity index 80% rename from .github/workflows/ci.yaml rename to .github/workflows/docs.yaml index 9d7a65fd9..585de59cd 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/docs.yaml @@ -1,14 +1,14 @@ -name: CI +name: Docs on: push: branches: - main - - v* + - rel-* pull_request: branches: - main - - v* + - rel-* jobs: build: @@ -17,7 +17,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: cachix/install-nix-action@v25 - - run: nix-env -f default.nix -iA build + - run: nix-env -f docs/default.nix -iA build - run: postgrest-docs-build - run: git diff --exit-code HEAD locales || echo "Please commit changes to the locales/ folder after running postgrest-docs-build." @@ -27,7 +27,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: cachix/install-nix-action@v25 - - run: nix-env -f default.nix -iA spellcheck + - run: nix-env -f docs/default.nix -iA spellcheck - run: postgrest-docs-spellcheck dictcheck: @@ -36,7 +36,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: cachix/install-nix-action@v25 - - run: nix-env -f default.nix -iA dictcheck + - run: nix-env -f docs/default.nix -iA dictcheck - run: postgrest-docs-dictcheck linkcheck: @@ -46,6 +46,6 @@ jobs: steps: - uses: actions/checkout@v4 - uses: cachix/install-nix-action@v25 - - run: nix-env -f default.nix -iA linkcheck + - run: nix-env -f docs/default.nix -iA linkcheck - run: postgrest-docs-linkcheck diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 4690fde9d..0d7162c8f 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -3,7 +3,7 @@ sphinx: configuration: docs/conf.py python: install: - - requirements: requirements.txt + - requirements: docs/requirements.txt build: os: ubuntu-22.04 tools: diff --git a/.gitignore b/docs/.gitignore similarity index 80% rename from .gitignore rename to docs/.gitignore index bc77e3c24..b07484b5e 100644 --- a/.gitignore +++ b/docs/.gitignore @@ -2,7 +2,7 @@ _build Pipfile.lock *.aux *.log -diagrams/db.pdf +_diagrams/db.pdf misspellings unuseddict .history diff --git a/README.md b/docs/README.md similarity index 100% rename from README.md rename to docs/README.md diff --git a/diagrams/README.md b/docs/_diagrams/README.md similarity index 91% rename from diagrams/README.md rename to docs/_diagrams/README.md index fa4a1e7fe..7014ae378 100644 --- a/diagrams/README.md +++ b/docs/_diagrams/README.md @@ -5,7 +5,7 @@ The ER diagrams were created with https://github.com/BurntSushi/erd/. You can go download erd from https://github.com/BurntSushi/erd/releases and then do: ```bash -./erd_static-x86-64 -i diagrams/film.er -o docs/_static/film.png +./erd_static-x86-64 -i film.er -o ../_static/film.png ``` The fonts used belong to the GNU FreeFont family. You can download them here: http://ftp.gnu.org/gnu/freefont/ @@ -20,7 +20,7 @@ Then use this command to generate the png file. pdflatex --shell-escape -halt-on-error db.tex ## and move it to the static folder(it's not easy to do it in one go with the pdflatex) -mv db.png ../docs/_static/ +mv db.png ../_static/ ``` LaTeX is used because it's a tweakable plain text format. diff --git a/diagrams/boxoffice.er b/docs/_diagrams/boxoffice.er similarity index 100% rename from diagrams/boxoffice.er rename to docs/_diagrams/boxoffice.er diff --git a/diagrams/db.tex b/docs/_diagrams/db.tex similarity index 100% rename from diagrams/db.tex rename to docs/_diagrams/db.tex diff --git a/diagrams/employees.er b/docs/_diagrams/employees.er similarity index 100% rename from diagrams/employees.er rename to docs/_diagrams/employees.er diff --git a/diagrams/film.er b/docs/_diagrams/film.er similarity index 100% rename from diagrams/film.er rename to docs/_diagrams/film.er diff --git a/diagrams/orders.er b/docs/_diagrams/orders.er similarity index 100% rename from diagrams/orders.er rename to docs/_diagrams/orders.er diff --git a/diagrams/premieres.er b/docs/_diagrams/premieres.er similarity index 100% rename from diagrams/premieres.er rename to docs/_diagrams/premieres.er diff --git a/diagrams/presidents.er b/docs/_diagrams/presidents.er similarity index 100% rename from diagrams/presidents.er rename to docs/_diagrams/presidents.er diff --git a/diagrams/users.er b/docs/_diagrams/users.er similarity index 100% rename from diagrams/users.er rename to docs/_diagrams/users.er diff --git a/build.sh b/docs/build.sh similarity index 94% rename from build.sh rename to docs/build.sh index bbbdc9858..6b7cf9eb1 100755 --- a/build.sh +++ b/docs/build.sh @@ -5,7 +5,7 @@ set -euo pipefail export LC_ALL=${LC_ALL:-C} function build() { - sphinx-build --color -W -a -n docs -b "$@" + sphinx-build --color -W -a -n . -b "$@" } if [ $# -eq 0 ]; then diff --git a/default.nix b/docs/default.nix similarity index 83% rename from default.nix rename to docs/default.nix index 065df64cc..eef92948d 100644 --- a/default.nix +++ b/docs/default.nix @@ -33,6 +33,7 @@ rec { pkgs.writeShellScriptBin "postgrest-docs-build" '' set -euo pipefail + cd "$(${pkgs.git}/bin/git rev-parse --show-toplevel)/docs" # build.sh needs to find "sphinx-build" PATH=${python}/bin:$PATH @@ -44,6 +45,7 @@ rec { pkgs.writeShellScriptBin "postgrest-docs-serve" '' set -euo pipefail + cd "$(${pkgs.git}/bin/git rev-parse --show-toplevel)/docs" # livereload_docs.py needs to find "sphinx-build" PATH=${python}/bin:$PATH @@ -55,8 +57,9 @@ rec { pkgs.writeShellScriptBin "postgrest-docs-spellcheck" '' set -euo pipefail + cd "$(${pkgs.git}/bin/git rev-parse --show-toplevel)/docs" - FILES=$(find docs -type f -iname '*.rst' | tr '\n' ' ') + FILES=$(find . -type f -iname '*.rst' | tr '\n' ' ') cat $FILES \ | grep -v '^\(\.\.\| \)' \ @@ -72,8 +75,9 @@ rec { pkgs.writeShellScriptBin "postgrest-docs-dictcheck" '' set -euo pipefail + cd "$(${pkgs.git}/bin/git rev-parse --show-toplevel)/docs" - FILES=$(find docs -type f -iname '*.rst' | tr '\n' ' ') + FILES=$(find . -type f -iname '*.rst' | tr '\n' ' ') cat postgrest.dict \ | tail -n+2 \ @@ -88,8 +92,9 @@ rec { pkgs.writeShellScriptBin "postgrest-docs-linkcheck" '' set -euo pipefail + cd "$(${pkgs.git}/bin/git rev-parse --show-toplevel)/docs" - ${python}/bin/sphinx-build --color -b linkcheck docs _build + ${python}/bin/sphinx-build --color -b linkcheck . _build ''; check = diff --git a/livereload_docs.py b/docs/livereload_docs.py similarity index 89% rename from livereload_docs.py rename to docs/livereload_docs.py index e7ea3911c..5c46e0ac6 100755 --- a/livereload_docs.py +++ b/docs/livereload_docs.py @@ -13,6 +13,6 @@ else: call(build, shell=True) server = Server() -server.watch('docs/**/*.rst', shell(build)) +server.watch('**/*.rst', shell(build)) server.watch(f'locales/{locale}/LC_MESSAGES/*.po', shell(build)) server.serve(root=f'_build/html/{locale}') diff --git a/postgrest.dict b/docs/postgrest.dict similarity index 100% rename from postgrest.dict rename to docs/postgrest.dict diff --git a/requirements.txt b/docs/requirements.txt similarity index 100% rename from requirements.txt rename to docs/requirements.txt diff --git a/shell.nix b/docs/shell.nix similarity index 100% rename from shell.nix rename to docs/shell.nix