From 966f9fef84a7e81d808a9f0554f0ca09c73a4b41 Mon Sep 17 00:00:00 2001 From: Ian Cook Date: Thu, 22 Apr 2021 17:28:51 -0400 Subject: [PATCH 1/5] Fix bad relative paths to conda yml files --- dev/release/verify-release-candidate.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/release/verify-release-candidate.bat b/dev/release/verify-release-candidate.bat index bef78fc920c..06eb9a681e9 100644 --- a/dev/release/verify-release-candidate.bat +++ b/dev/release/verify-release-candidate.bat @@ -42,8 +42,8 @@ set PYTHON=3.6 @rem Using call with conda.bat seems necessary to avoid terminating the batch @rem script execution call conda create --no-shortcuts -c conda-forge -f -q -y -p %_VERIFICATION_CONDA_ENV% ^ - --file=ci\conda_env_cpp.yml ^ - --file=ci\conda_env_python.yml ^ + --file=%ARROW_SOURCE%\ci\conda_env_cpp.yml ^ + --file=%ARROW_SOURCE%\ci\conda_env_python.yml ^ git ^ python=%PYTHON% ^ || exit /B 1 From b78efca7304d38bf929acdbbe38aa8c20ce112a5 Mon Sep 17 00:00:00 2001 From: Ian Cook Date: Thu, 22 Apr 2021 17:29:10 -0400 Subject: [PATCH 2/5] Use curl instead of wget --- dev/release/verify-release-candidate.bat | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dev/release/verify-release-candidate.bat b/dev/release/verify-release-candidate.bat index 06eb9a681e9..79ac40731db 100644 --- a/dev/release/verify-release-candidate.bat +++ b/dev/release/verify-release-candidate.bat @@ -32,8 +32,7 @@ set _TARBALL=apache-arrow-%1.tar.gz set ARROW_SOURCE=%_VERIFICATION_DIR%\apache-arrow-%1 set INSTALL_DIR=%_VERIFICATION_DIR%\install -@rem Requires GNU Wget for Windows -wget --no-check-certificate -O %_TARBALL% %_DIST_URL%/apache-arrow-%1-rc%2/%_TARBALL% || exit /B 1 +curl -k -O %_DIST_URL%/apache-arrow-%1-rc%2/%_TARBALL% || exit /B 1 tar xf %_TARBALL% -C %_VERIFICATION_DIR_UNIX% From 1a9c815765695c9eb7a8496dfa01053b3ead3629 Mon Sep 17 00:00:00 2001 From: Ian Cook Date: Thu, 22 Apr 2021 17:29:21 -0400 Subject: [PATCH 3/5] Use python 3.8 --- dev/release/verify-release-candidate.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/release/verify-release-candidate.bat b/dev/release/verify-release-candidate.bat index 79ac40731db..ad5c1f239bc 100644 --- a/dev/release/verify-release-candidate.bat +++ b/dev/release/verify-release-candidate.bat @@ -36,7 +36,7 @@ curl -k -O %_DIST_URL%/apache-arrow-%1-rc%2/%_TARBALL% || exit /B 1 tar xf %_TARBALL% -C %_VERIFICATION_DIR_UNIX% -set PYTHON=3.6 +set PYTHON=3.8 @rem Using call with conda.bat seems necessary to avoid terminating the batch @rem script execution From 084b4033178edc9ce3e6248d1cf7e44085ccc439 Mon Sep 17 00:00:00 2001 From: Ian Cook Date: Thu, 22 Apr 2021 17:29:45 -0400 Subject: [PATCH 4/5] Use VS 2019 --- dev/release/verify-release-candidate.bat | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dev/release/verify-release-candidate.bat b/dev/release/verify-release-candidate.bat index ad5c1f239bc..606a463d6f5 100644 --- a/dev/release/verify-release-candidate.bat +++ b/dev/release/verify-release-candidate.bat @@ -49,7 +49,7 @@ call conda create --no-shortcuts -c conda-forge -f -q -y -p %_VERIFICATION_CONDA call activate %_VERIFICATION_CONDA_ENV% || exit /B 1 -set GENERATOR=Visual Studio 15 2017 Win64 +set GENERATOR=Visual Studio 16 2019 set CONFIGURATION=release pushd %ARROW_SOURCE% @@ -62,13 +62,13 @@ set PATH=%INSTALL_DIR%\bin;%PATH% mkdir %ARROW_SOURCE%\cpp\build pushd %ARROW_SOURCE%\cpp\build -@rem This is the path for Visual Studio Community 2017 -call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat" -arch=amd64 +@rem This is the path for Visual Studio Community 2019 +call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\Tools\VsDevCmd.bat" -arch=amd64 @rem NOTE(wesm): not using Ninja for now to be able to more easily control the @rem generator used -cmake -G "%GENERATOR%" ^ +cmake -G "%GENERATOR%" -A x64 ^ -DARROW_BOOST_USE_SHARED=ON ^ -DARROW_BUILD_STATIC=OFF ^ -DARROW_BUILD_TESTS=ON ^ From 08e9aab6d739f31628214eeee5adda2c52aaf1da Mon Sep 17 00:00:00 2001 From: Ian Cook Date: Thu, 22 Apr 2021 17:33:07 -0400 Subject: [PATCH 5/5] Update VS version in dev readme --- dev/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/README.md b/dev/README.md index 258792b805a..cc0a81d5b44 100644 --- a/dev/README.md +++ b/dev/README.md @@ -129,7 +129,7 @@ Currently this only works on Linux (patches to expand to macOS welcome!). Read the script for information about system dependencies. On Windows, we have a script that verifies C++ and Python (requires Visual -Studio 2015): +Studio 2019): ``` dev/release/verify-release-candidate.bat apache-arrow-0.7.0.tar.gz