From d53ab580def67f5e58ae8036041a9036df9c5edc Mon Sep 17 00:00:00 2001 From: Manuel Giffels Date: Fri, 11 Aug 2023 18:34:37 +0200 Subject: [PATCH 1/3] Change readthedocs python version --- .readthedocs.yml | 6 +++++- docs/source/changelog.rst | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index 692ff725..2d3ad411 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -1,7 +1,11 @@ version: 2 +build: + os: ubuntu-22.04 + tools: + python: "3.11" + python: - version: 3 install: - method: pip path: . diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst index b74122a0..e134b85f 100644 --- a/docs/source/changelog.rst +++ b/docs/source/changelog.rst @@ -1,4 +1,4 @@ -.. Created by changelog.py at 2023-08-10, command +.. Created by changelog.py at 2023-08-11, command '/Users/giffler/.cache/pre-commit/repor6pnmwlm/py_env-python3.10/bin/changelog docs/source/changes compile --categories Added Changed Fixed Security Deprecated --output=docs/source/changelog.rst' based on the format of 'https://keepachangelog.com/' @@ -6,7 +6,7 @@ CHANGELOG ######### -[Unreleased] - 2023-07-31 +[Unreleased] - 2023-08-11 ========================= Deprecated From 060ec3b27ae76be781acb27e7b5539e7b769dc1a Mon Sep 17 00:00:00 2001 From: Manuel Giffels Date: Fri, 11 Aug 2023 18:44:10 +0200 Subject: [PATCH 2/3] Use sphinx<7 otherwise build is failing on readthedocs --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 1fd2b4e3..bbd6820b 100644 --- a/setup.py +++ b/setup.py @@ -99,7 +99,7 @@ def get_cryptography_version(): ], extras_require={ "docs": [ - "sphinx", + "sphinx<7", "sphinx_rtd_theme", "sphinxcontrib-contentui", "myst_parser", From daecc9327719a3a0f6d94b023d4fc3970efe8d65 Mon Sep 17 00:00:00 2001 From: Manuel Giffels Date: Mon, 14 Aug 2023 11:05:32 +0200 Subject: [PATCH 3/3] Fixing rendering issue with two columns in rtd --- docs/source/changelog.rst | 4 ++-- setup.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst index e134b85f..a9b6a850 100644 --- a/docs/source/changelog.rst +++ b/docs/source/changelog.rst @@ -1,4 +1,4 @@ -.. Created by changelog.py at 2023-08-11, command +.. Created by changelog.py at 2023-08-14, command '/Users/giffler/.cache/pre-commit/repor6pnmwlm/py_env-python3.10/bin/changelog docs/source/changes compile --categories Added Changed Fixed Security Deprecated --output=docs/source/changelog.rst' based on the format of 'https://keepachangelog.com/' @@ -6,7 +6,7 @@ CHANGELOG ######### -[Unreleased] - 2023-08-11 +[Unreleased] - 2023-08-14 ========================= Deprecated diff --git a/setup.py b/setup.py index bbd6820b..8adba146 100644 --- a/setup.py +++ b/setup.py @@ -99,7 +99,8 @@ def get_cryptography_version(): ], extras_require={ "docs": [ - "sphinx<7", + "docutils<0.17", # fixes rendering issue with two column layout + "sphinx", "sphinx_rtd_theme", "sphinxcontrib-contentui", "myst_parser",