From c316f9cf761f7bb93bef3684c828a575eef02e72 Mon Sep 17 00:00:00 2001 From: Christophe Demko Date: Sun, 21 Jan 2024 16:17:16 +0100 Subject: [PATCH 1/5] Update sphinx_rtd_theme --- poetry.lock | 22 +++++++++++----------- pyproject.toml | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/poetry.lock b/poetry.lock index 83fac8d..d34c1b9 100644 --- a/poetry.lock +++ b/poetry.lock @@ -434,13 +434,13 @@ stevedore = "*" [[package]] name = "docutils" -version = "0.18.1" +version = "0.20.1" description = "Docutils -- Python Documentation Utilities" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +python-versions = ">=3.7" files = [ - {file = "docutils-0.18.1-py2.py3-none-any.whl", hash = "sha256:23010f129180089fbcd3bc08cfefccb3b890b0050e1ca00c867036e9d161b98c"}, - {file = "docutils-0.18.1.tar.gz", hash = "sha256:679987caf361a7539d76e584cbeddc311e3aee937877c87346f31debc63e9d06"}, + {file = "docutils-0.20.1-py3-none-any.whl", hash = "sha256:96f387a2c5562db4476f09f13bbab2192e764cac08ebbf3a34a95d9b1e4a59d6"}, + {file = "docutils-0.20.1.tar.gz", hash = "sha256:f08a4e276c3a1583a86dce3e34aba3fe04d02bba2dd51ed16106244e8a923e3b"}, ] [[package]] @@ -1677,18 +1677,18 @@ test = ["cython (>=3.0)", "filelock", "html5lib", "pytest (>=4.6)", "setuptools [[package]] name = "sphinx-rtd-theme" -version = "1.3.0" +version = "2.0.0" description = "Read the Docs theme for Sphinx" optional = false -python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,>=2.7" +python-versions = ">=3.6" files = [ - {file = "sphinx_rtd_theme-1.3.0-py2.py3-none-any.whl", hash = "sha256:46ddef89cc2416a81ecfbeaceab1881948c014b1b6e4450b815311a89fb977b0"}, - {file = "sphinx_rtd_theme-1.3.0.tar.gz", hash = "sha256:590b030c7abb9cf038ec053b95e5380b5c70d61591eb0b552063fbe7c41f0931"}, + {file = "sphinx_rtd_theme-2.0.0-py2.py3-none-any.whl", hash = "sha256:ec93d0856dc280cf3aee9a4c9807c60e027c7f7b461b77aeffed682e68f0e586"}, + {file = "sphinx_rtd_theme-2.0.0.tar.gz", hash = "sha256:bd5d7b80622406762073a04ef8fadc5f9151261563d47027de09910ce03afe6b"}, ] [package.dependencies] -docutils = "<0.19" -sphinx = ">=1.6,<8" +docutils = "<0.21" +sphinx = ">=5,<8" sphinxcontrib-jquery = ">=4,<5" [package.extras] @@ -2041,4 +2041,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = "^3.9" -content-hash = "425d3e17453df7073a8da12e6114de73464c3630b629090c795b92de51208516" +content-hash = "fc6654e687730a6888ea6d05f3528797bbf2e9d771ea7f24283bd1f353f9627d" diff --git a/pyproject.toml b/pyproject.toml index a6d8f60..9471412 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -90,7 +90,7 @@ optional = true [tool.poetry.group.docs.dependencies] myst-parser = "^2.0" sphinx = "^7.2" -sphinx_rtd_theme = "^1.3" +sphinx_rtd_theme = "^2.0" [tool.poetry.scripts] pandoc-latex-admonition = "pandoc_latex_admonition:main" From 2d8a0b566860cd69dee0c9b86a9a7fc536d21027 Mon Sep 17 00:00:00 2001 From: Christophe Demko Date: Sun, 21 Jan 2024 16:35:43 +0100 Subject: [PATCH 2/5] Update checkout --- .github/workflows/python-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index a160414..cf219c1 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -18,7 +18,7 @@ jobs: poetry-version: [1.7.1] pandoc-version: [3.1.11.1] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 with: From 63c2b029f0f40255d41c55f1fc88fa7c707ae85f Mon Sep 17 00:00:00 2001 From: Christophe Demko Date: Sun, 21 Jan 2024 16:37:05 +0100 Subject: [PATCH 3/5] Update checkout --- .github/workflows/python-package.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index cf219c1..afdbd29 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -44,7 +44,7 @@ jobs: poetry-version: [1.2.2, 1.3.2, 1.4.2, 1.5.1, 1.6.1, 1.7.1] pandoc-version: [3.1.11.1] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 with: @@ -70,7 +70,7 @@ jobs: poetry-version: [1.7.1] pandoc-version: [3.0.1, 3.1.11.1] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 with: @@ -91,7 +91,7 @@ jobs: style: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v4 with: @@ -111,7 +111,7 @@ jobs: cov: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v4 with: From da631352f366190c4d1a4388b12fb78bc78d6ecf Mon Sep 17 00:00:00 2001 From: Christophe Demko Date: Sun, 21 Jan 2024 21:26:18 +0100 Subject: [PATCH 4/5] Finish poetry-dynamic-versioning --- README.md | 2 +- docs/requirements.txt | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 docs/requirements.txt diff --git a/README.md b/README.md index a056ddd..e321597 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ $ pipx install pandoc-latex-admonition To upgrade to the most recent release, use ~~~shell -$ pipx install --upgrade pandoc-latex-admonition +$ pipx upgrade pandoc-latex-admonition ~~~ `pipx` is a script to install and run python applications in isolated environments from the Python Package Index, [PyPI]. It can be installed using instructions given [here](https://pipx.pypa.io/stable/). diff --git a/docs/requirements.txt b/docs/requirements.txt deleted file mode 100644 index 163d6f6..0000000 --- a/docs/requirements.txt +++ /dev/null @@ -1,4 +0,0 @@ -Sphinx>=6.0 -sphinx_rtd_theme>=1.2 -myst-parser>=2.0 - From d382620de4523588fd441da898d98d567754c6b6 Mon Sep 17 00:00:00 2001 From: Christophe Demko Date: Sun, 21 Jan 2024 22:23:02 +0100 Subject: [PATCH 5/5] Use sphinx_rtd_theme --- docs/conf.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 60a8d4f..b2dc1b8 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -84,11 +84,8 @@ # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. # -if not on_rtd: # only import and set the theme if we're building docs locally - import sphinx_rtd_theme - html_theme = "sphinx_rtd_theme" - html_theme_path = [sphinx_rtd_theme.get_html_theme_path()] +html_theme = "sphinx_rtd_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