diff --git a/.github/workflows/documentation-build.yml b/.github/workflows/documentation-build.yml index 7d66fd2..fc7d56b 100644 --- a/.github/workflows/documentation-build.yml +++ b/.github/workflows/documentation-build.yml @@ -36,11 +36,11 @@ jobs: - name: Install Pandoc, repo and dependencies run: | sudo apt install pandoc - pip install . '.[docs]' + pip install . '.[dev,docs]' - name: Build and Commit uses: sphinx-notes/pages@master with: - install_requirements: true + install_requirements: false documentation_path: docs/src - name: Push changes uses: ad-m/github-push-action@master diff --git a/docs/src/conf.py b/docs/src/conf.py index 11f09c3..8a12588 100644 --- a/docs/src/conf.py +++ b/docs/src/conf.py @@ -19,21 +19,22 @@ # import os import sys -import toml +# import toml from pathlib import Path +import easyscience # sys.path.insert(0, os.path.abspath('.')) main_root = Path(__file__).parents[2] sys.path.append(str(main_root)) import datetime -project_info = toml.load(os.path.join(main_root, 'pyproject.toml')) +# project_info = toml.load(os.path.join(main_root, 'pyproject.toml')) # -- Project information ----------------------------------------------------- project = 'EasyScience' -copyright = f"{datetime.date.today().year}, EasyReflectometry" -author = "EasyReflectometry" +copyright = f"{datetime.date.today().year}, EasyScience Contributors" +author = "EasyScience Contributors" # copyright = f"2021, {project_info['tool']['poetry']['authors'][0]}" # author = project_info['tool']['poetry']['authors'][0] @@ -42,9 +43,11 @@ # # The full version, including alpha/beta/rc tags # release = project_info['tool']['poetry']['version'] # The short X.Y version. -version = project_info['project']['version'] +#version = project_info['project']['version'] # The full version, including alpha/beta/rc tags. -version = project_info['project']['version'] +#version = project_info['project']['version'] +version = easyscience.__version__ + intersphinx_mapping = { 'python': ('https://docs.python.org/3', None),