From b254388672ad9105b647ec725441dbf4d8688c4f Mon Sep 17 00:00:00 2001 From: davemfish Date: Fri, 10 May 2024 12:59:53 -0400 Subject: [PATCH 1/3] use pip-upgrade-only-if-needed flag. #1575 --- .readthedocs_environment.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.readthedocs_environment.yml b/.readthedocs_environment.yml index ef61a90b8..39eeeb066 100644 --- a/.readthedocs_environment.yml +++ b/.readthedocs_environment.yml @@ -14,6 +14,6 @@ dependencies: - gdal>=3.4.2 - pip - pip: - - -r requirements.txt - - -r requirements-dev.txt - - -r requirements-docs.txt + - -r --upgrade-strategy=only-if-needed requirements.txt + - -r --upgrade-strategy=only-if-needed requirements-dev.txt + - -r --upgrade-strategy=only-if-needed requirements-docs.txt From cfdd43c4365bca42c0cb9552e04626dc63a307f5 Mon Sep 17 00:00:00 2001 From: davemfish Date: Fri, 10 May 2024 13:04:38 -0400 Subject: [PATCH 2/3] wrong syntax in pip command. #1576 --- .readthedocs_environment.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.readthedocs_environment.yml b/.readthedocs_environment.yml index 39eeeb066..e5b6bd738 100644 --- a/.readthedocs_environment.yml +++ b/.readthedocs_environment.yml @@ -14,6 +14,6 @@ dependencies: - gdal>=3.4.2 - pip - pip: - - -r --upgrade-strategy=only-if-needed requirements.txt - - -r --upgrade-strategy=only-if-needed requirements-dev.txt - - -r --upgrade-strategy=only-if-needed requirements-docs.txt + - --upgrade-strategy=only-if-needed -r requirements.txt + - --upgrade-strategy=only-if-needed -r requirements-dev.txt + - --upgrade-strategy=only-if-needed -r requirements-docs.txt From 4910dec5f1916da329fba112eae41ecac006daf7 Mon Sep 17 00:00:00 2001 From: davemfish Date: Fri, 10 May 2024 13:19:51 -0400 Subject: [PATCH 3/3] use the RTD jobs.post_create_environment hook to call pip directly. #1575 --- .readthedocs.yml | 4 ++++ .readthedocs_environment.yml | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index eba6cf0b4..e3f13fa6a 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -18,5 +18,9 @@ build: tools: python: "mambaforge-4.10" jobs: + post_create_environment: + - pip install --upgrade-strategy=only-if-needed -r requirements.txt + - pip install --upgrade-strategy=only-if-needed -r requirements-dev.txt + - pip install --upgrade-strategy=only-if-needed -r requirements-docs.txt post_install: - make install diff --git a/.readthedocs_environment.yml b/.readthedocs_environment.yml index e5b6bd738..2f2a2de84 100644 --- a/.readthedocs_environment.yml +++ b/.readthedocs_environment.yml @@ -13,7 +13,3 @@ dependencies: - python=3.11 - gdal>=3.4.2 - pip -- pip: - - --upgrade-strategy=only-if-needed -r requirements.txt - - --upgrade-strategy=only-if-needed -r requirements-dev.txt - - --upgrade-strategy=only-if-needed -r requirements-docs.txt