-
Notifications
You must be signed in to change notification settings - Fork 674
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Monodocs sphinx build #4347
Monodocs sphinx build #4347
Changes from all commits
f29663b
972ed62
fe45f3d
b160f75
9a281b4
83db5ba
3c0af54
98b4191
9dccd8f
027797c
a29d3c6
b641337
88b734b
08b0f10
39e3fbf
f299f64
013f314
35e231f
21afc4c
a010129
7da4937
96110f2
6ea6738
cd1475e
5b884a5
f2bf93b
80539c8
921f73e
c9f9cd6
81cae57
59e6dad
7070727
f62247e
70e46ea
ebb82b4
81c5e49
7573375
80d4f5a
9cfcc6d
c538b3e
e4db528
28f36a1
cf1ed7c
4d98504
7207336
b3ee93b
0c0780e
c4b9d8b
c9c5d15
142e058
44e6728
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -28,16 +28,26 @@ jobs: | |
runs-on: ubuntu-latest | ||
steps: | ||
- name: Fetch the code | ||
uses: actions/checkout@v2 | ||
- name: Set up Python 3.8 | ||
uses: actions/setup-python@v2 | ||
uses: actions/checkout@v4 | ||
- uses: conda-incubator/setup-miniconda@v3 | ||
with: | ||
python-version: "3.8" | ||
- name: Install dependencies | ||
python-version: 3.9 | ||
mamba-version: "*" | ||
channels: conda-forge | ||
channel-priority: true | ||
activate-environment: monodocs-env | ||
environment-file: monodocs-environment.yaml | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. For a follow up, I prefer to lock this environment as well. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. gonna followup on this with a PR |
||
- shell: bash -el {0} | ||
run: | | ||
python -m pip install --upgrade pip | ||
if [ -f doc-requirements.txt ]; then pip install -r doc-requirements.txt; fi | ||
conda info | ||
conda list | ||
conda config --show-sources | ||
conda config --show | ||
printenv | sort | ||
- name: Setup Graphviz | ||
uses: ts-graphviz/setup-graphviz@v1 | ||
- name: Build the documentation | ||
shell: bash -el {0} | ||
run: make docs | ||
|
||
generate_kustomize: | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -16,4 +16,4 @@ sphinx: | |
# Optionally set the version of Python and requirements required to build your docs | ||
python: | ||
install: | ||
- requirements: doc-requirements.txt | ||
- requirements: doc-requirements.in | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think using the pinned version There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. currently this does not work, as planning on using conda here There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Currently, I do not see
Yes, In any case, I am okay with merging this as is and fixing it later if doc builds become flaky. |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,153 +1,61 @@ | ||
# | ||
# This file is autogenerated by pip-compile with Python 3.9 | ||
# This file is autogenerated by pip-compile with Python 3.10 | ||
# by the following command: | ||
# | ||
# pip-compile doc-requirements.in | ||
# pip-compile --annotation-style=line doc-requirements.in | ||
# | ||
alabaster==0.7.13 | ||
# via sphinx | ||
astroid==2.15.6 | ||
# via sphinx-autoapi | ||
babel==2.12.1 | ||
# via sphinx | ||
beautifulsoup4==4.12.2 | ||
# via | ||
# furo | ||
# sphinx-code-include | ||
certifi==2023.7.22 | ||
# via requests | ||
cfgv==3.4.0 | ||
# via pre-commit | ||
charset-normalizer==3.2.0 | ||
# via requests | ||
codespell==2.2.6 | ||
# via -r doc-requirements.in | ||
distlib==0.3.7 | ||
# via virtualenv | ||
docutils==0.17.1 | ||
# via | ||
# sphinx | ||
# sphinx-panels | ||
# sphinx-tabs | ||
filelock==3.12.4 | ||
# via virtualenv | ||
furo @ git+https://github.com/flyteorg/furo@main | ||
# via -r doc-requirements.in | ||
identify==2.5.29 | ||
# via pre-commit | ||
idna==3.4 | ||
# via requests | ||
imagesize==1.4.1 | ||
# via sphinx | ||
importlib-metadata==6.8.0 | ||
# via sphinx | ||
jinja2==3.0.3 | ||
# via | ||
# sphinx | ||
# sphinx-autoapi | ||
# sphinx-tabs | ||
lazy-object-proxy==1.9.0 | ||
# via astroid | ||
markupsafe==2.1.3 | ||
# via jinja2 | ||
nodeenv==1.8.0 | ||
# via pre-commit | ||
packaging==23.1 | ||
# via sphinx | ||
platformdirs==3.10.0 | ||
# via virtualenv | ||
pre-commit==3.4.0 | ||
# via sphinx-tags | ||
pygments==2.16.1 | ||
# via | ||
# furo | ||
# sphinx | ||
# sphinx-prompt | ||
# sphinx-tabs | ||
pyyaml==6.0.1 | ||
# via | ||
# pre-commit | ||
# sphinx-autoapi | ||
requests==2.31.0 | ||
# via | ||
# sphinx | ||
# sphinxcontrib-youtube | ||
six==1.16.0 | ||
# via | ||
# sphinx-code-include | ||
# sphinxext-remoteliteralinclude | ||
snowballstemmer==2.2.0 | ||
# via sphinx | ||
soupsieve==2.5 | ||
# via beautifulsoup4 | ||
sphinx==4.5.0 | ||
# via | ||
# -r doc-requirements.in | ||
# furo | ||
# sphinx-autoapi | ||
# sphinx-basic-ng | ||
# sphinx-code-include | ||
# sphinx-copybutton | ||
# sphinx-fontawesome | ||
# sphinx-issues | ||
# sphinx-panels | ||
# sphinx-prompt | ||
# sphinx-tabs | ||
# sphinx-tags | ||
# sphinxcontrib-video | ||
# sphinxcontrib-youtube | ||
sphinx-autoapi==2.0.1 | ||
# via -r doc-requirements.in | ||
sphinx-basic-ng==1.0.0b2 | ||
# via furo | ||
sphinx-code-include==1.1.1 | ||
# via -r doc-requirements.in | ||
sphinx-copybutton==0.5.2 | ||
# via -r doc-requirements.in | ||
sphinx-fontawesome==0.0.6 | ||
# via -r doc-requirements.in | ||
sphinx-issues==3.0.1 | ||
# via -r doc-requirements.in | ||
sphinx-panels==0.6.0 | ||
# via -r doc-requirements.in | ||
sphinx-prompt==1.5.0 | ||
# via -r doc-requirements.in | ||
sphinx-tabs==3.4.0 | ||
# via -r doc-requirements.in | ||
sphinx-tags==0.2.1 | ||
# via -r doc-requirements.in | ||
sphinxcontrib-applehelp==1.0.4 | ||
# via sphinx | ||
sphinxcontrib-devhelp==1.0.2 | ||
# via sphinx | ||
sphinxcontrib-htmlhelp==2.0.1 | ||
# via sphinx | ||
sphinxcontrib-jsmath==1.0.1 | ||
# via sphinx | ||
sphinxcontrib-mermaid==0.9.2 | ||
# via -r doc-requirements.in | ||
sphinxcontrib-qthelp==1.0.3 | ||
# via sphinx | ||
sphinxcontrib-serializinghtml==1.1.5 | ||
# via sphinx | ||
sphinxcontrib-video==0.2.0 | ||
# via -r doc-requirements.in | ||
sphinxcontrib-youtube==1.2.0 | ||
# via -r doc-requirements.in | ||
sphinxext-remoteliteralinclude==0.4.0 | ||
# via -r doc-requirements.in | ||
typing-extensions==4.8.0 | ||
# via astroid | ||
unidecode==1.3.6 | ||
# via sphinx-autoapi | ||
urllib3==2.0.6 | ||
# via requests | ||
virtualenv==20.24.5 | ||
# via pre-commit | ||
wrapt==1.15.0 | ||
# via astroid | ||
zipp==3.17.0 | ||
# via importlib-metadata | ||
alabaster==0.7.13 # via sphinx | ||
astroid==3.0.1 # via sphinx-autoapi | ||
babel==2.13.1 # via sphinx | ||
beautifulsoup4==4.12.2 # via furo, sphinx-code-include | ||
certifi==2023.11.17 # via requests | ||
cfgv==3.4.0 # via pre-commit | ||
charset-normalizer==3.3.2 # via requests | ||
codespell==2.2.6 # via -r doc-requirements.in | ||
distlib==0.3.7 # via virtualenv | ||
docutils==0.17.1 # via sphinx, sphinx-panels, sphinx-tabs | ||
filelock==3.13.1 # via virtualenv | ||
furo @ git+https://github.com/flyteorg/furo@main # via -r doc-requirements.in | ||
identify==2.5.32 # via pre-commit | ||
idna==3.6 # via requests | ||
imagesize==1.4.1 # via sphinx | ||
jinja2==3.0.3 # via sphinx, sphinx-autoapi, sphinx-tabs | ||
markupsafe==2.1.3 # via jinja2 | ||
nodeenv==1.8.0 # via pre-commit | ||
packaging==23.2 # via sphinx | ||
platformdirs==4.1.0 # via virtualenv | ||
pre-commit==3.5.0 # via sphinx-tags | ||
pygments==2.17.2 # via furo, sphinx, sphinx-prompt, sphinx-tabs | ||
pyyaml==6.0.1 # via pre-commit, sphinx-autoapi | ||
requests==2.31.0 # via sphinx, sphinxcontrib-youtube | ||
six==1.16.0 # via sphinx-code-include, sphinxext-remoteliteralinclude | ||
snowballstemmer==2.2.0 # via sphinx | ||
soupsieve==2.5 # via beautifulsoup4 | ||
sphinx==4.5.0 # via -r doc-requirements.in, furo, sphinx-autoapi, sphinx-basic-ng, sphinx-code-include, sphinx-copybutton, sphinx-fontawesome, sphinx-issues, sphinx-panels, sphinx-prompt, sphinx-tabs, sphinx-tags, sphinxcontrib-video, sphinxcontrib-youtube, sphinxext-remoteliteralinclude | ||
sphinx-autoapi==2.0.1 # via -r doc-requirements.in | ||
sphinx-basic-ng==1.0.0b2 # via furo | ||
sphinx-code-include==1.1.1 # via -r doc-requirements.in | ||
sphinx-copybutton==0.5.2 # via -r doc-requirements.in | ||
sphinx-fontawesome==0.0.6 # via -r doc-requirements.in | ||
sphinx-issues==3.0.1 # via -r doc-requirements.in | ||
sphinx-panels==0.6.0 # via -r doc-requirements.in | ||
sphinx-prompt==1.5.0 # via -r doc-requirements.in | ||
sphinx-tabs==3.4.0 # via -r doc-requirements.in | ||
sphinx-tags==0.2.1 # via -r doc-requirements.in | ||
sphinxcontrib-applehelp==1.0.4 # via sphinx | ||
sphinxcontrib-devhelp==1.0.2 # via sphinx | ||
sphinxcontrib-htmlhelp==2.0.1 # via sphinx | ||
sphinxcontrib-jsmath==1.0.1 # via sphinx | ||
sphinxcontrib-mermaid==0.9.2 # via -r doc-requirements.in | ||
sphinxcontrib-qthelp==1.0.3 # via sphinx | ||
sphinxcontrib-serializinghtml==1.1.5 # via sphinx | ||
sphinxcontrib-video==0.2.0 # via -r doc-requirements.in | ||
sphinxcontrib-youtube==1.2.0 # via -r doc-requirements.in | ||
sphinxext-remoteliteralinclude==0.4.0 # via -r doc-requirements.in | ||
typing-extensions==4.8.0 # via astroid | ||
unidecode==1.3.7 # via sphinx-autoapi | ||
urllib3==2.1.0 # via requests | ||
virtualenv==20.25.0 # via pre-commit | ||
|
||
# The following packages are considered to be unsafe in a requirements file: | ||
# setuptools |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
# .readthedocs.yml | ||
cosmicBboy marked this conversation as resolved.
Show resolved
Hide resolved
|
||
# Read the Docs configuration file | ||
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details | ||
|
||
# Required | ||
version: 2 | ||
build: | ||
os: "ubuntu-22.04" | ||
tools: | ||
python: "mambaforge-22.9" | ||
|
||
# Build documentation in the docs/ directory with Sphinx | ||
sphinx: | ||
configuration: docs/conf.py | ||
|
||
conda: | ||
environment: monodocs-environment.yaml |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
# Minimal makefile for Sphinx documentation | ||
# | ||
|
||
# You can set these variables from the command line. | ||
SPHINXOPTS = | ||
SPHINXBUILD = sphinx-build | ||
SPHINXPROJ = flyte | ||
SOURCEDIR = . | ||
BUILDDIR = _build | ||
|
||
# Put it first so that "make" without argument is like "make help". | ||
help: | ||
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) | ||
|
||
.PHONY: help Makefile | ||
|
||
# Catch-all target: route all unknown targets to Sphinx using the new | ||
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS). | ||
%: Makefile | ||
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) | ||
|
||
clean: | ||
rm -rf _build _src api flytectl flytekit flytesnacks protos examples |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nit: The python version is already in
monodocs-environment.yaml
. Including it here will "override" the version in the environment yaml, so I think it's better to leave it out here: