From 346b0ec90512aef0c3bc453d57de12822bf66b58 Mon Sep 17 00:00:00 2001 From: Nok Lam Chan Date: Mon, 16 Oct 2023 16:50:42 +0100 Subject: [PATCH 1/6] Update makefile to pin pip version to fix nightly CI --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index a300c3167e..2fb79ff52f 100644 --- a/Makefile +++ b/Makefile @@ -50,6 +50,7 @@ package: clean install python -m pip install build && python -m build install-test-requirements: + python -m pip install -U "pip>=21.2,<23.2" pip install .[test] install-pre-commit: install-test-requirements From 91116845ba1c282318e3c79a0065b2784e0c7fb0 Mon Sep 17 00:00:00 2001 From: Nok Date: Mon, 16 Oct 2023 16:02:41 +0000 Subject: [PATCH 2/6] Add more comments Signed-off-by: Nok --- Makefile | 2 ++ features/environment.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2fb79ff52f..03f37573de 100644 --- a/Makefile +++ b/Makefile @@ -50,6 +50,8 @@ package: clean install python -m pip install build && python -m build install-test-requirements: +# pip==23.2 breaks pip-tools<7.0, and pip-tools>=7.0 does not support Python 3.7 +# pip==23.3 breaks dependency resolution python -m pip install -U "pip>=21.2,<23.2" pip install .[test] diff --git a/features/environment.py b/features/environment.py index ea51cc9a56..820d3fb0bd 100644 --- a/features/environment.py +++ b/features/environment.py @@ -104,8 +104,8 @@ def _setup_minimal_env(context): "install", "-U", # pip==23.2 breaks pip-tools<7.0, and pip-tools>=7.0 does not support Python 3.7 - "pip>=21.2,<23.2; python_version < '3.8'", - "pip>=21.2; python_version >= '3.8'", + # pip==23.3 breaks dependency resolution + "pip>=21.2,<23.2" ], env=context.env, ) From af3b8ed5008d3b412bc51d18adfecb278748ef28 Mon Sep 17 00:00:00 2001 From: Nok Date: Mon, 16 Oct 2023 16:07:45 +0000 Subject: [PATCH 3/6] Update pip for RTD Signed-off-by: Nok --- .readthedocs.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.readthedocs.yml b/.readthedocs.yml index 2435aac483..b6772e4cb1 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -16,6 +16,9 @@ build: post_create_environment: - npm install -g @mermaid-js/mermaid-cli pre_build: + # pip==23.2 breaks pip-tools<7.0, and pip-tools>=7.0 does not support Python 3.7 + # pip==23.3 breaks dependency resolution + - python -m pip install -U "pip>=21.2,<23.2" - pip freeze - python -m sphinx -WETan -j auto -D language=en -b linkcheck -d _build/doctrees docs/source _build/linkcheck From 8628b60aae47cab0402827146b9c169882c36d8b Mon Sep 17 00:00:00 2001 From: Nok Date: Mon, 16 Oct 2023 16:23:09 +0000 Subject: [PATCH 4/6] update RTD build Signed-off-by: Nok --- .readthedocs.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index b6772e4cb1..260a0edc73 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -15,10 +15,11 @@ build: jobs: post_create_environment: - npm install -g @mermaid-js/mermaid-cli - pre_build: + pre_install: # pip==23.2 breaks pip-tools<7.0, and pip-tools>=7.0 does not support Python 3.7 # pip==23.3 breaks dependency resolution - python -m pip install -U "pip>=21.2,<23.2" + pre_build: - pip freeze - python -m sphinx -WETan -j auto -D language=en -b linkcheck -d _build/doctrees docs/source _build/linkcheck From b5c68b634cb57e756826f479908b180153f25b1b Mon Sep 17 00:00:00 2001 From: Nok Date: Mon, 16 Oct 2023 16:28:45 +0000 Subject: [PATCH 5/6] hijack the pre_install steps Signed-off-by: Nok --- .readthedocs.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index 260a0edc73..037b2ed597 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -19,6 +19,9 @@ build: # pip==23.2 breaks pip-tools<7.0, and pip-tools>=7.0 does not support Python 3.7 # pip==23.3 breaks dependency resolution - python -m pip install -U "pip>=21.2,<23.2" + # These are technically installation steps, due to RTD's limit we need to inject the installation earlier. + - python -m pip install --upgrade --no-cache-dir sphinx readthedocs-sphinx-ext + - python -m pip install --upgrade --upgrade-strategy only-if-needed --no-cache-dir .[docs,test] pre_build: - pip freeze - python -m sphinx -WETan -j auto -D language=en -b linkcheck -d _build/doctrees docs/source _build/linkcheck @@ -34,10 +37,10 @@ sphinx: # configuration: mkdocs.yml # Optionally set the version of Python and requirements required to build your docs -python: - install: - - method: pip - path: . - extra_requirements: - - docs - - test +# python: +# install: +# - method: pip +# path: . +# extra_requirements: +# - docs +# - test From d369f47da1ef1c91f4b03be81906685eb53d9042 Mon Sep 17 00:00:00 2001 From: Nok Date: Mon, 16 Oct 2023 16:42:44 +0000 Subject: [PATCH 6/6] Fix linting Signed-off-by: Nok --- features/environment.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/environment.py b/features/environment.py index 820d3fb0bd..b648767a0f 100644 --- a/features/environment.py +++ b/features/environment.py @@ -105,7 +105,7 @@ def _setup_minimal_env(context): "-U", # pip==23.2 breaks pip-tools<7.0, and pip-tools>=7.0 does not support Python 3.7 # pip==23.3 breaks dependency resolution - "pip>=21.2,<23.2" + "pip>=21.2,<23.2", ], env=context.env, )