Updated setuptools to minimum required version for DIALS before DIALS…

… install
rs-station · Nov 22, 2023 · b72e865 · b72e865
1 parent 2009bb1
commit b72e865
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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