From 28ace2484f2bc7f614b493b33935fa76b65bdeca Mon Sep 17 00:00:00 2001 From: Silke Schomann Date: Thu, 10 Oct 2024 15:51:19 +0100 Subject: [PATCH 1/4] Update copyright info --- .github/workflows/online_doc_update.yml | 8 ++++---- docs/source/conf.py | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/online_doc_update.yml b/.github/workflows/online_doc_update.yml index da60bb90..fc53c705 100644 --- a/.github/workflows/online_doc_update.yml +++ b/.github/workflows/online_doc_update.yml @@ -1,9 +1,9 @@ name: MSlice online documentation update -on: - push: - branches: - - main +on: push +# push: +# branches: +# - main jobs: pages: diff --git a/docs/source/conf.py b/docs/source/conf.py index 33e55238..37b2ff3d 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -17,10 +17,10 @@ # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the # documentation root, use os.path.abspath to make it absolute, like shown here. -# sys.path.insert(0, os.path.abspath(os.path.join("../..", "src"))) +sys.path.insert(0, os.path.abspath(os.path.join("../..", "src"))) -# from mslice import version_info # noqa: E402 -version_info = (2, 9, 1) +from mslice import version_info # noqa: E402 +# version_info = (2, 9, 1) # -- General configuration ------------------------------------------------ @@ -56,7 +56,7 @@ # General information about the project. project = u'MSlice' -copyright = u'2021, Mantid Project' +copyright = u'2024, Mantid Project' author = u'Mantid Project' # The version info for the project you're documenting, acts as replacement for From 318d04b4bda3368f3a1b58c8aa2b5e1cc0aed512 Mon Sep 17 00:00:00 2001 From: Silke Schomann Date: Thu, 10 Oct 2024 16:00:00 +0100 Subject: [PATCH 2/4] Added imports --- docs/source/conf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index 37b2ff3d..f7eb2f84 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -11,8 +11,8 @@ # # All configuration values have a default; values that are commented out # serve to show the default. -# import os -# import sys +import os +import sys # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the From 15fca6a5dbcd3e6e90b3d0cc05e17c469f7c23bc Mon Sep 17 00:00:00 2001 From: Silke Schomann Date: Thu, 10 Oct 2024 16:19:07 +0100 Subject: [PATCH 3/4] Use src/mslice --- docs/source/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index f7eb2f84..6eed31a9 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -17,7 +17,7 @@ # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the # documentation root, use os.path.abspath to make it absolute, like shown here. -sys.path.insert(0, os.path.abspath(os.path.join("../..", "src"))) +sys.path.insert(0, os.path.abspath(os.path.join("../..", "src/mslice"))) from mslice import version_info # noqa: E402 # version_info = (2, 9, 1) From 042e70b58c0da11c08929b81d395524e876b4da7 Mon Sep 17 00:00:00 2001 From: Silke Schomann Date: Thu, 10 Oct 2024 16:28:43 +0100 Subject: [PATCH 4/4] Remove temporary code --- .github/workflows/online_doc_update.yml | 8 ++++---- docs/source/conf.py | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/online_doc_update.yml b/.github/workflows/online_doc_update.yml index fc53c705..da60bb90 100644 --- a/.github/workflows/online_doc_update.yml +++ b/.github/workflows/online_doc_update.yml @@ -1,9 +1,9 @@ name: MSlice online documentation update -on: push -# push: -# branches: -# - main +on: + push: + branches: + - main jobs: pages: diff --git a/docs/source/conf.py b/docs/source/conf.py index 6eed31a9..b56936fb 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -11,16 +11,16 @@ # # All configuration values have a default; values that are commented out # serve to show the default. -import os -import sys +# import os +# import sys # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the # documentation root, use os.path.abspath to make it absolute, like shown here. -sys.path.insert(0, os.path.abspath(os.path.join("../..", "src/mslice"))) +# sys.path.insert(0, os.path.abspath(os.path.join("../..", "src"))) -from mslice import version_info # noqa: E402 -# version_info = (2, 9, 1) +# from mslice import version_info # noqa: E402 +version_info = (2, 9, 1) # -- General configuration ------------------------------------------------