From f4d7a546d49c909dafc416a829f96b590ce5fb14 Mon Sep 17 00:00:00 2001 From: rebortg Date: Sun, 14 Jan 2024 21:34:52 +0100 Subject: update sphinx and dependencies (cherry picked from commit bcef0f76c56dc715aaa05fe21943f013619827af) --- .gitignore | 7 ++++- docs/conf.py | 2 +- docs/index.rst | 87 ++++++++++++++++++++++++++++---------------------------- requirements.txt | 14 ++++----- 4 files changed, 58 insertions(+), 52 deletions(-) diff --git a/.gitignore b/.gitignore index 81d49b98..f1efd54e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,13 @@ # Sphinx _build/ +localazy_private.json # python virtualenv venv/ ENV/ .venv Pipfile.lock +Pipfile # put various editor ignores here .vscode/ @@ -13,6 +15,9 @@ Pipfile.lock *.vpw *.vpwhist *.vtg +.idea/ +.idea +.idea/* # python cache files *.pyc @@ -23,4 +28,4 @@ __pycache__ .envrc # os specific -.DS_Store +.DS_Store \ No newline at end of file diff --git a/docs/conf.py b/docs/conf.py index ebd8ef86..d3ba6fd5 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -46,7 +46,7 @@ extensions = ['sphinx.ext.intersphinx', 'sphinx.ext.graphviz', 'notfound.extension', 'myst_parser', - 'sphinx_panels', + 'sphinx_design', 'vyos' ] diff --git a/docs/index.rst b/docs/index.rst index db0b0172..9b36f9af 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -4,49 +4,50 @@ VyOS User Guide ############### -.. panels:: - :container: container-lg pb-3 - :column: col-lg-4 col-md-4 col-sm-6 col-xs-12 p-2 - - Get / Build VyOS - ^^^^^^^^^^^^^^^^ - Quickly :ref:`Build` your own Image or take a look at how to :ref:`download` a free or supported version. - --- - - Install VyOS - ^^^^^^^^^^^^ - Read about how to install VyOS on :ref:`Bare Metall` or in a - :ref:`Virtual Environment` and - how to use an image with the usual :ref:`cloud` providers - --- - - Configuration and Operation - ^^^^^^^^^^^^^^^^^^^^^^^^^^^ - Use the :ref:`Quickstart Guide`, to have a fast overview. Or go deeper and - set up :ref:`advanced routing`, - :ref:`VRFs`, or - :ref:`VPNs` for example. - --- - - Automate - ^^^^^^^^ - Integrate VyOS in your automation Workflow with - :ref:`Ansible`, - have your own :ref:`local scripts`, or configure VyOS with the :ref:`HTTPS-API`. - --- - - Examples - ^^^^^^^^ - Get some inspiration from the :ref:`Configuration Blueprints` - to build your infrastructure. - --- - - Contribute and Community - ^^^^^^^^^^^^^^^^^^^^^^^^ - | There are many ways to contribute to the project. - | Add missing parts or improve the :ref:`Documentation`. - | Discuss in `Slack `_ or the `Forum `_. - | Or you can pick up a `Task `_ and fix the :ref:`code`. +.. grid:: 3 + :gutter: 2 + + .. grid-item-card:: Get / Build VyOS + + + Quickly :ref:`Build` your own Image or take a look at how to :ref:`download` a free or supported version. + + + .. grid-item-card:: Install VyOS + + Read about how to install VyOS on :ref:`Bare Metal` or in a + :ref:`Virtual Environment` and + how to use an image with the usual :ref:`cloud` providers + + + .. grid-item-card:: Configuration and Operation + + Use the :ref:`Quickstart Guide`, to have a fast overview. Or go deeper and + set up :ref:`advanced routing`, + :ref:`VRFs`, or + :ref:`VPNs` for example. + + + .. grid-item-card:: Automate + + Integrate VyOS in your automation Workflow with + :ref:`Ansible`, + have your own :ref:`local scripts`, or configure VyOS with the :ref:`HTTPS-API`. + + + .. grid-item-card:: Examples + + Get some inspiration from the :ref:`Configuration Blueprints` + to build your infrastructure. + + + .. grid-item-card:: Contribute and Community + + | There are many ways to contribute to the project. + | Add missing parts or improve the :ref:`Documentation`. + | Discuss in `Slack `_ or the `Forum `_. + | Or you can pick up a `Task `_ and fix the :ref:`code`. + .. toctree:: :hidden: diff --git a/requirements.txt b/requirements.txt index 50126c4c..0a846a72 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,8 @@ -urllib3==1.26.15 -Sphinx==4.5.0 -sphinx-rtd-theme==1.0.0 +urllib3==2.1.0 +Sphinx==7.2.6 +sphinx-rtd-theme==2.0.0 sphinx-autobuild==2021.3.14 -sphinx-notfound-page==0.8 -lxml==4.9.1 -myst-parser==0.17.1 -sphinx-panels==0.6.0 +sphinx-notfound-page==1.0.0 +lxml==5.1.0 +myst-parser==2.0.0 +sphinx_design==0.5.0 -- cgit v1.2.3