From 27ee7d4e2973d9603f08658fab8921dd754d99a1 Mon Sep 17 00:00:00 2001 From: George Pchelkin Date: Sun, 13 Oct 2024 22:24:36 +0100 Subject: [PATCH] fix docs build --- .readthedocs.yml | 2 +- poetry.lock | 24 ++++++++++++++---------- pyproject.toml | 5 ++++- requirements-dev.txt | 2 +- requirements-docs.txt | 4 ++-- 5 files changed, 22 insertions(+), 15 deletions(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index ee61abd2..9fac75d7 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -6,7 +6,7 @@ version: 2 build: os: ubuntu-24.04 tools: - python: '3.13' + python: '3.12' python: install: diff --git a/poetry.lock b/poetry.lock index 81bba289..a8d771df 100644 --- a/poetry.lock +++ b/poetry.lock @@ -820,13 +820,13 @@ files = [ [[package]] name = "docutils" -version = "0.21.2" +version = "0.20.1" description = "Docutils -- Python Documentation Utilities" optional = false -python-versions = ">=3.9" +python-versions = ">=3.7" files = [ - {file = "docutils-0.21.2-py3-none-any.whl", hash = "sha256:dafca5b9e384f0e419294eb4d2ff9fa826435bf15f15b7bd45723e8ad76811b2"}, - {file = "docutils-0.21.2.tar.gz", hash = "sha256:3a6b18732edf182daa3cd12775bbb338cf5691468f91eeeb109deff6ebfa986f"}, + {file = "docutils-0.20.1-py3-none-any.whl", hash = "sha256:96f387a2c5562db4476f09f13bbab2192e764cac08ebbf3a34a95d9b1e4a59d6"}, + {file = "docutils-0.20.1.tar.gz", hash = "sha256:f08a4e276c3a1583a86dce3e34aba3fe04d02bba2dd51ed16106244e8a923e3b"}, ] [[package]] @@ -1430,15 +1430,19 @@ version = "0.3.3.post2" description = "Markdown and reStructuredText in a single file." optional = false python-versions = ">=3.7" -files = [ - {file = "m2r2-0.3.3.post2-py3-none-any.whl", hash = "sha256:86157721eb6eabcd54d4eea7195890cc58fa6188b8d0abea633383cfbb5e11e3"}, - {file = "m2r2-0.3.3.post2.tar.gz", hash = "sha256:e62bcb0e74b3ce19cda0737a0556b04cf4a43b785072fcef474558f2c1482ca8"}, -] +files = [] +develop = false [package.dependencies] -docutils = ">=0.19" +docutils = ">=0.19,<0.21" mistune = "0.8.4" +[package.source] +type = "git" +url = "https://github.com/adrien-berchet/m2r2.git" +reference = "patch-1" +resolved_reference = "d8e4f6e567dfe2452070c031a6e1d47046ac8ddf" + [[package]] name = "markdown-it-py" version = "3.0.0" @@ -3225,4 +3229,4 @@ type = ["pytest-mypy"] [metadata] lock-version = "2.0" python-versions = "^3.9" -content-hash = "91d7435d86034bc1430e556f96277cd7ec6393a2db0e1917a91638bcd291df7d" +content-hash = "da2756bb1658ae4c3a2abcd342fead5a96959996c365a1c5a9859c41cebba6a3" diff --git a/pyproject.toml b/pyproject.toml index dab77896..c67477c0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -107,7 +107,10 @@ optional = true [tool.poetry.group.docs.dependencies] sphinx = "^7.4" sphinx-autodoc-typehints = "^2.3.0" -m2r2 = "^0.3" +#m2r2 = "^0.3" +# https://github.com/CrossNox/m2r2/issues/68 +# https://github.com/CrossNox/m2r2/pull/69 +m2r2 = { git = "https://github.com/adrien-berchet/m2r2.git", branch = "patch-1" } tomli = "^2.0" recommonmark = "^0.7" typing-extensions = "^4.9" diff --git a/requirements-dev.txt b/requirements-dev.txt index ffb5ffd4..a991b04f 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -16,7 +16,7 @@ cryptography==43.0.1 ; python_version >= "3.9" and python_version < "4.0" darglint==1.8.1 ; python_version >= "3.9" and python_version < "4.0" dictdiffer==0.9.0 ; python_version >= "3.9" and python_version < "4.0" doc8==1.1.2 ; python_version >= "3.9" and python_version < "4.0" -docutils==0.21.2 ; python_version >= "3.9" and python_version < "4.0" +docutils==0.20.1 ; python_version >= "3.9" and python_version < "4.0" dparse==0.6.4b0 ; python_version >= "3.9" and python_version < "4.0" dpath==2.2.0 ; python_version >= "3.9" and python_version < "4.0" eradicate==2.3.0 ; python_version >= "3.9" and python_version < "4.0" diff --git a/requirements-docs.txt b/requirements-docs.txt index c8f6fdbb..27a56ee4 100644 --- a/requirements-docs.txt +++ b/requirements-docs.txt @@ -4,12 +4,12 @@ certifi==2024.8.30 ; python_version >= "3.9" and python_version < "4.0" charset-normalizer==3.4.0 ; python_version >= "3.9" and python_version < "4.0" colorama==0.4.6 ; python_version >= "3.9" and python_version < "4.0" and sys_platform == "win32" commonmark==0.9.1 ; python_version >= "3.9" and python_version < "4.0" -docutils==0.21.2 ; python_version >= "3.9" and python_version < "4.0" +docutils==0.20.1 ; python_version >= "3.9" and python_version < "4.0" idna==3.10 ; python_version >= "3.9" and python_version < "4.0" imagesize==1.4.1 ; python_version >= "3.9" and python_version < "4.0" importlib-metadata==8.5.0 ; python_version >= "3.9" and python_version < "3.10" jinja2==3.1.4 ; python_version >= "3.9" and python_version < "4.0" -m2r2==0.3.3.post2 ; python_version >= "3.9" and python_version < "4.0" +m2r2 @ git+https://github.com/adrien-berchet/m2r2.git@d8e4f6e567dfe2452070c031a6e1d47046ac8ddf ; python_version >= "3.9" and python_version < "4.0" markupsafe==3.0.1 ; python_version >= "3.9" and python_version < "4.0" mistune==0.8.4 ; python_version >= "3.9" and python_version < "4.0" packaging==24.1 ; python_version >= "3.9" and python_version < "4.0"