Skip to content

Commit d6b69d8

Browse files
authored
Merge pull request #4 from EasyScience/doc_fix
Fix for documentation creation
2 parents 2286139 + 3596242 commit d6b69d8

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

.github/workflows/documentation-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ jobs:
3636
- name: Install Pandoc, repo and dependencies
3737
run: |
3838
sudo apt install pandoc
39-
pip install . '.[docs]'
39+
pip install . '.[dev,docs]'
4040
- name: Build and Commit
4141
uses: sphinx-notes/pages@master
4242
with:
43-
install_requirements: true
43+
install_requirements: false
4444
documentation_path: docs/src
4545
- name: Push changes
4646
uses: ad-m/github-push-action@master

docs/src/conf.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,22 @@
1919
#
2020
import os
2121
import sys
22-
import toml
22+
# import toml
2323
from pathlib import Path
24+
import easyscience
2425
# sys.path.insert(0, os.path.abspath('.'))
2526
main_root = Path(__file__).parents[2]
2627
sys.path.append(str(main_root))
2728

2829
import datetime
2930

30-
project_info = toml.load(os.path.join(main_root, 'pyproject.toml'))
31+
# project_info = toml.load(os.path.join(main_root, 'pyproject.toml'))
3132

3233
# -- Project information -----------------------------------------------------
3334

3435
project = 'EasyScience'
35-
copyright = f"{datetime.date.today().year}, EasyReflectometry"
36-
author = "EasyReflectometry"
36+
copyright = f"{datetime.date.today().year}, EasyScience Contributors"
37+
author = "EasyScience Contributors"
3738
# copyright = f"2021, {project_info['tool']['poetry']['authors'][0]}"
3839
# author = project_info['tool']['poetry']['authors'][0]
3940

@@ -42,9 +43,11 @@
4243
# # The full version, including alpha/beta/rc tags
4344
# release = project_info['tool']['poetry']['version']
4445
# The short X.Y version.
45-
version = project_info['project']['version']
46+
#version = project_info['project']['version']
4647
# The full version, including alpha/beta/rc tags.
47-
version = project_info['project']['version']
48+
#version = project_info['project']['version']
49+
version = easyscience.__version__
50+
4851

4952
intersphinx_mapping = {
5053
'python': ('https://docs.python.org/3', None),

0 commit comments

Comments
 (0)