Skip to content

Commit f60ea7d

Browse files
committed
[CI] Modernize AppVeyor build
1. re-enable mamba solver (should be faster at installing packages) 2. install PyArrow using pip, not setup.py
1 parent e8a85dc commit f60ea7d

File tree

2 files changed

+16
-18
lines changed

2 files changed

+16
-18
lines changed

ci/appveyor-cpp-build.bat

+10-8
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,12 @@ ctest --output-on-failure || exit /B
113113

114114
popd
115115

116+
pushd python
117+
116118
@rem
117119
@rem Build and install pyarrow
118120
@rem
119121

120-
pushd python
121-
122122
set PYARROW_CMAKE_GENERATOR=%GENERATOR%
123123
set PYARROW_CXXFLAGS=%ARROW_CXXFLAGS%
124124
set PYARROW_PARALLEL=2
@@ -137,6 +137,12 @@ set ARROW_HOME=%CONDA_PREFIX%\Library
137137
@rem ARROW-3075; pkgconfig is broken for Parquet for now
138138
set PARQUET_HOME=%CONDA_PREFIX%\Library
139139

140+
pip install --no-deps --no-build-isolation -vv --editable .
141+
142+
@rem
143+
@rem Run pyarrow tests
144+
@rem
145+
140146
@rem Download IANA Timezone Database to a non-standard location to
141147
@rem test the configurability of the timezone database path
142148
curl https://data.iana.org/time-zones/releases/tzdata2024b.tar.gz --output tzdata.tar.gz || exit /B
@@ -150,12 +156,8 @@ rmdir /s /q %USERPROFILE%\Downloads\tzdata
150156
@rem (only needed for testing purposes)
151157
set PYARROW_TZDATA_PATH=%USERPROFILE%\Downloads\test\tzdata
152158

153-
python setup.py develop -q || exit /B
154-
155159
set PYTHONDEVMODE=1
156160

157-
py.test -r sxX --durations=15 --pyargs pyarrow.tests || exit /B
161+
python -m pytest -r sxX --durations=15 pyarrow/tests || exit /B
158162

159-
@rem
160-
@rem Wheels are built and tested separately (see ARROW-5142).
161-
@rem
163+
popd

ci/appveyor-cpp-setup.bat

+6-10
Original file line numberDiff line numberDiff line change
@@ -41,18 +41,18 @@ conda config --set show_channel_urls True
4141
conda config --set remote_connect_timeout_secs 12
4242
@rem Workaround for ARROW-13636
4343
conda config --append disallowed_packages pypy3
44+
@rem Use conda-forge exclusively
45+
conda config --add channels conda-forge
46+
conda config --remove channels defaults
4447
conda info -a
4548

4649
@rem
4750
@rem Install Python to the base environment
4851
@rem
49-
conda install -q -y -c conda-forge python=%PYTHON% || exit /B
50-
51-
@rem Can't use conda-libmamba-solver 2.0.0
52-
conda config --set solver classic
52+
conda install -q -y python=%PYTHON% || exit /B
5353

5454
@rem Update for newer CA certificates
55-
conda update -q -y -c conda-forge --all || exit /B
55+
conda update -q -y --all || exit /B
5656

5757
@rem
5858
@rem Create conda environment
@@ -66,11 +66,8 @@ if "%ARROW_BUILD_GANDIVA%" == "ON" (
6666
)
6767
@rem Install pre-built "toolchain" packages for faster builds
6868
set CONDA_PACKAGES=%CONDA_PACKAGES% --file=ci\conda_env_cpp.txt
69-
@rem Force conda to use conda-forge
70-
conda config --add channels conda-forge
71-
conda config --remove channels defaults
7269
@rem Arrow conda environment
73-
conda create -n arrow -y -c conda-forge ^
70+
conda create -q -n arrow -y ^
7471
--file=ci\conda_env_python.txt ^
7572
%CONDA_PACKAGES% ^
7673
"ccache" ^
@@ -97,7 +94,6 @@ if "%ARROW_S3%" == "ON" (
9794
appveyor DownloadFile https://dl.min.io/server/minio/release/windows-amd64/archive/minio.RELEASE.2024-09-13T20-26-02Z -FileName C:\Windows\Minio.exe || exit /B
9895
)
9996

100-
10197
@rem
10298
@rem Download IANA Timezone Database for unit tests
10399
@rem

0 commit comments

Comments
 (0)