From b72e8650fbce4924ad2a91fad13e10d5613f7a9b Mon Sep 17 00:00:00 2001 From: PrinceWalnut Date: Wed, 22 Nov 2023 17:58:42 -0500 Subject: [PATCH] Updated setuptools to minimum required version for DIALS before DIALS install --- .github/workflows/build_docs.yml | 2 +- .github/workflows/publish.yml | 2 +- .github/workflows/test_build_docs.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_docs.yml b/.github/workflows/build_docs.yml index 1d9972d..2b84d02 100644 --- a/.github/workflows/build_docs.yml +++ b/.github/workflows/build_docs.yml @@ -28,7 +28,6 @@ jobs: run: | source $CONDA/etc/profile.d/conda.sh conda activate - conda update setuptools which python python --version echo $CONDA @@ -40,6 +39,7 @@ jobs: - name: Install DIALS environment and more run: | + conda install setuptools>=68.2.2 conda install -n base -c conda-forge -y dials conda info conda list diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index f4bbdaf..8d7b938 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -23,7 +23,6 @@ jobs: run: | source $CONDA/etc/profile.d/conda.sh conda activate - conda update setuptools which python python --version echo $CONDA @@ -35,6 +34,7 @@ jobs: - name: Install DIALS environment and all dependencies run: | + conda install setuptools>=68.2.2 conda install -n base -c conda-forge -y dials pip install -e ".[docs]" cd docs diff --git a/.github/workflows/test_build_docs.yml b/.github/workflows/test_build_docs.yml index 7e684d6..70785dc 100644 --- a/.github/workflows/test_build_docs.yml +++ b/.github/workflows/test_build_docs.yml @@ -28,7 +28,6 @@ jobs: run: | source $CONDA/etc/profile.d/conda.sh conda activate - conda update setuptools which python python --version echo $CONDA @@ -40,6 +39,7 @@ jobs: - name: Install DIALS environment and more run: | + conda install setuptools>=68.2.2 conda install -n base -c conda-forge -y dials conda info conda list