You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by jo...@apache.org on 2022/11/09 09:39:33 UTC
[arrow] branch master updated: ARROW-17892: [CI] Use Python 3.10 in AppVeyor build (#14307)
This is an automated email from the ASF dual-hosted git repository.
jorisvandenbossche pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 3c865c62ac ARROW-17892: [CI] Use Python 3.10 in AppVeyor build (#14307)
3c865c62ac is described below
commit 3c865c62ac5788e44786e87cd4cd417855895e7a
Author: Alenka Frim <Al...@users.noreply.github.com>
AuthorDate: Wed Nov 9 10:39:23 2022 +0100
ARROW-17892: [CI] Use Python 3.10 in AppVeyor build (#14307)
This PR tries to upgrade Python version used in `AppVeyor` setup and removes `CONDA_DLL_SEARCH_MODIFICATION_ENABLE` as it should not be needed with Python 3.10.
Authored-by: Alenka Frim <fr...@gmail.com>
Signed-off-by: Joris Van den Bossche <jo...@gmail.com>
---
appveyor.yml | 13 +++----------
ci/appveyor-cpp-build.bat | 1 -
ci/appveyor-cpp-setup.bat | 18 ++----------------
3 files changed, 5 insertions(+), 27 deletions(-)
diff --git a/appveyor.yml b/appveyor.yml
index b6ba6e6e1a..fafc6952d8 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -29,7 +29,7 @@ only_commits:
- python/
cache:
- - C:\Users\Appveyor\clcache1
+ - C:\Users\appveyor\AppData\Local\ccache
matrix:
fast_finish: true
@@ -39,13 +39,6 @@ environment:
APPVEYOR_SAVE_CACHE_ON_ERROR: true
MSVC_DEFAULT_OPTIONS: ON
- # Change the clcache dir to reset caches everywhere when a setting
- # is changed incompatibly (e.g. CLCACHE_COMPRESS).
- CLCACHE_DIR: C:\Users\Appveyor\clcache1
- CLCACHE_SERVER: 1
- CLCACHE_COMPRESS: 1
- CLCACHE_COMPRESSLEVEL: 6
-
ARCH: "64"
ARROW_BUILD_FLIGHT: "ON"
ARROW_BUILD_FLIGHT_SQL: "ON"
@@ -53,7 +46,7 @@ environment:
ARROW_GCS: "ON"
ARROW_S3: "ON"
GENERATOR: Ninja
- PYTHON: "3.8"
+ PYTHON: "3.10"
before_build:
- call ci\appveyor-cpp-setup.bat
@@ -65,4 +58,4 @@ build_script:
test: off
after_build:
- - clcache -s
+ - ccache -s
diff --git a/ci/appveyor-cpp-build.bat b/ci/appveyor-cpp-build.bat
index 5ddb8e370a..0faac67a14 100644
--- a/ci/appveyor-cpp-build.bat
+++ b/ci/appveyor-cpp-build.bat
@@ -83,7 +83,6 @@ cmake -G "%GENERATOR%" %CMAKE_ARGS% ^
-DARROW_WITH_ZLIB=ON ^
-DARROW_WITH_ZSTD=ON ^
-DCMAKE_BUILD_TYPE="Release" ^
- -DCMAKE_CXX_COMPILER=clcache ^
-DCMAKE_CXX_FLAGS_RELEASE="/MD /Od /UNDEBUG" ^
-DCMAKE_CXX_STANDARD=17 ^
-DCMAKE_INSTALL_PREFIX=%CONDA_PREFIX%\Library ^
diff --git a/ci/appveyor-cpp-setup.bat b/ci/appveyor-cpp-setup.bat
index 9e4e4ad5dc..64f930a161 100644
--- a/ci/appveyor-cpp-setup.bat
+++ b/ci/appveyor-cpp-setup.bat
@@ -46,7 +46,7 @@ conda info -a
@rem
@rem Install mamba to the base environment
@rem
-conda install -q -y -c conda-forge mamba python=3.9 || exit /B
+conda install -q -y -c conda-forge mamba python=%PYTHON% || exit /B
@rem Update for newer CA certificates
mamba update -q -y -c conda-forge --all || exit /B
@@ -55,10 +55,6 @@ mamba update -q -y -c conda-forge --all || exit /B
@rem Create conda environment
@rem
-@rem Workaround for ARROW-17172
-@rem This seems necessary for test_cython.py to succeed, otherwise
-@rem the extension module being built would fail loading in a subprocess.
-set CONDA_DLL_SEARCH_MODIFICATION_ENABLE=1
set CONDA_PACKAGES=
if "%ARROW_BUILD_GANDIVA%" == "ON" (
@@ -71,6 +67,7 @@ set CONDA_PACKAGES=%CONDA_PACKAGES% --file=ci\conda_env_cpp.txt
mamba create -n arrow -q -y -c conda-forge ^
--file=ci\conda_env_python.txt ^
%CONDA_PACKAGES% ^
+ "ccache" ^
"cmake" ^
"ninja" ^
"nomkl" ^
@@ -86,17 +83,6 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary
set CC=cl.exe
set CXX=cl.exe
-@rem
-@rem Use clcache for faster builds
-@rem
-
-pip install -q git+https://github.com/Nuitka/clcache.git || exit /B
-@rem Limit cache size to 500 MB
-clcache -M 500000000
-clcache -c
-clcache -s
-powershell.exe -Command "Start-Process clcache-server" || exit /B
-
@rem
@rem Download Minio somewhere on PATH, for unit tests
@rem