From ed18ad2f0c20b6e7fca323a409c36d45bc2453ec Mon Sep 17 00:00:00 2001 From: woutdenolf <woutdenolf@users.sf.net> Date: Thu, 5 Aug 2021 16:51:46 +0200 Subject: [PATCH 1/2] modify sphinx setup --- .gitlab-ci.yml | 2 +- doc/index.rst | 15 +-------------- setup.cfg | 3 +++ 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8a86fee..2315d22 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,7 @@ test-3.8: test-3.9: extends: ".test-3.9" -ewoksorange_sphinx_and_artifacts: +deploy_docs: extends: ".sphinx_and_artifacts" pages: diff --git a/doc/index.rst b/doc/index.rst index af8ce85..44b4489 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -6,20 +6,7 @@ ewoskcore provides an API for defining workflows in Ewoks. ewoskcore has been developed by the `Software group <http://www.esrf.eu/Instrumentation/software>`_ of the `European Synchrotron <https://www.esrf.eu/>`_. .. toctree:: - :hidden: + :maxdepth: 2 definitions api - -:doc:`definitions` - Getting started - -:doc:`api` - API documentation - -Indices -======= - -* :ref:`genindex` -* :ref:`modindex` -* :ref:`search` diff --git a/setup.cfg b/setup.cfg index b0b9ef6..751265f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -44,4 +44,7 @@ exclude = .eggs [build_sphinx] +project = ewokscore +version = attr: ewokscore.__version__ +release = 0.1 source-dir = ./doc -- GitLab From 2020e8b2fad34730b212eec44a9181ff0238269d Mon Sep 17 00:00:00 2001 From: woutdenolf <woutdenolf@users.sf.net> Date: Thu, 5 Aug 2021 16:56:40 +0200 Subject: [PATCH 2/2] version in setup.cfg --- doc/conf.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/doc/conf.py b/doc/conf.py index c12a29a..73370c4 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -1,12 +1,8 @@ """rm -rf doc/_generated/; python setup.py build_sphinx -E -a """ -from ewokscore import __version__ # noqa E402 - copyright = "2021, ESRF" author = "ESRF" -release = ".".join(__version__.split(".")[:2]) -version = __version__ extensions = ["sphinx.ext.autodoc", "sphinx.ext.autosummary"] templates_path = ["_templates"] -- GitLab