Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/develop' into develop
Browse files Browse the repository at this point in the history
TangoShutter class: dropping json for literal_eval and other changes
  • Loading branch information
Costin committed Feb 6, 2024
2 parents 670efc0 + b3a3cf4 commit 15a282e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
10 changes: 2 additions & 8 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>"]
Expand Down

0 comments on commit 15a282e

Please sign in to comment.