From b5e0ab68d2704cc6f570c801517cefeb4fc71462 Mon Sep 17 00:00:00 2001 From: Matt McKay Date: Mon, 27 Jul 2020 10:55:03 +1000 Subject: [PATCH 01/12] add rst2myst extension --- conf.py | 1 + environment.yml | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/conf.py b/conf.py index fe5be86..080d6a4 100644 --- a/conf.py +++ b/conf.py @@ -40,6 +40,7 @@ 'IPython.sphinxext.ipython_console_highlighting', # Custom Sphinx Extensions 'sphinxcontrib.jupyter', + 'sphinxcontrib.rst2myst', ] # Retired Extensions but may be useful in Future diff --git a/environment.yml b/environment.yml index be4871e..de0b299 100644 --- a/environment.yml +++ b/environment.yml @@ -18,6 +18,7 @@ dependencies: - sympy - scipy - pip: - - sphinxcontrib-jupyter - - sphinxcontrib-bibtex + - sphinxcontrib-jupyter + - sphinxcontrib-bibtex - joblib + - git+https://github.com/mmcky/sphinxcontrib-rst2myst.git From 2106c2ce7971243c0c7e98c0e02ce34d85376115 Mon Sep 17 00:00:00 2001 From: Matt McKay Date: Wed, 12 Aug 2020 13:24:10 +1000 Subject: [PATCH 02/12] debug --- conf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf.py b/conf.py index 080d6a4..9f3b132 100644 --- a/conf.py +++ b/conf.py @@ -132,7 +132,7 @@ # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. -html_theme = 'qe-lectures' +html_theme = 'sphinx_book_theme' # Theme options are theme-specific and customize the look and feel of a theme # further. For a list of options available for each theme, see the @@ -140,7 +140,7 @@ #html_theme_options = {} # Add any paths that contain custom themes here, relative to this directory. -html_theme_path = ['_themes'] +# html_theme_path = ['_themes'] # The name for this set of Sphinx documents. If None, it defaults to # " v documentation". From 39f380e93dbdd68c2ef2b17f0196e943e9c00ece Mon Sep 17 00:00:00 2001 From: mmcky Date: Mon, 7 Sep 2020 12:21:54 +1000 Subject: [PATCH 03/12] update name from rst2myst to tomyst --- conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.py b/conf.py index 9f3b132..9c4cb5d 100644 --- a/conf.py +++ b/conf.py @@ -40,7 +40,7 @@ 'IPython.sphinxext.ipython_console_highlighting', # Custom Sphinx Extensions 'sphinxcontrib.jupyter', - 'sphinxcontrib.rst2myst', + 'sphinxcontrib.tomyst', ] # Retired Extensions but may be useful in Future From 5a1d31308e0b0bbf6e14e46a258df10b6088c936 Mon Sep 17 00:00:00 2001 From: mmcky Date: Mon, 14 Sep 2020 19:24:45 +1000 Subject: [PATCH 04/12] add config for custom _static destination --- conf.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/conf.py b/conf.py index 9c4cb5d..a4d6574 100644 --- a/conf.py +++ b/conf.py @@ -478,3 +478,8 @@ # pdf toc file jupyter_pdf_book_index = "index_toc" + +# tomyst Config + +# Set Destination path +tomyst_static_file_path = ['source/rst/_static'] \ No newline at end of file From 400546e54d9c8efd79dfffb9cba4b5c145901613 Mon Sep 17 00:00:00 2001 From: mmcky Date: Wed, 16 Sep 2020 11:28:33 +1000 Subject: [PATCH 05/12] add jupytext targetting --- conf.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/conf.py b/conf.py index a4d6574..c0a8f34 100644 --- a/conf.py +++ b/conf.py @@ -482,4 +482,6 @@ # tomyst Config # Set Destination path -tomyst_static_file_path = ['source/rst/_static'] \ No newline at end of file +tomyst_static_file_path = ['source/rst/_static'] + +tomyst_jupytext = True \ No newline at end of file From 55aa41866c53f4d645ffd2e0f095737dedf9f838 Mon Sep 17 00:00:00 2001 From: mmcky Date: Wed, 16 Sep 2020 16:30:09 +1000 Subject: [PATCH 06/12] don't target jupytext until execution is supported --- conf.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/conf.py b/conf.py index c0a8f34..a4b9f25 100644 --- a/conf.py +++ b/conf.py @@ -483,5 +483,3 @@ # Set Destination path tomyst_static_file_path = ['source/rst/_static'] - -tomyst_jupytext = True \ No newline at end of file From 9176aa91ec45b39e8975a67c8b320774a210ff3f Mon Sep 17 00:00:00 2001 From: mmcky Date: Wed, 23 Sep 2020 14:19:45 +1000 Subject: [PATCH 07/12] update conf.py settings --- conf.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf.py b/conf.py index a4b9f25..9b57a6f 100644 --- a/conf.py +++ b/conf.py @@ -483,3 +483,5 @@ # Set Destination path tomyst_static_file_path = ['source/rst/_static'] +tomyst_parser = "myst_nb" +tomyst_comment_conf = ["^jupyter_"] \ No newline at end of file From e607a90486f30c76204089bd32931d3873784684 Mon Sep 17 00:00:00 2001 From: mmcky Date: Wed, 23 Sep 2020 14:44:19 +1000 Subject: [PATCH 08/12] update conf for PR#69 --- conf.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/conf.py b/conf.py index 9b57a6f..8394af7 100644 --- a/conf.py +++ b/conf.py @@ -368,6 +368,8 @@ linkcheck_timeout = 30 +# {{ tomyst-remove-start }} + # -------------------------------------------- # jupyter Sphinx Extension conversion settings # -------------------------------------------- @@ -484,4 +486,6 @@ # Set Destination path tomyst_static_file_path = ['source/rst/_static'] tomyst_parser = "myst_nb" -tomyst_comment_conf = ["^jupyter_"] \ No newline at end of file +tomyst_conf_removeblocks = True + +# {{ tomyst-remove-finish }} From b45d0b94ba7db694fdb87380963323d1bbc91898 Mon Sep 17 00:00:00 2001 From: mmcky Date: Wed, 23 Sep 2020 15:06:55 +1000 Subject: [PATCH 09/12] update config for tomyst(PR#69) --- conf.py | 1 + 1 file changed, 1 insertion(+) diff --git a/conf.py b/conf.py index 8394af7..b08c641 100644 --- a/conf.py +++ b/conf.py @@ -487,5 +487,6 @@ tomyst_static_file_path = ['source/rst/_static'] tomyst_parser = "myst_nb" tomyst_conf_removeblocks = True +tomyst_conf_dropcontaining = ["sphinxcontrib.jupyter"] # {{ tomyst-remove-finish }} From c62beadfe09dfd13fafcdca23eaeb28585c49a2d Mon Sep 17 00:00:00 2001 From: mmcky Date: Fri, 25 Sep 2020 12:19:41 +1000 Subject: [PATCH 10/12] update package name to sphinx_tomyst --- conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.py b/conf.py index b08c641..fbcc8f9 100644 --- a/conf.py +++ b/conf.py @@ -40,7 +40,7 @@ 'IPython.sphinxext.ipython_console_highlighting', # Custom Sphinx Extensions 'sphinxcontrib.jupyter', - 'sphinxcontrib.tomyst', + 'sphinx_tomyst', ] # Retired Extensions but may be useful in Future From 229d5f21cc121462887d4b3d1067f17809ef64cc Mon Sep 17 00:00:00 2001 From: mmcky Date: Fri, 25 Sep 2020 16:53:22 +1000 Subject: [PATCH 11/12] update software to python=3.8 and anaconda=2020.07 --- environment.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/environment.yml b/environment.yml index 234a6fa..56376cc 100644 --- a/environment.yml +++ b/environment.yml @@ -2,8 +2,8 @@ name: qe-lectures channels: - default dependencies: - - python=3.7 - - anaconda=2020.02 + - python=3.8 + - anaconda=2020.07 - pip - pip: - interpolation From 8a1debfc10e21cd03e12128897a46968ced65d06 Mon Sep 17 00:00:00 2001 From: mmcky Date: Fri, 25 Sep 2020 17:05:41 +1000 Subject: [PATCH 12/12] update to python=3.8 --- .github/workflows/cache.yml | 2 +- .github/workflows/ci.yml | 2 +- .github/workflows/coverage.yml | 2 +- .github/workflows/deploy-s3.yml | 2 +- .github/workflows/preview.yml | 2 +- environment.yml | 1 + 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml index 3ad063e..20b3a11 100644 --- a/.github/workflows/cache.yml +++ b/.github/workflows/cache.yml @@ -61,7 +61,7 @@ jobs: auto-update-conda: true auto-activate-base: true miniconda-version: 'latest' - python-version: 3.7 + python-version: 3.8 environment-file: environment.yml activate-environment: qe-lectures - name: Checkout QuantEcon theme diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 86d9b2c..1a26781 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: auto-update-conda: true auto-activate-base: true miniconda-version: 'latest' - python-version: 3.7 + python-version: 3.8 environment-file: environment.yml activate-environment: qe-lectures - name: Get Changed Files diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 2932d30..6c6df3e 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -15,7 +15,7 @@ jobs: auto-update-conda: true auto-activate-base: true miniconda-version: 'latest' - python-version: 3.7 + python-version: 3.8 environment-file: environment.yml activate-environment: qe-lectures - name: Run Execution Tests diff --git a/.github/workflows/deploy-s3.yml b/.github/workflows/deploy-s3.yml index e992ff9..f8f91d9 100644 --- a/.github/workflows/deploy-s3.yml +++ b/.github/workflows/deploy-s3.yml @@ -16,7 +16,7 @@ jobs: auto-update-conda: true auto-activate-base: true miniconda-version: 'latest' - python-version: 3.7 + python-version: 3.8 environment-file: environment.yml activate-environment: qe-lectures - name: Checkout QuantEcon theme diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index 875c238..18b563d 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -15,7 +15,7 @@ jobs: auto-update-conda: true auto-activate-base: true miniconda-version: 'latest' - python-version: 3.7 + python-version: 3.8 environment-file: environment.yml activate-environment: qe-lectures - name: Get Changed Files diff --git a/environment.yml b/environment.yml index 56376cc..0ac2d01 100644 --- a/environment.yml +++ b/environment.yml @@ -10,3 +10,4 @@ dependencies: - sphinxcontrib-jupyter - sphinxcontrib-bibtex - joblib + - git+https://github.com/executablebooks/sphinx-tomyst