Skip to content
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

Build integrated AequilibraE docs #576

Merged
merged 45 commits into from
Dec 1, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
0f4eba2
first changes
r-akemii Oct 8, 2024
1d0434c
adds sponsors
r-akemii Oct 8, 2024
cbee5a3
.
r-akemii Oct 8, 2024
c710444
update headers
r-akemii Oct 29, 2024
fcf511f
.
r-akemii Oct 29, 2024
9ef103b
Update documentation.yml
r-akemii Oct 29, 2024
1dd52e3
update landing pages
r-akemii Oct 30, 2024
f61a97c
Merge branch 'develop' into renata/build-integrated-docs
r-akemii Nov 11, 2024
12235aa
fixes latexpdf build
r-akemii Nov 18, 2024
dc1bc82
updates links and fixes indentation
r-akemii Nov 19, 2024
b5aa9f7
Update python.rst
r-akemii Nov 19, 2024
b0e58db
Banner info
r-akemii Nov 19, 2024
c4ea985
remove version switcher
r-akemii Nov 20, 2024
83a127d
Update check_documentation_versions.py
r-akemii Nov 21, 2024
935b2d8
modifies docs structure
r-akemii Nov 21, 2024
c6246d2
adds missing folders
r-akemii Nov 21, 2024
8877d74
.
r-akemii Nov 21, 2024
e5d1728
test docs upload
r-akemii Nov 21, 2024
e93d918
Update documentation.yml
r-akemii Nov 21, 2024
c7cec34
modifies workflow
r-akemii Nov 21, 2024
cc441f0
updates paths
r-akemii Nov 21, 2024
006c544
.
r-akemii Nov 21, 2024
5f87dd9
Update documentation.yml
r-akemii Nov 22, 2024
6f0caeb
update docs
r-akemii Nov 22, 2024
a150b77
Update documentation.yml
r-akemii Nov 22, 2024
aa8ff26
Update documentation.yml
r-akemii Nov 22, 2024
03efa92
Update documentation.yml
r-akemii Nov 22, 2024
13d05a0
Update documentation.yml
r-akemii Nov 22, 2024
36caa0a
Update documentation.yml
r-akemii Nov 22, 2024
145e2db
Update documentation.yml
r-akemii Nov 22, 2024
2ff72cb
Update documentation.yml
r-akemii Nov 22, 2024
e83e87b
Update documentation.yml
r-akemii Nov 22, 2024
d29a932
updates links
r-akemii Nov 22, 2024
a262f52
Update documentation.yml
r-akemii Nov 22, 2024
2d215e3
new paths
r-akemii Nov 25, 2024
57f354d
images path
r-akemii Nov 25, 2024
cdc9e89
updates image path
r-akemii Nov 25, 2024
fa667dd
undo folder creation
r-akemii Nov 26, 2024
f8189af
fix file path
r-akemii Nov 26, 2024
c35ed10
Update conf.py
r-akemii Nov 26, 2024
d8c2a9a
update paths
r-akemii Nov 26, 2024
fbcf878
adds templates
r-akemii Nov 26, 2024
f35b9e9
update cli command
r-akemii Nov 26, 2024
67c6461
test on dev
r-akemii Nov 26, 2024
df2056a
fix path to latest
r-akemii Nov 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 30 additions & 4 deletions .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_REGION: 'us-east-1' # optional: defaults to us-east-1
SOURCE_DIR: 'docs/build/html/' # optional: defaults to entire repository
DEST_DIR: 'dev/python/' # optional: defaults to entire repository
DEST_DIR: 'dev/${{ github.event.number }}/python/' # optional: defaults to entire repository

- name: Upload home page to DEV on S3
if: ${{ (github.event_name == 'pull_request') && (env.HAS_SECRETS == 'true') }}
Expand All @@ -87,32 +87,58 @@ jobs:
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_REGION: 'us-east-1' # optional: defaults to us-east-1
SOURCE_DIR: 'docs/build/html/'
DEST_DIR: 'dev/' # optional: defaults to entire repository
DEST_DIR: 'dev/${{ github.event.number }}/' # optional: defaults to entire repository

- name: Upload python to DEVELOP on S3
if: ${{ (github.ref == 'refs/heads/develop') && (github.event_name == 'push') && (env.HAS_SECRETS == 'true') }}
uses: jakejarvis/s3-sync-action@master
with:
args: --acl public-read --follow-symlinks
args: --acl public-read --follow-symlinks --delete --exclude 'home.html'
env:
AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET }}
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_REGION: 'us-east-1' # optional: defaults to us-east-1
SOURCE_DIR: 'docs/build/html/' # optional: defaults to entire repository
DEST_DIR: 'develop/python/' # optional: defaults to entire repository

- name: Upload home page to DEVELOP on S3
if: ${{ (github.ref == 'refs/heads/develop') && (github.event_name == 'push') && (env.HAS_SECRETS == 'true') }}
uses: jakejarvis/s3-sync-action@master
with:
args: --acl public-read --follow-symlinks --exclude '*' --include 'home.html' --include '_images/sponsor*' --include '_images/banner*' --include '_static/*' --include 'search*' --include 'genindex.html' --include '_sphinx_design_static/*'
env:
AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET }}
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_REGION: 'us-east-1' # optional: defaults to us-east-1
SOURCE_DIR: 'docs/build/html/'
DEST_DIR: 'develop/' # optional: defaults to entire repository

