From 0b7e602146bec15c94f26d59e2f949692bb79fc7 Mon Sep 17 00:00:00 2001 From: fabcor Date: Mon, 5 Feb 2024 14:23:43 +0100 Subject: [PATCH 1/2] Fix ReadTheDocs configuration Use the `--force` flag of `mamba env create` in case environment exists. Skip `poetry run` when running `sphinx-build` since Poetry installs in the conda environment directly. Remove the workaround for the unwarranted error about "missing `conda.environment`" configuration setting, because it has been fixed already. See: * https://github.com/readthedocs/readthedocs.org/pull/10979#issuecomment-1896036953 * https://github.com/readthedocs/readthedocs.org/pull/11040 --- .readthedocs.yaml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index e800d4add7..8cc32bd066 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -20,15 +20,9 @@ build: python: "mambaforge-22.9" commands: - - "mamba env create --file conda-environment-dev.yml" + - "mamba env create --file conda-environment-dev.yml --force" - "mamba run --name mxcubecore poetry install --only=docs,main" - - "mamba run --name mxcubecore poetry run sphinx-build -T -E -b html -c ./docs/ ./docs/source/ ${READTHEDOCS_OUTPUT}/html/" - -# `conda.environment` is probably not used, since we use custom commands only, -# but it seems to be required (wrongly) by ReadTheDocs config file validation. -# https://github.com/readthedocs/readthedocs.org/pull/10979#issuecomment-1896036953 -conda: - environment: "conda-environment-dev.yml" + - "mamba run --name mxcubecore sphinx-build -T -E -b html -c ./docs/ ./docs/source/ ${READTHEDOCS_OUTPUT}/html/" ... # EOF From b3a3cf46413535f1b36e9f6e6309abb21771f529 Mon Sep 17 00:00:00 2001 From: Marcus Oskarsson Date: Mon, 5 Feb 2024 14:01:51 +0000 Subject: [PATCH 2/2] [skip ci] Bumped minor version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 7f62874eab..2dd7064286 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "mxcubecore" -version = "1.68.0" +version = "1.69.0" license = "LGPL-3.0-or-later" description = "Core libraries for the MXCuBE application" authors = ["The MXCuBE collaboration "]