From 35b521badacc2fb711c18ce478bf148d32ec9d2e Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Wed, 31 Jul 2024 17:14:18 +0200 Subject: [PATCH] CI: explicitly install setuptools for Conda based builds --- .github/workflows/cmake_builds.yml | 4 ++-- ci/travis/conda/meta.yaml.patch | 12 ++++++++++++ ci/travis/conda/setup.sh | 2 ++ ci/travis/osx/before_install.sh | 2 +- 4 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 ci/travis/conda/meta.yaml.patch diff --git a/.github/workflows/cmake_builds.yml b/.github/workflows/cmake_builds.yml index 7dd430062a70..abe744ca77c9 100644 --- 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 new file mode 100644 index 000000000000..1e65948918a6 --- /dev/null +++ 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 index b4cd637babee..44da66498178 100755 --- 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 <