h-vetinari commented on code in PR #14832:
URL: https://github.com/apache/arrow/pull/14832#discussion_r1039602603
##########
python/pyarrow/tests/conftest.py:
##########
@@ -184,9 +184,16 @@ def gcs_server():
args = [sys.executable, '-m', 'testbench', '--port', str(port)]
proc = None
try:
+ # check first if testbench module is available
+ import testbench # noqa:F401
Review Comment:
Not doing this adds 30+ min to the CI runs, because (on conda-forge CI, with
all tests), because each test using `GcsFileSystem` runs into a lengthy timeout
game during `fs.create_dir(bucket)`
##########
dev/tasks/conda-recipes/r-arrow/build.sh:
##########
@@ -1,9 +1,14 @@
-#!/usr/bin/env bash
-
+#!/bin/bash
set -ex
export DISABLE_AUTOBREW=1
-# See
https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk
-export ARROW_R_CXXFLAGS="${ARROW_R_CXXFLAGS} -D_LIBCPP_DISABLE_AVAILABILITY"
-$R CMD INSTALL --build r/.
+# set C++17 due to abseil
+export ARROW_R_CXXFLAGS="${ARROW_R_CXXFLAGS} -std=c++17"
+
+if [[ "${target_platform}" == osx-* ]]; then
+ # See
https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk
+ export ARROW_R_CXXFLAGS="${ARROW_R_CXXFLAGS}
-D_LIBCPP_DISABLE_AVAILABILITY"
+fi
+
+${R} CMD INSTALL --build r/. ${R_ARGS}
Review Comment:
`${R_ARGS}` is apparently necessary to be able to cross-compile
##########
dev/tasks/tasks.yml:
##########
@@ -240,220 +242,208 @@ tasks:
# the same feedstock as the dependency matrix is the same for them as
# Python and the OS are the main dimension. The R package `r-arrow` is
# an independent feedstock as it doesn't have the Python but the
- # R dimension. To limit the number of CI jobs, we are building `r-arrow`
- # with the Python 3.7 jobs.
+ # R dimension.
# * The files in `dev/tasks/conda-recipes/.ci_support/` are automatically
# generated and to be synced regularly from the feedstock. We have no way
# yet to generate them inside the arrow repository automatically.
- conda-linux-gcc-py37-cpu-r40:
+ conda-linux-x64-cpu-r41:
Review Comment:
The overall diff in this file is pretty busted. Happy to explain if
questions arise (also see individual commits)
##########
python/pyarrow/tests/conftest.py:
##########
@@ -184,9 +184,16 @@ def gcs_server():
args = [sys.executable, '-m', 'testbench', '--port', str(port)]
proc = None
try:
+ # check first if testbench module is available
+ import testbench # noqa:F401
+ # start server
proc = subprocess.Popen(args, env=env)
- except OSError as e:
+ # Make sure the server is alive.
+ assert proc.poll() is None
Review Comment:
Moving the assert is not strictly speaking necessary anymore, but still
cleaner, because with the current setup this can just fail during the setup of
the `gcsfs` fixture, which unnecessarily errors the respective tests, rather
than just skipping them.
##########
dev/tasks/conda-recipes/r-arrow/bld.bat:
##########
@@ -1,9 +1,14 @@
-bash %RECIPE_DIR%/build_win.sh
-IF %ERRORLEVEL% NEQ 0 exit 1
-cp %RECIPE_DIR%/configure.win r
-IF %ERRORLEVEL% NEQ 0 exit 1
-cp %RECIPE_DIR%/install.libs.R r/src
-IF %ERRORLEVEL% NEQ 0 exit 1
-set "MAKEFLAGS=-j%CPU_COUNT%"
-"%R%" CMD INSTALL --build r
-IF %ERRORLEVEL% NEQ 0 exit 1
+@echo on
+
+bash %RECIPE_DIR%/build_win.sh
+IF %ERRORLEVEL% NEQ 0 exit 1
Review Comment:
This file had mangled line endings, see
https://github.com/apache/arrow/pull/14832/commits/115fe7573902adb30f60a1b39c2eaa3759fdb349
##########
dev/tasks/conda-recipes/r-arrow/build.sh:
##########
@@ -1,9 +1,14 @@
-#!/usr/bin/env bash
-
+#!/bin/bash
set -ex
export DISABLE_AUTOBREW=1
-# See
https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk
-export ARROW_R_CXXFLAGS="${ARROW_R_CXXFLAGS} -D_LIBCPP_DISABLE_AVAILABILITY"
-$R CMD INSTALL --build r/.
+# set C++17 due to abseil
+export ARROW_R_CXXFLAGS="${ARROW_R_CXXFLAGS} -std=c++17"
Review Comment:
I realized later that this comment is not 100% accurate; it's less about
abseil, and more about arrow having move the C++17, full stop. Unless people
want a specific fix for that, I'll fix that in the feedstock and it'll be part
of the next sync.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
