Bump dependencies and use normal workflows version

Ensures that tracing functionality will be picked up from newer versions
of workflows and zocalo. Dockerfile was set to install from a specific
branch of workflows for some diagnostic purposes, which is no longer
needed. Workflows will now be installed along with the other
dependencies from requirements.conda.txt in the image build.

Author: pblowey

Dockerfile

@@ -13,7 +13,6 @@ RUN source /dials/dials \
 RUN source /dials/dials \
   && sed -i'' 's|libtbx.conda|/dials/conda_base/condabin/conda|' "/dials/modules/dlstbx/src/dlstbx/requirements.py" \
   && libtbx.python /dials/modules/dlstbx/contrib/candygram.py  dials dials_data dials_research dlstbx dxtbx fast_dp screen19 sphinx xia2 zocalo \
-  && conda install -y --file=/dials/modules/dlstbx/requirements.conda.txt python-relion \
-  && pip3 install git+https://github.com/DiamondLightSource/python-workflows@diag_emptyheader
+  && conda install -y --file=/dials/modules/dlstbx/requirements.conda.txt python-relion 
 
 CMD ["dials.version"]

requirements.conda.txt

@@ -24,6 +24,6 @@ pyzmq
 seaborn
 sqlalchemy>=2.0.39,<3
 stomp.py>=7,<9
-workflows>=2.19
+workflows>=3.3
 xmltodict
-zocalo>=1.3.0
+zocalo>=1.4.0