diff --git a/ci/travis/conda/meta.yaml.patch b/ci/travis/conda/meta.yaml.patch deleted file mode 100644 index 96047817d95b..000000000000 --- a/ci/travis/conda/meta.yaml.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/recipe/meta.yaml b/recipe/meta.yaml -index f3afcef..eb825ae 100644 ---- a/recipe/meta.yaml -+++ b/recipe/meta.yaml -@@ -31,6 +31,7 @@ requirements: - - {{ stdlib("c") }} - - {{ compiler('cxx') }} - - swig -+ - setuptools - host: - - blosc - - expat -@@ -614,6 +615,7 @@ outputs: - - python # [build_platform != target_platform] - - cross-python_{{ target_platform }} # [build_platform != target_platform] - - numpy # [build_platform != target_platform] -+ - setuptools - - swig - host: - - python -@@ -623,6 +625,7 @@ outputs: - - libkml-devel - - libxml2 - - expat -+ - setuptools - run: - - python - - libgdal-core {{ version }}.* diff --git a/ci/travis/conda/setup.sh b/ci/travis/conda/setup.sh index 7101ef18cb11..2989fe47ef37 100755 --- a/ci/travis/conda/setup.sh +++ b/ci/travis/conda/setup.sh @@ -19,7 +19,6 @@ git clone https://github.com/conda-forge/gdal-feedstock.git cd gdal-feedstock -patch -p1 < ../ci/travis/conda/meta.yaml.patch patch -p1 < ../ci/travis/conda/install_python.sh.patch cat > recipe/recipe_clobber.yaml <