Skip to content

Commit

Permalink
Fix ReadTheDocs configuration
Browse files Browse the repository at this point in the history
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
  • Loading branch information
fabcor-maxiv committed Feb 7, 2024
1 parent b9d2e9a commit 0cad2f5
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,9 @@ build:
python: "mambaforge-22.9"

commands:
- "mamba env create --file conda-environment.yml"
- "mamba env create --file conda-environment.yml --force"
- "mamba run --name mxcubeweb poetry install --only=docs,main"
- "(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"

# `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"

... # EOF

0 comments on commit 0cad2f5

Please sign in to comment.