Skip to content

Commit 0cad2f5

Browse files
committed
Fix ReadTheDocs configuration
Use the `--force` flag of `mamba env create` in case environment exists. Remove the workaround for the unwarranted error about "missing `conda.environment`" configuration setting, because it has been fixed already. See: * readthedocs/readthedocs.org#10979 (comment) * readthedocs/readthedocs.org#11040
1 parent b9d2e9a commit 0cad2f5

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

.readthedocs.yaml

+1-6
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,9 @@ build:
2020
python: "mambaforge-22.9"
2121

2222
commands:
23-
- "mamba env create --file conda-environment.yml"
23+
- "mamba env create --file conda-environment.yml --force"
2424
- "mamba run --name mxcubeweb poetry install --only=docs,main"
2525
- "(mamba run --name mxcubeweb redis-server &) && mamba run --name mxcubeweb python -m sphinx -T -E -b html -d _build/doctrees -c docs docs/source ${READTHEDOCS_OUTPUT}/html && mamba run --name mxcubeweb redis-cli shutdown"
2626

27-
# `conda.environment` is probably not used, since we use custom commands only,
28-
# but it seems to be required (wrongly) by ReadTheDocs config file validation.
29-
# https://github.com/readthedocs/readthedocs.org/pull/10979#issuecomment-1896036953
30-
conda:
31-
environment: "conda-environment-dev.yml"
3227

3328
... # EOF

0 commit comments

Comments
 (0)