From 38521b16d6b9bd5160c73fd43cbe99e7920312ca Mon Sep 17 00:00:00 2001 From: gspetro Date: Mon, 9 Jan 2023 09:18:26 -0500 Subject: [PATCH 01/12] add sphinx_rtd_theme to conf.py --- docs/UsersGuide/source/conf.py | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/UsersGuide/source/conf.py b/docs/UsersGuide/source/conf.py index 1d2ca24325..1490321e96 100644 --- a/docs/UsersGuide/source/conf.py +++ b/docs/UsersGuide/source/conf.py @@ -41,6 +41,7 @@ # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom # ones. extensions = [ + 'sphinx_rtd_theme', 'sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.intersphinx', From 625b4ad5febfb25046035878f6bd76484f026f1e Mon Sep 17 00:00:00 2001 From: gspetro Date: Mon, 9 Jan 2023 09:27:10 -0500 Subject: [PATCH 02/12] pin sphinx_rtd_theme==0.5.1 in req file --- docs/UsersGuide/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/UsersGuide/requirements.txt b/docs/UsersGuide/requirements.txt index edcb382114..fed495a0b3 100644 --- a/docs/UsersGuide/requirements.txt +++ b/docs/UsersGuide/requirements.txt @@ -1,2 +1,2 @@ sphinxcontrib-bibtex -sphinx_rtd_theme \ No newline at end of file +sphinx_rtd_theme==0.5.1 \ No newline at end of file From 0e1722b87a53f46622b62b9eb06af400da73ff60 Mon Sep 17 00:00:00 2001 From: gspetro Date: Mon, 9 Jan 2023 09:32:04 -0500 Subject: [PATCH 03/12] pin docutils==0.17 --- docs/UsersGuide/requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/UsersGuide/requirements.txt b/docs/UsersGuide/requirements.txt index fed495a0b3..3553ebab50 100644 --- a/docs/UsersGuide/requirements.txt +++ b/docs/UsersGuide/requirements.txt @@ -1,2 +1,3 @@ sphinxcontrib-bibtex -sphinx_rtd_theme==0.5.1 \ No newline at end of file +sphinx_rtd_theme==0.5.1 +docutils==0.17 \ No newline at end of file From 42225efa85dd39dbfa865b3eaa8e22badbfb1373 Mon Sep 17 00:00:00 2001 From: gspetro Date: Mon, 9 Jan 2023 09:36:29 -0500 Subject: [PATCH 04/12] pin Pygments-2.13.0 --- docs/UsersGuide/requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/UsersGuide/requirements.txt b/docs/UsersGuide/requirements.txt index 3553ebab50..868b71de6b 100644 --- a/docs/UsersGuide/requirements.txt +++ b/docs/UsersGuide/requirements.txt @@ -1,3 +1,4 @@ sphinxcontrib-bibtex sphinx_rtd_theme==0.5.1 -docutils==0.17 \ No newline at end of file +docutils==0.17 +Pygments==2.13.0 \ No newline at end of file From 5e2cebd25260ca97e381d27b4de5389eabafa069 Mon Sep 17 00:00:00 2001 From: gspetro Date: Mon, 9 Jan 2023 09:44:01 -0500 Subject: [PATCH 05/12] pinned sphinx_rtd_theme==1.1.1 --- docs/UsersGuide/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/UsersGuide/requirements.txt b/docs/UsersGuide/requirements.txt index 868b71de6b..8d634f706a 100644 --- a/docs/UsersGuide/requirements.txt +++ b/docs/UsersGuide/requirements.txt @@ -1,4 +1,4 @@ sphinxcontrib-bibtex -sphinx_rtd_theme==0.5.1 +sphinx_rtd_theme==1.1.1 docutils==0.17 Pygments==2.13.0 \ No newline at end of file From 293e3fdea86982ae12e971cb1295055ddac29c4c Mon Sep 17 00:00:00 2001 From: gspetro Date: Mon, 9 Jan 2023 09:45:51 -0500 Subject: [PATCH 06/12] pin sphinx==5.3.0 --- docs/UsersGuide/requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/UsersGuide/requirements.txt b/docs/UsersGuide/requirements.txt index 8d634f706a..45893ba7fd 100644 --- a/docs/UsersGuide/requirements.txt +++ b/docs/UsersGuide/requirements.txt @@ -1,4 +1,5 @@ sphinxcontrib-bibtex sphinx_rtd_theme==1.1.1 docutils==0.17 -Pygments==2.13.0 \ No newline at end of file +Pygments==2.13.0 +sphinx==5.3.0 \ No newline at end of file From 4f11fe595f1823b43580ee60305cc5f6b85924a1 Mon Sep 17 00:00:00 2001 From: gspetro Date: Mon, 9 Jan 2023 09:50:30 -0500 Subject: [PATCH 07/12] pin importlib-metadata==5.2.0 --- docs/UsersGuide/requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/UsersGuide/requirements.txt b/docs/UsersGuide/requirements.txt index 45893ba7fd..7436040aa1 100644 --- a/docs/UsersGuide/requirements.txt +++ b/docs/UsersGuide/requirements.txt @@ -2,4 +2,5 @@ sphinxcontrib-bibtex sphinx_rtd_theme==1.1.1 docutils==0.17 Pygments==2.13.0 -sphinx==5.3.0 \ No newline at end of file +sphinx==5.3.0 +importlib-metadata==5.2.0 \ No newline at end of file From 14e4d68be0818acdbbae5b586309629b9964fc09 Mon Sep 17 00:00:00 2001 From: gspetro Date: Mon, 9 Jan 2023 09:53:47 -0500 Subject: [PATCH 08/12] pin pillow==9.3.0 --- docs/UsersGuide/requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/UsersGuide/requirements.txt b/docs/UsersGuide/requirements.txt index 7436040aa1..3a5e9f21c5 100644 --- a/docs/UsersGuide/requirements.txt +++ b/docs/UsersGuide/requirements.txt @@ -3,4 +3,5 @@ sphinx_rtd_theme==1.1.1 docutils==0.17 Pygments==2.13.0 sphinx==5.3.0 -importlib-metadata==5.2.0 \ No newline at end of file +importlib-metadata==5.2.0 +pillow==9.3.0 \ No newline at end of file From 3a163b9100b01d6808fa907dc6678c845a3b9dee Mon Sep 17 00:00:00 2001 From: gspetro Date: Mon, 9 Jan 2023 09:58:35 -0500 Subject: [PATCH 09/12] set docutils==0.16 --- docs/UsersGuide/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/UsersGuide/requirements.txt b/docs/UsersGuide/requirements.txt index 3a5e9f21c5..605d397ae3 100644 --- a/docs/UsersGuide/requirements.txt +++ b/docs/UsersGuide/requirements.txt @@ -1,6 +1,6 @@ sphinxcontrib-bibtex sphinx_rtd_theme==1.1.1 -docutils==0.17 +docutils==0.16 Pygments==2.13.0 sphinx==5.3.0 importlib-metadata==5.2.0 From 924d8909788fbb891e558942a99f88ecded879ae Mon Sep 17 00:00:00 2001 From: gspetro Date: Mon, 9 Jan 2023 10:07:44 -0500 Subject: [PATCH 10/12] comment out unwanted pinnings --- docs/UsersGuide/requirements.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/docs/UsersGuide/requirements.txt b/docs/UsersGuide/requirements.txt index 605d397ae3..c4bea02a8f 100644 --- a/docs/UsersGuide/requirements.txt +++ b/docs/UsersGuide/requirements.txt @@ -1,7 +1,8 @@ sphinxcontrib-bibtex -sphinx_rtd_theme==1.1.1 +sphinx_rtd_theme +#==1.1.1 docutils==0.16 -Pygments==2.13.0 -sphinx==5.3.0 -importlib-metadata==5.2.0 -pillow==9.3.0 \ No newline at end of file +#Pygments==2.13.0 +#sphinx==5.3.0 +#importlib-metadata==5.2.0 +#pillow==9.3.0 \ No newline at end of file From 303cee4a641bda416dd41daf09597531117a3714 Mon Sep 17 00:00:00 2001 From: gspetro Date: Mon, 9 Jan 2023 10:11:46 -0500 Subject: [PATCH 11/12] remove unnecessary changes for formatting fix --- docs/UsersGuide/requirements.txt | 9 ++------- docs/UsersGuide/source/conf.py | 1 - 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/docs/UsersGuide/requirements.txt b/docs/UsersGuide/requirements.txt index c4bea02a8f..7be32f526d 100644 --- a/docs/UsersGuide/requirements.txt +++ b/docs/UsersGuide/requirements.txt @@ -1,8 +1,3 @@ sphinxcontrib-bibtex -sphinx_rtd_theme -#==1.1.1 -docutils==0.16 -#Pygments==2.13.0 -#sphinx==5.3.0 -#importlib-metadata==5.2.0 -#pillow==9.3.0 \ No newline at end of file +sphinx_rtd_theme +docutils==0.16 \ No newline at end of file diff --git a/docs/UsersGuide/source/conf.py b/docs/UsersGuide/source/conf.py index 1490321e96..1d2ca24325 100644 --- a/docs/UsersGuide/source/conf.py +++ b/docs/UsersGuide/source/conf.py @@ -41,7 +41,6 @@ # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom # ones. extensions = [ - 'sphinx_rtd_theme', 'sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.intersphinx', From c3b422187cd1ced77b198d4fc59a2fac08d9b490 Mon Sep 17 00:00:00 2001 From: gspetro Date: Mon, 9 Jan 2023 10:14:45 -0500 Subject: [PATCH 12/12] add back sphinx_rtd_theme extension in conf.py --- docs/UsersGuide/source/conf.py | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/UsersGuide/source/conf.py b/docs/UsersGuide/source/conf.py index 1d2ca24325..1490321e96 100644 --- a/docs/UsersGuide/source/conf.py +++ b/docs/UsersGuide/source/conf.py @@ -41,6 +41,7 @@ # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom # ones. extensions = [ + 'sphinx_rtd_theme', 'sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.intersphinx',