CI: explicitly install setuptools for Conda based builds

rouault · Jul 31, 2024 · 35b521b · 35b521b
1 parent c95081c
commit 35b521b
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/.github/workflows/cmake_builds.yml b/.github/workflows/cmake_builds.yml
@@ -422,7 +422,7 @@ jobs:
     - name: Install dependency
       shell: bash -l {0}
       run: |
-        conda install --yes --quiet curl libiconv icu python=3.10 swig numpy pytest pytest-env pytest-benchmark filelock zlib lxml jsonschema
+        conda install --yes --quiet curl libiconv icu python=3.10 swig numpy pytest pytest-env pytest-benchmark filelock zlib lxml jsonschema setuptools
         # FIXME: remove libnetcdf=4.9.2=nompi_h5902ca5_107 pinning as soon as https://github.com/conda-forge/libnetcdf-feedstock/issues/182 is resolved
         conda install --yes --quiet proj geos hdf4 hdf5 kealib \
             libnetcdf=4.9.2=nompi_h5902ca5_107 openjpeg poppler libtiff libpng xerces-c expat libxml2 kealib json-c \
@@ -519,7 +519,7 @@ jobs:
     - name: Install dependency
       shell: bash -l {0}
       run: |
-        conda install --yes --quiet proj pytest pytest-env pytest-benchmark filelock lxml cmake
+        conda install --yes --quiet proj pytest pytest-env pytest-benchmark filelock lxml cmake setuptools
     - name: Check CMake version
       shell: bash -l {0}
       run: |

diff --git a/ci/travis/conda/meta.yaml.patch b/ci/travis/conda/meta.yaml.patch
@@ -0,0 +1,12 @@
+diff --git a/recipe/meta.yaml b/recipe/meta.yaml
+index f3afcef..cb85f50 100644
+--- a/recipe/meta.yaml
++++ b/recipe/meta.yaml
+@@ -614,6 +614,7 @@ outputs:
+         - python                                 # [build_platform != target_platform]
+         - cross-python_{{ target_platform }}     # [build_platform != target_platform]
+         - numpy                                  # [build_platform != target_platform]
++        - setuptools
+         - swig
+       host:
+         - python
diff --git a/ci/travis/conda/setup.sh b/ci/travis/conda/setup.sh
@@ -19,6 +19,8 @@ git clone  https://github.com/conda-forge/gdal-feedstock.git
 
 cd gdal-feedstock
 
+patch -p1 < ../ci/travis/conda/meta.yaml.patch
+
 cat > recipe/recipe_clobber.yaml <<EOL
 source:
   path: ../../../gdal

diff --git a/ci/travis/osx/before_install.sh b/ci/travis/osx/before_install.sh
@@ -6,7 +6,7 @@ conda update -n base -c defaults conda
 conda install -y compilers automake pkgconfig cmake
 
 conda config --set channel_priority strict
-conda install --yes --quiet proj python=3.12 swig lxml jsonschema numpy
+conda install --yes --quiet proj python=3.12 swig lxml jsonschema numpy setuptools
 conda install --yes --quiet libgdal libgdal-arrow-parquet
 # Now remove all libgdal* packages, but not their dependencies
 conda remove --yes --force $(conda list libgdal | grep libgdal | awk '{print $1}')