Skip to content

Commit 1bda530

Browse files
committed
Install workflows from conda-forge in container
Revert temporary installation of workflows from pip in the Dockerfile, which was briefly required while workflows=3.5 was not available on conda-forge, but is now available. Bump the version of workflows required in requirements.conda.txt to 3.5.
1 parent eace335 commit 1bda530

2 files changed

Lines changed: 2 additions & 3 deletions

File tree

Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ RUN source /dials/dials \
1313
RUN source /dials/dials \
1414
&& sed -i'' 's|libtbx.conda|/dials/conda_base/condabin/conda|' "/dials/modules/dlstbx/src/dlstbx/requirements.py" \
1515
&& libtbx.python /dials/modules/dlstbx/contrib/candygram.py dials dials_data dials_research dlstbx dxtbx fast_dp screen19 sphinx xia2 zocalo \
16-
&& conda install -y --file=/dials/modules/dlstbx/requirements.conda.txt \
17-
&& pip install "workflows>=3.5"
16+
&& conda install -y --file=/dials/modules/dlstbx/requirements.conda.txt
1817

1918
CMD ["dials.version"]

requirements.conda.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ pyzmq
2323
seaborn
2424
sqlalchemy>=2.0.39,<3
2525
stomp.py>=7,<9
26-
workflows>=3.3
26+
workflows>=3.5
2727
xmltodict
2828
zocalo>=1.4.0

0 commit comments

Comments
 (0)