- name: Upload python to LATEST on S3
if: ${{ (github.event_name == 'release') && (env.HAS_SECRETS == 'true') }}
uses: jakejarvis/s3-sync-action@master
with:
args: --acl public-read --follow-symlinks
args: --acl public-read --follow-symlinks --delete --exclude 'home.html'
env:
AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET }}
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_REGION: 'us-east-1' # optional: defaults to us-east-1
SOURCE_DIR: 'docs/build/html/' # optional: defaults to entire repository
DEST_DIR: 'latest/python/' # optional: defaults to entire repository

- name: Upload home page to LATEST on S3
if: ${{ (github.event_name == 'release') && (env.HAS_SECRETS == 'true') }}
uses: jakejarvis/s3-sync-action@master
with:
args: --acl public-read --follow-symlinks --exclude '*' --include 'home.html' --include '_images/sponsor*' --include '_images/banner*' --include '_static/*' --include 'search*' --include 'genindex.html' --include '_sphinx_design_static/*'
env:
AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET }}
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_REGION: 'us-east-1' # optional: defaults to us-east-1
SOURCE_DIR: 'docs/build/html/'
DEST_DIR: 'latest/' # optional: defaults to entire repository

- name: Create Documentation history folder
Expand Down
12 changes: 6 additions & 6 deletions docs/source/_templates/navigation_header.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,35 +8,35 @@
<ul id="pst-nav-more-links" class="dropdown-menu" data-bs-popper="static">
<li class=" ">
<a class="nav-link dropdown-item nav-internal"
href="https://www.aequilibrae.com/dev/python/index.html">
href="https://www.aequilibrae.com/latest/python/index.html">
Main menu
</a>
</li>
<li class=" ">
<a class="nav-link dropdown-item nav-internal"
href="https://www.aequilibrae.com/dev/python/_auto_examples/index.html">
href="https://www.aequilibrae.com/latest/python/_auto_examples/index.html">
Examples
</a>
</li>
<li class=" ">
<a class="nav-link dropdown-item nav-internal"
href="https://www.aequilibrae.com/dev/python/modeling_with_aequilibrae/index.html">
href="https://www.aequilibrae.com/latest/python/modeling_with_aequilibrae/index.html">
Modeling with AequilibraE
</a>
</li>
<li class=" ">
<a class="nav-link dropdown-item nav-internal"
href="https://www.aequilibrae.com/dev/python/api.html">
href="https://www.aequilibrae.com/latest/python/api.html">
API Reference
</a>
</li>
</ul>
</li>
<li class="nav-item" id="index-nav-item" style="display: none;">
<a class="nav-link" href="https://www.aequilibrae.com/dev/python/index.html">Python</a>
<a class="nav-link" href="https://www.aequilibrae.com/latest/python/index.html">Python</a>
</li>
<li class="nav-item">
<a class="nav-link" href="https://www.aequilibrae.com/dev/qgis/index.html">QGIS</a>
<a class="nav-link" href="https://www.aequilibrae.com/latest/qgis/index.html">QGIS</a>
</li>
</ul>
</nav>
Expand Down
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
"text": "AequilibraE",
"image_light": "_static/large_icon.png",
"image_dark": "_static/large_icon.png",
"link": "https://www.aequilibrae.com/dev/home.html",
"link": "https://www.aequilibrae.com/latest/home.html",
},
}

Expand Down
2 changes: 1 addition & 1 deletion docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Python
Reference guide to AequilibraE's API.

.. grid-item-card:: :material-outlined:`person;1.5em` Not a programmer?
:link: https://www.aequilibrae.com/dev/qgis/index.html
:link: https://www.aequilibrae.com/latest/qgis/index.html
:text-align: center

Take me to the GUI!
Expand Down
2 changes: 1 addition & 1 deletion docs/source/modeling_with_aequilibrae/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ other open-source packages in the Python (NumPy, really) ecosystem.

AequilibraE has also a fully features interface available as a plugin for the
open source software QGIS, which is separately maintained and discussed in
detail its `documentation <http://www.aequilibrae.com/dev/qgis/index.html>`_.
detail its `documentation <http://www.aequilibrae.com/latest/qgis/index.html>`_.

Contributions are welcome to the existing modules and/or in the form of new modules.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ Style
~~~~~

* Python code should follow (mostly) the `pycodestyle style guide <https://pycodestyle.pycqa.org/en/latest/>`_
* Python docstrings should follow the `reStructuredText Docstring Format <https://www.python.org/dev/peps/pep-0287/>`_
* Python docstrings should follow the `reStructuredText Docstring Format <https://www.python.org/latest/peps/pep-0287/>`_
pedrocamargo marked this conversation as resolved.
Show resolved Hide resolved
* We are big fans of auto-code formatting. For that, we use `ruff <https://docs.astral.sh/ruff/>`_ and
`Black <https://black.readthedocs.io/en/stable/>`_.
* Negating some of what we have said so far, we use maximum line length of 120 characters
Expand Down
2 changes: 1 addition & 1 deletion docs/source/useful_information/version_history.rst
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ In the meantime, you can find the documentation for all versions since 0.5.3.
.. grid-item::

.. grid-item-card:: Upcoming version
:link: https://aequilibrae.com/dev/python/index.html
:link: https://aequilibrae.com/latest/python/index.html
:link-type: url
:text-align: center

Expand Down