Remove build: skip to enable later libarrow versions (cont'd) (#832)

automerged PR by conda-forge/automerge-action

.ci_support/linux_64_.yaml

@@ -1,8 +1,3 @@
-arrow_cpp:
-- 10.0.1
-- 11.0.0
-- '12'
-- '13'
 c_compiler:
 - gcc
 c_compiler_version:
@@ -43,6 +38,11 @@ lerc:
 - '4'
 libarchive:
 - '3.7'
+libarrow:
+- 10.0.1
+- 11.0.0
+- '12'
+- '13'
 libcurl:
 - '8'
 libdeflate:

.ci_support/linux_aarch64_.yaml

@@ -1,10 +1,5 @@
 BUILD:
 - aarch64-conda_cos7-linux-gnu
-arrow_cpp:
-- 10.0.1
-- 11.0.0
-- '12'
-- '13'
 c_compiler:
 - gcc
 c_compiler_version:
@@ -47,6 +42,11 @@ lerc:
 - '4'
 libarchive:
 - '3.7'
+libarrow:
+- 10.0.1
+- 11.0.0
+- '12'
+- '13'
 libcurl:
 - '8'
 libdeflate:

.ci_support/linux_ppc64le_.yaml

@@ -1,8 +1,3 @@
-arrow_cpp:
-- 10.0.1
-- 11.0.0
-- '12'
-- '13'
 c_compiler:
 - gcc
 c_compiler_version:
@@ -43,6 +38,11 @@ lerc:
 - '4'
 libarchive:
 - '3.7'
+libarrow:
+- 10.0.1
+- 11.0.0
+- '12'
+- '13'
 libcurl:
 - '8'
 libdeflate:

.ci_support/osx_64_.yaml

@@ -1,10 +1,5 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.9'
-arrow_cpp:
-- 10.0.1
-- 11.0.0
-- '12'
-- '13'
 c_compiler:
 - clang
 c_compiler_version:
@@ -41,6 +36,11 @@ lerc:
 - '4'
 libarchive:
 - '3.7'
+libarrow:
+- 10.0.1
+- 11.0.0
+- '12'
+- '13'
 libcurl:
 - '8'
 libdeflate:

.ci_support/osx_arm64_.yaml

@@ -1,10 +1,5 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '11.0'
-arrow_cpp:
-- 10.0.1
-- 11.0.0
-- '12'
-- '13'
 c_compiler:
 - clang
 c_compiler_version:
@@ -41,6 +36,11 @@ lerc:
 - '4'
 libarchive:
 - '3.7'
+libarrow:
+- 10.0.1
+- 11.0.0
+- '12'
+- '13'
 libcurl:
 - '8'
 libdeflate:

.ci_support/win_64_.yaml

@@ -1,8 +1,3 @@
-arrow_cpp:
-- 10.0.1
-- 11.0.0
-- '12'
-- '13'
 c_compiler:
 - vs2019
 cfitsio:
@@ -31,6 +26,11 @@ lerc:
 - '4'
 libarchive:
 - '3.7'
+libarrow:
+- 10.0.1
+- 11.0.0
+- '12'
+- '13'
 libcurl:
 - '8'
 libdeflate:

recipe/build_arrow_parquet.bat

@@ -1,6 +1,10 @@
 cd build
 if errorlevel 1 exit 1
 
+REM Remove build artifacts potentially generated with a different libarrow version
+rmdir ogr\ogrsf_frmts\arrow /s /q
+rmdir ogr\ogrsf_frmts\parquet /s /q
+
 REM We reuse the same build directory as libgdal, so we just to have to
 REM turn on the required dependency and drivers
 cmake -DBUILD_PYTHON_BINDINGS:BOOL=OFF ^

recipe/build_arrow_parquet.sh

@@ -4,6 +4,10 @@ set -ex # Abort on error.
 
 cd build
 
+# Remove build artifacts potentially generated with a different libarrow version
+rm -rf ogr/ogrsf_frmts/arrow
+rm -rf ogr/ogrsf_frmts/parquet
+
 # We reuse the same build directory as libgdal, so we just to have to
 # turn on the required dependency and drivers
 cmake -DBUILD_PYTHON_BINDINGS:BOOL=OFF \

recipe/meta.yaml

@@ -9,7 +9,7 @@ source:
   sha256: e0a6f0c453ea7eb7c09967f50ac49426808fcd8f259dbc9888140eb69d7ffee6
 
 build:
-  number: 0
+  number: 1
   skip_compile_pyc:
     - share/bash-completion/completions/*.py
 
@@ -155,9 +155,6 @@ outputs:
   - name: libgdal-arrow-parquet
     script: build_arrow_parquet.sh  # [unix]
     script: build_arrow_parquet.bat  # [win]
-    build:
-      # only for libarrow > 10
-      skip: true  # [arrow_cpp != "10.0.1"]
     requirements:
       build:
         - cmake
@@ -184,8 +181,8 @@ outputs:
         - libjpeg-turbo
         - json-c  # [not win]
         - kealib
-        - arrow-cpp
         - libarchive
+        - libarrow
         - libkml
         - libnetcdf
         - libpng