update patch for gcs_server & gcsfs fixtures

.ci_support/linux_64_cuda_compiler_versionNoneopenssl1.1.1.yaml

@@ -7,7 +7,7 @@ c_ares:
 c_compiler:
 - gcc
 c_compiler_version:
-- '10'
+- '11'
 cdt_name:
 - cos6
 channel_sources:
@@ -23,7 +23,7 @@ cuda_compiler_version_min:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '10'
+- '11'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 gflags:

.ci_support/linux_64_cuda_compiler_versionNoneopenssl3.yaml

@@ -7,7 +7,7 @@ c_ares:
 c_compiler:
 - gcc
 c_compiler_version:
-- '10'
+- '11'
 cdt_name:
 - cos6
 channel_sources:
@@ -23,7 +23,7 @@ cuda_compiler_version_min:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '10'
+- '11'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 gflags:

.ci_support/linux_aarch64_cuda_compiler_versionNoneopenssl1.1.1.yaml

@@ -9,7 +9,7 @@ c_ares:
 c_compiler:
 - gcc
 c_compiler_version:
-- '10'
+- '11'
 cdt_arch:
 - aarch64
 cdt_name:
@@ -23,7 +23,7 @@ cuda_compiler_version:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '10'
+- '11'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 gflags:

.ci_support/linux_aarch64_cuda_compiler_versionNoneopenssl3.yaml

@@ -9,7 +9,7 @@ c_ares:
 c_compiler:
 - gcc
 c_compiler_version:
-- '10'
+- '11'
 cdt_arch:
 - aarch64
 cdt_name:
@@ -23,7 +23,7 @@ cuda_compiler_version:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '10'
+- '11'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 gflags:

.ci_support/linux_ppc64le_cuda_compiler_versionNoneopenssl1.1.1.yaml

@@ -7,7 +7,7 @@ c_ares:
 c_compiler:
 - gcc
 c_compiler_version:
-- '10'
+- '11'
 cdt_name:
 - cos7
 channel_sources:
@@ -19,7 +19,7 @@ cuda_compiler_version:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '10'
+- '11'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 gflags:

.ci_support/linux_ppc64le_cuda_compiler_versionNoneopenssl3.yaml

@@ -7,7 +7,7 @@ c_ares:
 c_compiler:
 - gcc
 c_compiler_version:
-- '10'
+- '11'
 cdt_name:
 - cos7
 channel_sources:
@@ -19,7 +19,7 @@ cuda_compiler_version:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '10'
+- '11'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 gflags:

recipe/meta.yaml

@@ -15,16 +15,16 @@ source:
     patches:
       # backport https://github.com/apache/arrow/pull/14656, can be dropped for v>=11
       - patches/0001-ARROW-18340-Python-PyArrow-C-header-files-no-longer-.patch
-      # switch off tests that require the as-yet unpackaged
+      # make sure we properly skip tests that require the as-yet unpackaged
       # https://github.com/googleapis/storage-testbench
-      - patches/0002-definitely-skip-all-tests-requiring-gcs_server-fixtu.patch
+      - patches/0002-properly-skip-if-instantiation-of-gcs_server-gcfs-fi.patch
   # testing-submodule not part of release tarball
   - git_url: https://github.com/apache/arrow-testing.git
     git_rev: 00c483283433b4c02cb811f260dbe35414c806a4
     folder: testing
 
 build:
-  number: 1
+  number: 2
   # for cuda support, building with one version is enough to be compatible with
   # all later versions, since arrow is only using libcuda, and not libcudart.
   skip: true  # [cuda_compiler_version not in ("None", cuda_compiler_version_min)]

recipe/patches/0002-properly-skip-if-instantiation-of-gcs_server-gcfs-fi.patch

@@ -0,0 +1,61 @@
+From 652c929e80cb53425027d225d3a858266b54360b Mon Sep 17 00:00:00 2001
+From: "H. Vetinari" <[email protected]>
+Date: Mon, 5 Dec 2022 20:15:58 +1100
+Subject: [PATCH 2/2] properly skip if instantiation of gcs_server/gcfs fixture
+ fails
+
+---
+ python/pyarrow/tests/conftest.py | 9 ++++++++-
+ python/pyarrow/tests/test_fs.py  | 7 ++++---
+ 2 files changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/python/pyarrow/tests/conftest.py b/python/pyarrow/tests/conftest.py
+index a06ac9209..db0df51ee 100644
+--- a/python/pyarrow/tests/conftest.py
++++ b/python/pyarrow/tests/conftest.py
+@@ -183,9 +183,16 @@ def gcs_server():
+     args = [sys.executable, '-m', 'testbench', '--port', str(port)]
+     proc = None
+     try:
++        # check first if testbench module is available
++        import testbench
++        # start server
+         proc = subprocess.Popen(args, env=env)
+-    except OSError as e:
++        # Make sure the server is alive.
++        assert proc.poll() is None
++    except (ModuleNotFoundError, OSError) as e:
+         pytest.skip(f"Command {args} failed to execute: {e}")
++    except AssertionError as e:
++        pytest.skip(f"Command {args} did not start server successfully: {e}")
+     else:
+         yield {
+             'connection': ('localhost', port),
+diff --git a/python/pyarrow/tests/test_fs.py b/python/pyarrow/tests/test_fs.py
+index 945114454..7380711b3 100644
+--- a/python/pyarrow/tests/test_fs.py
++++ b/python/pyarrow/tests/test_fs.py
+@@ -207,8 +207,6 @@ def gcsfs(request, gcs_server):
+
+     host, port = gcs_server['connection']
+     bucket = 'pyarrow-filesystem/'
+-    # Make sure the server is alive.
+-    assert gcs_server['process'].poll() is None
+
+     fs = GcsFileSystem(
+         endpoint_override=f'{host}:{port}',
+@@ -217,7 +215,10 @@ def gcsfs(request, gcs_server):
+         anonymous=True,
+         retry_time_limit=timedelta(seconds=45)
+     )
+-    fs.create_dir(bucket)
++    try:
++        fs.create_dir(bucket)
++    except OSError as e:
++        pytest.skip(f"Could not create directory in {fs}: {e}")
+
+     yield dict(
+         fs=fs,
+-- 
+2.38.1.windows.1
+