From a284394d69be4e618c68d81f1110d40b797f38eb Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 16 Sep 2022 02:17:08 +0200 Subject: [PATCH 01/40] add clang/llvm to pyarrow{,-tests} host dependencies LLVM headers needed by gandiva; clang needed because FindLLVMAlt.cmake depends on it to find LLVM correctly. Co-Authored-By: Sutou Kouhei --- recipe/meta.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b1d1ff5cb..9c6cd3cd0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -206,10 +206,12 @@ outputs: - {{ compiler("cuda") }} # [cuda_compiler_version != "None"] host: - {{ pin_subpackage('arrow-cpp', exact=True) }} + - clangdev {{ llvm_version }} + - llvmdev {{ llvm_version }} - cython - numpy - - python - openssl + - python - setuptools - setuptools_scm - six @@ -284,10 +286,12 @@ outputs: host: - {{ pin_subpackage('arrow-cpp', exact=True) }} - {{ pin_subpackage('pyarrow', exact=True) }} + - clangdev {{ llvm_version }} + - llvmdev {{ llvm_version }} - cython - numpy - - python - openssl + - python - setuptools - setuptools_scm - six From 943dcc1deded0a25278fba7349779af8e1978cad Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Sat, 17 Sep 2022 07:00:52 +0900 Subject: [PATCH 02/40] Remove needless arrow_python checks --- recipe/meta.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9c6cd3cd0..a2412cbee 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -62,7 +62,6 @@ outputs: build: - python # [build_platform != target_platform] - cross-python_{{ target_platform }} # [build_platform != target_platform] - - cython # [build_platform != target_platform] - numpy # [build_platform != target_platform] - clangdev {{ llvm_version }} # [osx and arm64] - llvmdev {{ llvm_version }} # [osx and arm64] @@ -142,7 +141,6 @@ outputs: - test -f $PREFIX/lib/libarrow_dataset.so # [linux] - test -f $PREFIX/lib/libarrow_flight.so # [linux] - test -f $PREFIX/lib/libarrow_flight_sql.so # [linux] - - test -f $PREFIX/lib/libarrow_python.so # [linux] - test -f $PREFIX/lib/libparquet.so # [linux] - test -f $PREFIX/lib/libgandiva.so # [linux] - test -f $PREFIX/lib/libplasma.so # [linux] @@ -152,14 +150,12 @@ outputs: - if exist %PREFIX%\\Library\\bin\\arrow_cuda.dll exit 1 # [(cuda_compiler_version == "None") and win] - test -f $PREFIX/lib/libarrow.dylib # [osx] - test -f $PREFIX/lib/libarrow_dataset.dylib # [osx] - - test -f $PREFIX/lib/libarrow_python.dylib # [osx] - test -f $PREFIX/lib/libgandiva.dylib # [osx] - test -f $PREFIX/lib/libparquet.dylib # [osx] - test -f $PREFIX/lib/libplasma.dylib # [osx] - if not exist %PREFIX%\\Library\\bin\\arrow.dll exit 1 # [win] - if not exist %PREFIX%\\Library\\bin\\arrow_dataset.dll exit 1 # [win] - if not exist %PREFIX%\\Library\\bin\\arrow_flight.dll exit 1 # [win] - - if not exist %PREFIX%\\Library\\bin\\arrow_python.dll exit 1 # [win] - if not exist %PREFIX%\\Library\\bin\\parquet.dll exit 1 # [win] - if not exist %PREFIX%\\Library\\bin\\gandiva.dll exit 1 # [win] @@ -168,7 +164,6 @@ outputs: - test ! -f $PREFIX/lib/libarrow_dataset.a # [unix] - test ! -f $PREFIX/lib/libarrow_flight.a # [unix] - test ! -f $PREFIX/lib/libarrow_flight_sql.a # [unix] - - test ! -f $PREFIX/lib/libarrow_python.a # [unix] - test ! -f $PREFIX/lib/libplasma.a # [unix] - test ! -f $PREFIX/lib/libparquet.a # [unix] - test ! -f $PREFIX/lib/libgandiva.a # [unix] @@ -176,7 +171,6 @@ outputs: - if exist %PREFIX%\\Library\\lib\\arrow_dataset_static.lib exit 1 # [win] - if exist %PREFIX%\\Library\\lib\\arrow_flight_static.lib exit 1 # [win] - if exist %PREFIX%\\Library\\lib\\arrow_flight_sql_static.lib exit 1 # [win] - - if exist %PREFIX%\\Library\\lib\\arrow_python_static.lib exit 1 # [win] - if exist %PREFIX%\\Library\\lib\\parquet_static.lib exit 1 # [win] - if exist %PREFIX%\\Library\\lib\\gandiva_static.lib exit 1 # [win] From 36d1de0e7aa0e55a9249de22d43f68b3995538b5 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 26 Oct 2022 08:35:59 +0000 Subject: [PATCH 03/40] updated v10.0.0 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a2412cbee..0d82d56a5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "9.0.0" %} +{% set version = "10.0.0" %} {% set cuda_enabled = cuda_compiler_version != "None" %} {% set build_ext_version = "3.0.0" %} {% set build_ext = "cuda" if cuda_enabled else "cpu" %} @@ -11,14 +11,14 @@ package: source: url: https://dist.apache.org/repos/dist/release/arrow/arrow-{{ version }}/apache-arrow-{{ version }}.tar.gz - sha256: a9a033f0a3490289998f458680d19579cf07911717ba65afde6cb80070f7a9b5 + sha256: 5b46fa4c54f53e5df0019fe0f9d421e93fc906b625ebe8e89eed010d561f1f12 patches: # backport of the following commit for compatibility with VS2019 # https://github.com/apache/arrow/commit/897c186f475f3dd82c1ab47e5cfb87cb0fed8440 - patches/0001-ARROW-17433-CI-C-Use-Visual-Studio-2019-on-AppVeyor-.patch build: - number: 10 + number: 0 # 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 # [(win or linux64) and cuda_compiler_version not in ("None", "10.2")] From af2a84c0a4816a4a9f3b99e46044a46835a0fdb4 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 22 Oct 2022 13:49:22 +1100 Subject: [PATCH 04/40] remove obsolete patch; unpin xsimd --- recipe/meta.yaml | 8 +- ...-Use-Visual-Studio-2019-on-AppVeyor-.patch | 305 ------------------ 2 files changed, 1 insertion(+), 312 deletions(-) delete mode 100644 recipe/patches/0001-ARROW-17433-CI-C-Use-Visual-Studio-2019-on-AppVeyor-.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 0d82d56a5..3bdbc508e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,10 +12,6 @@ package: source: url: https://dist.apache.org/repos/dist/release/arrow/arrow-{{ version }}/apache-arrow-{{ version }}.tar.gz sha256: 5b46fa4c54f53e5df0019fe0f9d421e93fc906b625ebe8e89eed010d561f1f12 - patches: - # backport of the following commit for compatibility with VS2019 - # https://github.com/apache/arrow/commit/897c186f475f3dd82c1ab47e5cfb87cb0fed8440 - - patches/0001-ARROW-17433-CI-C-Use-Visual-Studio-2019-on-AppVeyor-.patch build: number: 0 @@ -104,9 +100,7 @@ outputs: - re2 - snappy - thrift-cpp - # https://github.com/apache/arrow/blob/apache-arrow-9.0.0/cpp/cmake_modules/ThirdpartyToolchain.cmake#L2245 - # currently pins to exact xsimd version - - xsimd 8.1.0 + - xsimd - zlib - zstd run: diff --git a/recipe/patches/0001-ARROW-17433-CI-C-Use-Visual-Studio-2019-on-AppVeyor-.patch b/recipe/patches/0001-ARROW-17433-CI-C-Use-Visual-Studio-2019-on-AppVeyor-.patch deleted file mode 100644 index dcb2c3146..000000000 --- a/recipe/patches/0001-ARROW-17433-CI-C-Use-Visual-Studio-2019-on-AppVeyor-.patch +++ /dev/null @@ -1,305 +0,0 @@ -From b5c94f653d8a80eb4bd5ff41bb1b8d5f230d1ee8 Mon Sep 17 00:00:00 2001 -From: Sutou Kouhei -Date: Thu, 25 Aug 2022 15:08:39 +0900 -Subject: [PATCH] ARROW-17433: [CI][C++] Use Visual Studio 2019 on AppVeyor - (#13903) - -We can use /external:I for Boost to suppress warnings from Boost -with Visual Studio 2019 or later. - - -Lead-authored-by: Sutou Kouhei -Co-authored-by: Antoine Pitrou -Signed-off-by: Sutou Kouhei ---- - appveyor.yml | 33 +++++-------- - ci/appveyor-cpp-build.bat | 41 +--------------- - ci/appveyor-cpp-setup.bat | 54 +++++++++------------- - ci/conda_env_gandiva_win.txt | 5 +- - cpp/src/gandiva/gdv_function_stubs.cc | 7 ++- - cpp/src/gandiva/precompiled/CMakeLists.txt | 12 +++-- - 6 files changed, 47 insertions(+), 105 deletions(-) - -diff --git a/appveyor.yml b/appveyor.yml -index 03a3597c9..b6ba6e6e1 100644 ---- a/appveyor.yml -+++ b/appveyor.yml -@@ -16,7 +16,7 @@ - # under the License. - - # Operating system (build VM template) --os: Visual Studio 2017 -+os: Visual Studio 2019 - - only_commits: - # Skip commits not related to Python or C++ -@@ -36,35 +36,24 @@ matrix: - - environment: - global: -- # Make these variables visible in all jobs and build steps -- MSVC_DEFAULT_OPTIONS: ON - 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 -- ARROW_BUILD_FLIGHT: "OFF" -- ARROW_BUILD_FLIGHT_SQL: "OFF" -- ARROW_BUILD_GANDIVA: "OFF" -- ARROW_LLVM_VERSION: "7.0.*" -- ARROW_S3: "OFF" -- PYTHON: "3.8" -- ARCH: "64" - -- matrix: -- # NOTE: clcache seems to work best with Ninja and worst with msbuild -- # (as generated by cmake) -- - JOB: "Toolchain" -- GENERATOR: Ninja -- ARROW_GCS: "ON" -- ARROW_S3: "ON" -- ARROW_BUILD_FLIGHT: "ON" -- ARROW_BUILD_FLIGHT_SQL: "ON" -- ARROW_BUILD_GANDIVA: "ON" -- - JOB: "Build_Debug" -- GENERATOR: Ninja -+ ARCH: "64" -+ ARROW_BUILD_FLIGHT: "ON" -+ ARROW_BUILD_FLIGHT_SQL: "ON" -+ ARROW_BUILD_GANDIVA: "ON" -+ ARROW_GCS: "ON" -+ ARROW_S3: "ON" -+ GENERATOR: Ninja -+ PYTHON: "3.8" - - before_build: - - call ci\appveyor-cpp-setup.bat -diff --git a/ci/appveyor-cpp-build.bat b/ci/appveyor-cpp-build.bat -index e2c2d800d..4b90e4925 100644 ---- a/ci/appveyor-cpp-build.bat -+++ b/ci/appveyor-cpp-build.bat -@@ -31,51 +31,13 @@ set ARROW_DEBUG_MEMORY_POOL=trap - set CMAKE_BUILD_PARALLEL_LEVEL=%NUMBER_OF_PROCESSORS% - set CTEST_PARALLEL_LEVEL=%NUMBER_OF_PROCESSORS% - --@rem --@rem In the configurations below we disable building the Arrow static library --@rem to save some time. Unfortunately this will still build the Parquet static --@rem library because of PARQUET-1420 (Thrift-generated symbols not exported in DLL). --@rem --if "%JOB%" == "Build_Debug" ( -- mkdir cpp\build-debug -- pushd cpp\build-debug -- -- cmake -G "%GENERATOR%" ^ -- -DARROW_BOOST_USE_SHARED=OFF ^ -- -DARROW_BUILD_EXAMPLES=ON ^ -- -DARROW_BUILD_STATIC=OFF ^ -- -DARROW_BUILD_TESTS=ON ^ -- -DARROW_CXXFLAGS="/MP" ^ -- -DARROW_ENABLE_TIMING_TESTS=OFF ^ -- -DARROW_USE_PRECOMPILED_HEADERS=OFF ^ -- -DARROW_VERBOSE_THIRDPARTY_BUILD=OFF ^ -- -DCMAKE_BUILD_TYPE="Debug" ^ -- -DCMAKE_UNITY_BUILD=ON ^ -- .. || exit /B -- -- cmake --build . --config Debug || exit /B -- ctest --output-on-failure || exit /B -- popd -- -- @rem Finish Debug build successfully -- exit /B 0 --) - - call activate arrow - --@rem Use Boost from Anaconda --set BOOST_ROOT=%CONDA_PREFIX%\Library --set BOOST_LIBRARYDIR=%CONDA_PREFIX%\Library\lib -- - @rem The "main" C++ build script for Windows CI - @rem (i.e. for usual configurations) - --if "%JOB%" == "Toolchain" ( -- set CMAKE_ARGS=-DARROW_DEPENDENCY_SOURCE=CONDA -DARROW_WITH_BZ2=ON --) else ( -- @rem We're in a conda environment but don't want to use it for the dependencies -- set CMAKE_ARGS=-DARROW_DEPENDENCY_SOURCE=AUTO --) -+set CMAKE_ARGS=-DARROW_DEPENDENCY_SOURCE=CONDA -DARROW_WITH_BZ2=ON - - @rem Enable warnings-as-errors - set ARROW_CXXFLAGS=/WX /MP -@@ -119,6 +81,7 @@ cmake -G "%GENERATOR%" %CMAKE_ARGS% ^ - -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 ^ - -DCMAKE_UNITY_BUILD=ON ^ - -DCMAKE_VERBOSE_MAKEFILE=OFF ^ -diff --git a/ci/appveyor-cpp-setup.bat b/ci/appveyor-cpp-setup.bat -index 1fa126cb0..f9390e9be 100644 ---- a/ci/appveyor-cpp-setup.bat -+++ b/ci/appveyor-cpp-setup.bat -@@ -17,9 +17,7 @@ - - @echo on - --set "PATH=C:\Miniconda37-x64;C:\Miniconda37-x64\Scripts;C:\Miniconda37-x64\Library\bin;%PATH%" --set BOOST_ROOT=C:\Libraries\boost_1_67_0 --set BOOST_LIBRARYDIR=C:\Libraries\boost_1_67_0\lib64-msvc-14.0 -+set "PATH=C:\Miniconda38-x64;C:\Miniconda38-x64\Scripts;C:\Miniconda38-x64\Library\bin;%PATH%" - - @rem - @rem Avoid picking up AppVeyor-installed OpenSSL (linker errors with gRPC) -@@ -31,6 +29,8 @@ rd /s /q C:\OpenSSL-v11-Win32 - rd /s /q C:\OpenSSL-v11-Win64 - rd /s /q C:\OpenSSL-v111-Win32 - rd /s /q C:\OpenSSL-v111-Win64 -+rd /s /q C:\OpenSSL-v30-Win32 -+rd /s /q C:\OpenSSL-v30-Win64 - - @rem - @rem Configure miniconda -@@ -52,9 +52,8 @@ conda install -q -y -c conda-forge mamba python=3.9 || exit /B - mamba update -q -y -c conda-forge --all || exit /B - - @rem --@rem Create conda environment for Build and Toolchain jobs -+@rem Create conda environment - @rem --@rem Avoid Boost 1.70 because of https://github.com/boostorg/process/issues/85 - - set CONDA_PACKAGES= - -@@ -62,37 +61,26 @@ if "%ARROW_BUILD_GANDIVA%" == "ON" ( - @rem Install llvmdev in the toolchain if building gandiva.dll - set CONDA_PACKAGES=%CONDA_PACKAGES% --file=ci\conda_env_gandiva_win.txt - ) --if "%JOB%" == "Toolchain" ( -- @rem Install pre-built "toolchain" packages for faster builds -- set CONDA_PACKAGES=%CONDA_PACKAGES% --file=ci\conda_env_cpp.txt --) --if "%JOB%" NEQ "Build_Debug" ( -- @rem Arrow conda environment is only required for the Build and Toolchain jobs -- mamba create -n arrow -q -y -c conda-forge ^ -- --file=ci\conda_env_python.txt ^ -- %CONDA_PACKAGES% ^ -- "cmake" ^ -- "ninja" ^ -- "nomkl" ^ -- "pandas" ^ -- "fsspec" ^ -- "python=%PYTHON%" ^ -- || exit /B --) -+@rem Install pre-built "toolchain" packages for faster builds -+set CONDA_PACKAGES=%CONDA_PACKAGES% --file=ci\conda_env_cpp.txt -+@rem Arrow conda environment -+mamba create -n arrow -q -y -c conda-forge ^ -+ --file=ci\conda_env_python.txt ^ -+ %CONDA_PACKAGES% ^ -+ "cmake" ^ -+ "ninja" ^ -+ "nomkl" ^ -+ "pandas" ^ -+ "fsspec" ^ -+ "python=%PYTHON%" ^ -+ || exit /B - - @rem - @rem Configure compiler - @rem --if "%GENERATOR%"=="Ninja" set need_vcvarsall=1 --if defined need_vcvarsall ( -- if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2017" ( -- @rem ARROW-14070 Visual Studio 2015 no longer supported -- exit /B -- ) -- call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64 -- set CC=cl.exe -- set CXX=cl.exe --) -+call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64 -+set CC=cl.exe -+set CXX=cl.exe - - @rem - @rem Use clcache for faster builds -@@ -109,7 +97,7 @@ powershell.exe -Command "Start-Process clcache-server" || exit /B - @rem Download Minio somewhere on PATH, for unit tests - @rem - if "%ARROW_S3%" == "ON" ( -- appveyor DownloadFile https://dl.min.io/server/minio/release/windows-amd64/archive/minio.RELEASE.2022-05-26T05-48-41Z -FileName C:\Windows\Minio.exe || exit /B -+ appveyor DownloadFile https://dl.min.io/server/minio/release/windows-amd64/archive/minio.RELEASE.2022-05-26T05-48-41Z -FileName C:\Windows\Minio.exe || exit /B - ) - - -diff --git a/ci/conda_env_gandiva_win.txt b/ci/conda_env_gandiva_win.txt -index 9098b53d1..621b6f5a9 100644 ---- a/ci/conda_env_gandiva_win.txt -+++ b/ci/conda_env_gandiva_win.txt -@@ -15,6 +15,5 @@ - # specific language governing permissions and limitations - # under the License. - --# llvmdev=9 or later require Visual Studio 2017 --clangdev=8 --llvmdev=8 -+clangdev -+llvmdev -diff --git a/cpp/src/gandiva/gdv_function_stubs.cc b/cpp/src/gandiva/gdv_function_stubs.cc -index 40fb656bd..cf0f4f9b9 100644 ---- a/cpp/src/gandiva/gdv_function_stubs.cc -+++ b/cpp/src/gandiva/gdv_function_stubs.cc -@@ -754,14 +754,13 @@ GANDIVA_EXPORT - gdv_timestamp from_utc_timezone_timestamp(gdv_int64 context, - gdv_timestamp time_miliseconds, - const char* timezone, gdv_int32 length) { -- using arrow_vendored::date::make_zoned; - using arrow_vendored::date::sys_time; -+ using arrow_vendored::date::zoned_time; - using std::chrono::milliseconds; - -- sys_time tp{milliseconds{time_miliseconds}}; -- const auto utc_tz = make_zoned(std::string("Etc/UTC"), tp); -+ const sys_time tp{milliseconds{time_miliseconds}}; - try { -- const auto local_tz = make_zoned(std::string(timezone, length), utc_tz); -+ const zoned_time local_tz{std::string(timezone, length), tp}; - gdv_timestamp offset = local_tz.get_time_zone()->get_info(tp).offset.count() * 1000; - return time_miliseconds + static_cast(offset); - } catch (...) { -diff --git a/cpp/src/gandiva/precompiled/CMakeLists.txt b/cpp/src/gandiva/precompiled/CMakeLists.txt -index 650b80f6b..fefabf883 100644 ---- a/cpp/src/gandiva/precompiled/CMakeLists.txt -+++ b/cpp/src/gandiva/precompiled/CMakeLists.txt -@@ -31,10 +31,14 @@ set(PRECOMPILED_SRCS - ../../arrow/util/basic_decimal.cc) - - if(MSVC) -- # clang pretends to be a particular version of MSVC. 191[0-9] is -- # Visual Studio 2017, and the standard library uses C++14 features, -- # so we have to use that -std version to get the IR compilation to work -- if(MSVC_VERSION MATCHES "^191[0-9]$") -+ # clang pretends to be a particular version of MSVC. Thestandard -+ # library uses C++14 features, so we have to use that -std version -+ # to get the IR compilation to work. -+ # See https://cmake.org/cmake/help/latest/variable/MSVC_VERSION.html -+ # for MSVC_VERSION and Visual Studio version. -+ if(MSVC_VERSION LESS 1930) -+ set(FMS_COMPATIBILITY 19.20) -+ elseif(MSVC_VERSION LESS 1920) - set(FMS_COMPATIBILITY 19.10) - else() - message(FATAL_ERROR "Unsupported MSVC_VERSION=${MSVC_VERSION}") --- -2.37.0.windows.1 - From 0885829d2037867db699fd4820ebcbd1c9f03cb7 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 22 Oct 2022 13:58:14 +1100 Subject: [PATCH 05/40] sync build scripts with upstream: option reshuffles --- recipe/bld-arrow.bat | 10 +++++----- recipe/build-arrow.sh | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/recipe/bld-arrow.bat b/recipe/bld-arrow.bat index 15b8f1698..9cb7372e9 100644 --- a/recipe/bld-arrow.bat +++ b/recipe/bld-arrow.bat @@ -15,13 +15,12 @@ if "%cuda_compiler_version%"=="None" ( ) cmake -G "Ninja" ^ - -DARROW_DEPENDENCY_SOURCE=SYSTEM ^ - -DARROW_PACKAGE_PREFIX="%LIBRARY_PREFIX%" ^ -DARROW_BOOST_USE_SHARED:BOOL=ON ^ + -DARROW_BUILD_STATIC:BOOL=OFF ^ -DARROW_BUILD_TESTS:BOOL=OFF ^ -DARROW_BUILD_UTILITIES:BOOL=OFF ^ - -DARROW_BUILD_STATIC:BOOL=OFF ^ -DARROW_DATASET:BOOL=ON ^ + -DARROW_DEPENDENCY_SOURCE=SYSTEM ^ -DARROW_FLIGHT:BOOL=ON ^ -DARROW_FLIGHT_REQUIRE_TLSCREDENTIALSOPTIONS:BOOL=ON ^ -DARROW_GANDIVA:BOOL=ON ^ @@ -29,8 +28,8 @@ cmake -G "Ninja" ^ -DARROW_HDFS:BOOL=ON ^ -DARROW_MIMALLOC:BOOL=ON ^ -DARROW_ORC:BOOL=OFF ^ + -DARROW_PACKAGE_PREFIX="%LIBRARY_PREFIX%" ^ -DARROW_PARQUET:BOOL=ON ^ - -DPARQUET_REQUIRE_ENCRYPTION:BOOL=ON ^ -DARROW_PYTHON:BOOL=ON ^ -DARROW_S3:BOOL=ON ^ -DARROW_SIMD_LEVEL:STRING=NONE ^ @@ -42,12 +41,13 @@ cmake -G "Ninja" ^ -DARROW_WITH_ZLIB:BOOL=ON ^ -DARROW_WITH_ZSTD:BOOL=ON ^ -DBUILD_SHARED_LIBS=ON ^ + -DBoost_NO_BOOST_CMAKE=ON ^ -DCMAKE_BUILD_TYPE=release ^ -DCMAKE_CXX_STANDARD=17 ^ -DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%" ^ -DCMAKE_UNITY_BUILD=ON ^ - -DBoost_NO_BOOST_CMAKE=ON ^ -DLLVM_TOOLS_BINARY_DIR="%LIBRARY_BIN%" ^ + -DPARQUET_REQUIRE_ENCRYPTION:BOOL=ON ^ -DPython3_EXECUTABLE="%PYTHON%" ^ %EXTRA_CMAKE_ARGS% ^ .. diff --git a/recipe/build-arrow.sh b/recipe/build-arrow.sh index 8a9d13f55..4de17a475 100644 --- a/recipe/build-arrow.sh +++ b/recipe/build-arrow.sh @@ -76,7 +76,6 @@ cmake -GNinja \ -DARROW_ORC=ON \ -DARROW_PACKAGE_PREFIX=$PREFIX \ -DARROW_PARQUET=ON \ - -DPARQUET_REQUIRE_ENCRYPTION=ON \ -DARROW_PLASMA=ON \ -DARROW_PYTHON=ON \ -DARROW_S3=ON \ @@ -95,8 +94,9 @@ cmake -GNinja \ -DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_INSTALL_PREFIX=$PREFIX \ -DLLVM_TOOLS_BINARY_DIR=$PREFIX/bin \ - -DPython3_EXECUTABLE=${PYTHON} \ + -DPARQUET_REQUIRE_ENCRYPTION=ON \ -DProtobuf_PROTOC_EXECUTABLE=$BUILD_PREFIX/bin/protoc \ + -DPython3_EXECUTABLE=${PYTHON} \ ${EXTRA_CMAKE_ARGS} \ .. From ee1177dc0b2415fe26a6e702794b0e1079343100 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 22 Oct 2022 13:58:44 +1100 Subject: [PATCH 06/40] sync build scripts with upstream: option additions/removals --- recipe/bld-arrow.bat | 5 ++++- recipe/build-arrow.sh | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/recipe/bld-arrow.bat b/recipe/bld-arrow.bat index 9cb7372e9..c8eacfb43 100644 --- a/recipe/bld-arrow.bat +++ b/recipe/bld-arrow.bat @@ -19,18 +19,21 @@ cmake -G "Ninja" ^ -DARROW_BUILD_STATIC:BOOL=OFF ^ -DARROW_BUILD_TESTS:BOOL=OFF ^ -DARROW_BUILD_UTILITIES:BOOL=OFF ^ + -DARROW_COMPUTE:BOOL=ON ^ + -DARROW_CSV:BOOL=ON ^ -DARROW_DATASET:BOOL=ON ^ -DARROW_DEPENDENCY_SOURCE=SYSTEM ^ + -DARROW_FILESYSTEM:BOOL=ON ^ -DARROW_FLIGHT:BOOL=ON ^ -DARROW_FLIGHT_REQUIRE_TLSCREDENTIALSOPTIONS:BOOL=ON ^ -DARROW_GANDIVA:BOOL=ON ^ -DARROW_GCS:BOOL=ON ^ -DARROW_HDFS:BOOL=ON ^ + -DARROW_JSON:BOOL=ON ^ -DARROW_MIMALLOC:BOOL=ON ^ -DARROW_ORC:BOOL=OFF ^ -DARROW_PACKAGE_PREFIX="%LIBRARY_PREFIX%" ^ -DARROW_PARQUET:BOOL=ON ^ - -DARROW_PYTHON:BOOL=ON ^ -DARROW_S3:BOOL=ON ^ -DARROW_SIMD_LEVEL:STRING=NONE ^ -DARROW_SUBSTRAIT:BOOL=ON ^ diff --git a/recipe/build-arrow.sh b/recipe/build-arrow.sh index 4de17a475..3a26bd2ed 100644 --- a/recipe/build-arrow.sh +++ b/recipe/build-arrow.sh @@ -61,9 +61,12 @@ cmake -GNinja \ -DARROW_BUILD_STATIC=OFF \ -DARROW_BUILD_TESTS=OFF \ -DARROW_BUILD_UTILITIES=OFF \ + -DARROW_COMPUTE=ON \ + -DARROW_CSV=ON \ -DARROW_CXXFLAGS="${CXXFLAGS}" \ -DARROW_DATASET=ON \ -DARROW_DEPENDENCY_SOURCE=SYSTEM \ + -DARROW_FILESYSTEM=ON \ -DARROW_FLIGHT=ON \ -DARROW_FLIGHT_REQUIRE_TLSCREDENTIALSOPTIONS=ON \ -DARROW_FLIGHT_SQL=ON \ @@ -72,12 +75,12 @@ cmake -GNinja \ -DARROW_GCS=ON \ -DARROW_HDFS=ON \ -DARROW_JEMALLOC=ON \ + -DARROW_JSON=ON \ -DARROW_MIMALLOC=ON \ -DARROW_ORC=ON \ -DARROW_PACKAGE_PREFIX=$PREFIX \ -DARROW_PARQUET=ON \ -DARROW_PLASMA=ON \ - -DARROW_PYTHON=ON \ -DARROW_S3=ON \ -DARROW_SIMD_LEVEL=NONE \ -DARROW_SUBSTRAIT=ON \ From de8eb75631c697e7bbb3a9385e1ceb26a11cc5c6 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 22 Oct 2022 21:06:27 +1100 Subject: [PATCH 07/40] remove python/numpy dependence from arrow-cpp --- recipe/meta.yaml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3bdbc508e..00b57803d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -48,7 +48,7 @@ outputs: script: bld-arrow.bat # [win] version: {{ version }} build: - string: py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}_{{ build_ext }} + string: h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}_{{ build_ext }} run_exports: - {{ pin_subpackage("arrow-cpp", max_pin="x.x.x") }} ignore_run_exports: @@ -56,9 +56,6 @@ outputs: track_features: {{ "[arrow-cuda]" if cuda_enabled else "" }} requirements: build: - - python # [build_platform != target_platform] - - cross-python_{{ target_platform }} # [build_platform != target_platform] - - numpy # [build_platform != target_platform] - clangdev {{ llvm_version }} # [osx and arm64] - llvmdev {{ llvm_version }} # [osx and arm64] - gnuconfig # [osx and arm64] @@ -91,11 +88,9 @@ outputs: - llvmdev {{ llvm_version }} - libutf8proc - lz4-c - - numpy # gandiva depends on openssl - openssl - orc # [unix] - - python - rapidjson - re2 - snappy @@ -103,9 +98,6 @@ outputs: - xsimd - zlib - zstd - run: - - {{ pin_compatible('numpy', lower_bound='1.16') }} - - python run_constrained: - arrow-cpp-proc * {{ build_ext }} - cudatoolkit >=9.2 # [cuda_compiler_version != "None"] @@ -205,7 +197,7 @@ outputs: - six run: - {{ pin_subpackage('arrow-cpp', exact=True) }} - - {{ pin_compatible('numpy', lower_bound='1.16') }} + - {{ pin_compatible('numpy') }} # empty parquet-cpp metapackage, force old versions to be uninstalled - parquet-cpp 1.5.1.* - python From 2d14e7eb5b5895e4a847a8525aac62389c2e78f2 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 23 Oct 2022 15:30:29 +1100 Subject: [PATCH 08/40] clean up after each python build --- recipe/bld-pyarrow.bat | 3 +++ recipe/build-pyarrow.sh | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/recipe/bld-pyarrow.bat b/recipe/bld-pyarrow.bat index e1073b563..dfc46b551 100644 --- a/recipe/bld-pyarrow.bat +++ b/recipe/bld-pyarrow.bat @@ -42,3 +42,6 @@ popd if [%PKG_NAME%] == [pyarrow] ( rd /s /q %SP_DIR%\pyarrow\tests ) + +:: generated by setup.py +rmdir .\python\build /s /q diff --git a/recipe/build-pyarrow.sh b/recipe/build-pyarrow.sh index 60144d06b..9f5b70649 100644 --- a/recipe/build-pyarrow.sh +++ b/recipe/build-pyarrow.sh @@ -55,3 +55,7 @@ $PYTHON setup.py \ if [[ "$PKG_NAME" == "pyarrow" ]]; then rm -r ${SP_DIR}/pyarrow/tests fi + +# generated by setup.py +rm -rf build +cd .. From 1487ea3e7d19e75cd3e905d9b871e112542f17a3 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 2 Dec 2020 23:11:46 +0100 Subject: [PATCH 09/40] rename arrow-cpp to libarrow; keep old output names for compat Co-authored-by: Uwe L. Korn --- recipe/meta.yaml | 60 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 47 insertions(+), 13 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 00b57803d..f061821f0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -6,7 +6,7 @@ {% set llvm_version = "14" %} package: - name: arrow-cpp-ext + name: apache-arrow version: {{ version }} source: @@ -25,10 +25,10 @@ build: # Hence this is skipped for now until this can be addressed. skip: true # [linux and ppc64le and cuda_compiler_version != "None"] run_exports: - - {{ pin_subpackage("arrow-cpp", max_pin="x.x.x") }} + - {{ pin_subpackage("libarrow", max_pin="x.x.x") }} outputs: - - name: arrow-cpp-proc + - name: apache-arrow-proc version: {{ build_ext_version }} build: number: {{ proc_build_number }} @@ -43,14 +43,27 @@ outputs: - LICENSE.txt summary: A meta-package to select Arrow build variant - - name: arrow-cpp + # compat output for old mutex-package naming + - name: arrow-cpp-proc + version: {{ build_ext_version }} + build: + number: {{ proc_build_number }} + string: {{ build_ext }} + requirements: + run: + - apache-arrow-proc ={{ build_ext_version }}={{ build_ext }} + test: + commands: + - exit 0 + + - name: libarrow script: build-arrow.sh # [not win] script: bld-arrow.bat # [win] version: {{ version }} build: string: h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}_{{ build_ext }} run_exports: - - {{ pin_subpackage("arrow-cpp", max_pin="x.x.x") }} + - {{ pin_subpackage("libarrow", max_pin="x.x.x") }} ignore_run_exports: - cudatoolkit track_features: {{ "[arrow-cuda]" if cuda_enabled else "" }} @@ -99,8 +112,10 @@ outputs: - zlib - zstd run_constrained: - - arrow-cpp-proc * {{ build_ext }} + - apache-arrow-proc =*={{ build_ext }} - cudatoolkit >=9.2 # [cuda_compiler_version != "None"] + # make sure we don't co-install with old version of old package name + - arrow-cpp ={{ version }} about: home: http://github.com/apache/arrow @@ -160,6 +175,24 @@ outputs: - if exist %PREFIX%\\Library\\lib\\parquet_static.lib exit 1 # [win] - if exist %PREFIX%\\Library\\lib\\gandiva_static.lib exit 1 # [win] + # compat output for old naming scheme; switched for 10.0.0; keep for a few versions + - name: arrow-cpp + version: {{ version }} + build: + string: h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}_{{ build_ext }} + run_exports: + - {{ pin_subpackage("libarrow", max_pin="x.x.x") }} + requirements: + host: + # make sure the builds for different openssl versions (with the same PKG_BUILDNUM) have different hashes + - openssl + - {{ pin_subpackage('libarrow', exact=True) }} + run: + - {{ pin_subpackage('libarrow', exact=True) }} + test: + commands: + - exit 0 + - name: pyarrow script: build-pyarrow.sh # [not win] script: bld-pyarrow.bat # [win] @@ -182,10 +215,10 @@ outputs: - make # [unix] - {{ compiler('c') }} - {{ compiler('cxx') }} - # pyarrow does not require nvcc but it needs to link against libraries in arrow-cpp=*=*cuda + # pyarrow does not require nvcc but it needs to link against libraries in libarrow=*=*cuda - {{ compiler("cuda") }} # [cuda_compiler_version != "None"] host: - - {{ pin_subpackage('arrow-cpp', exact=True) }} + - {{ pin_subpackage('libarrow', exact=True) }} - clangdev {{ llvm_version }} - llvmdev {{ llvm_version }} - cython @@ -196,13 +229,13 @@ outputs: - setuptools_scm - six run: - - {{ pin_subpackage('arrow-cpp', exact=True) }} + - {{ pin_subpackage('libarrow', exact=True) }} - {{ pin_compatible('numpy') }} # empty parquet-cpp metapackage, force old versions to be uninstalled - parquet-cpp 1.5.1.* - python run_constrained: - - arrow-cpp-proc * {{ build_ext }} + - apache-arrow-proc =*={{ build_ext }} - cudatoolkit >=9.2 # [cuda_compiler_version != "None"] about: @@ -261,10 +294,10 @@ outputs: - make # [unix] - {{ compiler('c') }} - {{ compiler('cxx') }} - # pyarrow does not require nvcc but it needs to link against libraries in arrow-cpp=*=*cuda + # pyarrow does not require nvcc but it needs to link against libraries in libarrow=*=*cuda - {{ compiler("cuda") }} # [cuda_compiler_version != "None"] host: - - {{ pin_subpackage('arrow-cpp', exact=True) }} + - {{ pin_subpackage('libarrow', exact=True) }} - {{ pin_subpackage('pyarrow', exact=True) }} - clangdev {{ llvm_version }} - llvmdev {{ llvm_version }} @@ -279,7 +312,7 @@ outputs: - {{ pin_subpackage('pyarrow', exact=True) }} - python run_constrained: - - arrow-cpp-proc * {{ build_ext }} + - apache-arrow-proc =*={{ build_ext }} - cudatoolkit >=9.2 # [cuda_compiler_version != "None"] about: @@ -318,3 +351,4 @@ extra: - nealrichardson - jakirkham - h-vetinari + feedstock-name: arrow-cpp From e642cb16d355d19fd46240e50b922b915cbbfeb6 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 7 Nov 2022 15:14:52 +1100 Subject: [PATCH 10/40] add migrations for aws_sdk_cpp19375 and openssl3 --- .ci_support/migrations/aws_sdk_cpp19375.yaml | 8 ++++++++ .ci_support/migrations/openssl3.yaml | 8 ++++++++ 2 files changed, 16 insertions(+) create mode 100644 .ci_support/migrations/aws_sdk_cpp19375.yaml create mode 100644 .ci_support/migrations/openssl3.yaml diff --git a/.ci_support/migrations/aws_sdk_cpp19375.yaml b/.ci_support/migrations/aws_sdk_cpp19375.yaml new file mode 100644 index 000000000..40cb1b3bb --- /dev/null +++ b/.ci_support/migrations/aws_sdk_cpp19375.yaml @@ -0,0 +1,8 @@ +__migrator: + build_number: 1 + kind: version + migration_number: 1 + use_local: true +aws_sdk_cpp: +- 1.9.379 +migrator_ts: 1667321224.1701944 diff --git a/.ci_support/migrations/openssl3.yaml b/.ci_support/migrations/openssl3.yaml new file mode 100644 index 000000000..ae551c1e9 --- /dev/null +++ b/.ci_support/migrations/openssl3.yaml @@ -0,0 +1,8 @@ +__migrator: + build_number: 1 + kind: version + migration_number: 1 +migrator_ts: 1631932209.13688 +openssl: +- 1.1.1 +- '3' From 181136f9ad8b1bfad96117dd91f9cdce02fcc488 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 7 Nov 2022 15:15:47 +1100 Subject: [PATCH 11/40] unpin aws-sdk-cpp --- recipe/meta.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f061821f0..57c3437ee 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -74,8 +74,7 @@ outputs: - gnuconfig # [osx and arm64] - libgrpc - libprotobuf - # aws-sdk-cpp 1.8.* doesn't work with a newer CMake - - cmake <3.22 + - cmake - autoconf # [unix] - ninja - make # [unix] @@ -83,8 +82,7 @@ outputs: - {{ compiler('cxx') }} - {{ compiler("cuda") }} # [cuda_compiler_version != "None"] host: - # https://issues.apache.org/jira/browse/ARROW-15141 - - aws-sdk-cpp 1.8.186 + - aws-sdk-cpp # abseil is only here to help conda pick the right constraints for pyarrow, see # https://github.com/conda-forge/arrow-cpp-feedstock/pull/815#issuecomment-1216713245 - libabseil From 368b437c42f9e2fdf531732dbbb29968667b332d Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 7 Nov 2022 15:21:01 +1100 Subject: [PATCH 12/40] make abseil dependence of libarrow explicit removing it causes warnings in the build ``` WARNING (libarrow,lib/libarrow.so.1000.0.0): Needed DSO lib/libabsl_time.so.2206.0.0 found in ['libabseil'] WARNING (libarrow,lib/libarrow.so.1000.0.0): .. but ['libabseil'] not in reqs/run, (i.e. it is overlinking) (likely) or a missing dependency (less likely) WARNING (libarrow,lib/libarrow.so.1000.0.0): Needed DSO lib/libabsl_time_zone.so.2206.0.0 found in ['libabseil'] WARNING (libarrow,lib/libarrow.so.1000.0.0): .. but ['libabseil'] not in reqs/run, (i.e. it is overlinking) (likely) or a missing dependency (less likely) [...] WARNING (libarrow,lib/libarrow_flight.so.1000.0.0): Needed DSO lib/libabsl_synchronization.so.2206.0.0 found in ['libabseil'] WARNING (libarrow,lib/libarrow_flight.so.1000.0.0): .. but ['libabseil'] not in reqs/run, (i.e. it is overlinking) (likely) or a missing dependency (less likely) ``` see also https://github.com/apache/arrow/blob/apache-arrow-10.0.0/cpp/vcpkg.json#L5 --- recipe/meta.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 57c3437ee..5bef9ef1c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -83,9 +83,6 @@ outputs: - {{ compiler("cuda") }} # [cuda_compiler_version != "None"] host: - aws-sdk-cpp - # abseil is only here to help conda pick the right constraints for pyarrow, see - # https://github.com/conda-forge/arrow-cpp-feedstock/pull/815#issuecomment-1216713245 - - libabseil - boost-cpp >=1.70 - brotli - bzip2 @@ -93,6 +90,7 @@ outputs: - gflags - glog - google-cloud-cpp + - libabseil - libgrpc - libprotobuf - clangdev {{ llvm_version }} From 0a30aab62c44e827376c79ab4dab7b63caafd5c8 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 7 Nov 2022 15:22:56 +1100 Subject: [PATCH 13/40] move LLVM deps to top of host --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5bef9ef1c..aea6d73c9 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -82,6 +82,8 @@ outputs: - {{ compiler('cxx') }} - {{ compiler("cuda") }} # [cuda_compiler_version != "None"] host: + - clangdev {{ llvm_version }} + - llvmdev {{ llvm_version }} - aws-sdk-cpp - boost-cpp >=1.70 - brotli @@ -93,8 +95,6 @@ outputs: - libabseil - libgrpc - libprotobuf - - clangdev {{ llvm_version }} - - llvmdev {{ llvm_version }} - libutf8proc - lz4-c # gandiva depends on openssl From 5f7cdb541623e8e84439604499b46be5cb0f3862 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 7 Nov 2022 16:12:04 +1100 Subject: [PATCH 14/40] ensure we split jobs based on openssl version --- recipe/meta.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index aea6d73c9..381cf5411 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -33,6 +33,12 @@ outputs: build: number: {{ proc_build_number }} string: {{ build_ext }} + ignore_run_exports_from: + - openssl + requirements: + host: + # ensure we split the CI jobs per openssl version + - openssl test: commands: - exit 0 @@ -49,7 +55,12 @@ outputs: build: number: {{ proc_build_number }} string: {{ build_ext }} + ignore_run_exports_from: + - openssl requirements: + host: + # ensure we split the CI jobs per openssl version + - openssl run: - apache-arrow-proc ={{ build_ext_version }}={{ build_ext }} test: From a609f572269be5e765cfab5c7b87d500ad468081 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 7 Nov 2022 18:47:29 +1100 Subject: [PATCH 15/40] set -DARROW_USE_GLOG=ON --- recipe/bld-arrow.bat | 1 + recipe/build-arrow.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/recipe/bld-arrow.bat b/recipe/bld-arrow.bat index c8eacfb43..c2fd3f534 100644 --- a/recipe/bld-arrow.bat +++ b/recipe/bld-arrow.bat @@ -37,6 +37,7 @@ cmake -G "Ninja" ^ -DARROW_S3:BOOL=ON ^ -DARROW_SIMD_LEVEL:STRING=NONE ^ -DARROW_SUBSTRAIT:BOOL=ON ^ + -DARROW_USE_GLOG:BOOL=ON ^ -DARROW_WITH_BROTLI:BOOL=ON ^ -DARROW_WITH_BZ2:BOOL=ON ^ -DARROW_WITH_LZ4:BOOL=ON ^ diff --git a/recipe/build-arrow.sh b/recipe/build-arrow.sh index 3a26bd2ed..5a0d26d6c 100644 --- a/recipe/build-arrow.sh +++ b/recipe/build-arrow.sh @@ -84,6 +84,7 @@ cmake -GNinja \ -DARROW_S3=ON \ -DARROW_SIMD_LEVEL=NONE \ -DARROW_SUBSTRAIT=ON \ + -DARROW_USE_GLOG=ON \ -DARROW_USE_LD_GOLD=ON \ -DARROW_WITH_BROTLI=ON \ -DARROW_WITH_BZ2=ON \ From e6fefe220f31233449e039bfa625c87e3ef21de6 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 7 Nov 2022 18:48:26 +1100 Subject: [PATCH 16/40] add gflags as host-dep for pyarrow on unix warning otherwise: ``` WARNING (pyarrow,lib/python3.10/site-packages/pyarrow/plasma-store-server): Needed DSO lib/libgflags.so.2.2 found in ['gflags'] WARNING (pyarrow,lib/python3.10/site-packages/pyarrow/plasma-store-server): .. but ['gflags'] not in reqs/run, (i.e. it is overlinking) (likely) or a missing dependency (less likely) ``` --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 381cf5411..75da2e6e2 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -229,6 +229,7 @@ outputs: - clangdev {{ llvm_version }} - llvmdev {{ llvm_version }} - cython + - gflags # [unix] - numpy - openssl - python From d6c957ebd04660c0e770c02005b7003d44c6031d Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 8 Nov 2022 10:20:50 +1100 Subject: [PATCH 17/40] silence warning for missing libcuda.so / nvcuda.dll --- recipe/meta.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 75da2e6e2..240f419f0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -78,6 +78,9 @@ outputs: ignore_run_exports: - cudatoolkit track_features: {{ "[arrow-cuda]" if cuda_enabled else "" }} + missing_dso_whitelist: + - "*/libcuda.so.*" # [linux] + - "*/nvcuda.dll" # [win] requirements: build: - clangdev {{ llvm_version }} # [osx and arm64] From f148038661574c2fc5b815c732d2c5015a58c527 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 8 Nov 2022 10:35:46 +1100 Subject: [PATCH 18/40] silence warnings about libarrow_python{,_flight}; add tests --- recipe/meta.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 240f419f0..e15b416ca 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -214,6 +214,14 @@ outputs: ignore_run_exports_from: - openssl track_features: {{ "[arrow-cuda]" if cuda_enabled else "" }} + missing_dso_whitelist: + # not actually missing, but installed into SP_DIR, see tests + - "*/libarrow_python.so.*" # [linux] + - "*/libarrow_python_flight.so.*" # [linux] + - "*/libarrow_python.*.dylib" # [osx] + - "*/libarrow_python_flight.*.dylib" # [osx] + - "*/arrow_python.dll" # [win] + - "*/arrow_python_flight.dll" # [win] requirements: build: - python # [build_platform != target_platform] @@ -277,6 +285,14 @@ outputs: # However, we check below for (at least) the presence of a correctly-compiled module - pyarrow.cuda # [cuda_compiler_version != "None" and not win] commands: + # libraries that depend on python (and hence aren't in libarrow itself) + - test -f ${SP_DIR}/pyarrow/libarrow_python.so # [linux] + - test -f ${SP_DIR}/pyarrow/libarrow_python_flight.so # [linux] + - test -f ${SP_DIR}/pyarrow/libarrow_python.dylib # [osx] + - test -f ${SP_DIR}/pyarrow/libarrow_python_flight.dylib # [osx] + - if not exist %SP_DIR%\pyarrow\arrow_python.dll exit 1 # [win] + - if not exist %SP_DIR%\pyarrow\arrow_python_flight.dll exit 1 # [win] + - test ! -f ${SP_DIR}/pyarrow/tests/test_array.py # [unix] - if exist %SP_DIR%/pyarrow/tests/test_array.py exit 1 # [win] # Need to remove dot from PY_VER; %MYVAR:x=y% replaces "x" in %MYVAR% with "y" From 956dcc6caf149e55f30214099a2f88c97d69a867 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 8 Nov 2022 10:42:39 +1100 Subject: [PATCH 19/40] use cuda_compiler_version_min to simplify skips & run-constraints --- recipe/meta.yaml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e15b416ca..a35705999 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -17,13 +17,7 @@ build: number: 0 # 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 # [(win or linux64) and cuda_compiler_version not in ("None", "10.2")] - skip: true # [linux and (aarch64 or ppc64le) and cuda_compiler_version not in ("None", "11.2")] - skip: true # [osx and cuda_compiler_version != "None"] - # CUDA builds on ppc64le currently run out of time on Travis CI. - # It may be possible to move these to cross-compilation, but this will take additional work. - # Hence this is skipped for now until this can be addressed. - skip: true # [linux and ppc64le and cuda_compiler_version != "None"] + skip: true # [cuda_compiler_version not in ("None", cuda_compiler_version_min)] run_exports: - {{ pin_subpackage("libarrow", max_pin="x.x.x") }} @@ -123,7 +117,7 @@ outputs: - zstd run_constrained: - apache-arrow-proc =*={{ build_ext }} - - cudatoolkit >=9.2 # [cuda_compiler_version != "None"] + - cudatoolkit >={{ cuda_compiler_version_min }} # [cuda_compiler_version != "None"] # make sure we don't co-install with old version of old package name - arrow-cpp ={{ version }} @@ -255,7 +249,7 @@ outputs: - python run_constrained: - apache-arrow-proc =*={{ build_ext }} - - cudatoolkit >=9.2 # [cuda_compiler_version != "None"] + - cudatoolkit >={{ cuda_compiler_version_min }} # [cuda_compiler_version != "None"] about: home: http://github.com/apache/arrow @@ -340,7 +334,7 @@ outputs: - python run_constrained: - apache-arrow-proc =*={{ build_ext }} - - cudatoolkit >=9.2 # [cuda_compiler_version != "None"] + - cudatoolkit >={{ cuda_compiler_version_min }} # [cuda_compiler_version != "None"] about: home: http://github.com/apache/arrow From e5ec64bce1786c89a91d6d9d57eb8a6195ce9eba Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 8 Nov 2022 11:34:39 +1100 Subject: [PATCH 20/40] add host-deps that leak from static google-cloud-cpp on win --- recipe/meta.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a35705999..772cb9123 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -101,6 +101,11 @@ outputs: - glog - google-cloud-cpp - libabseil + # since libgoogle-cloud is static on windows, see + # https://github.com/conda-forge/google-cloud-cpp-feedstock/pull/108, + # its dependencies leak into the build here + - libcrc32c # [win] + - libcurl # [win] - libgrpc - libprotobuf - libutf8proc From 2d5bb26527745f152528029771edf30798edf0f4 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 8 Nov 2022 11:58:16 +1100 Subject: [PATCH 21/40] add 9.0.x to abi_migration_branches --- conda-forge.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda-forge.yml b/conda-forge.yml index 9bf937273..deaae5c72 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -5,6 +5,7 @@ bot: - 6.0.x - 7.0.x - 8.0.x + - 9.0.x build_platform: linux_ppc64le: linux_64 osx_arm64: osx_64 From 046af23243210d03d8fea6b81cf01d9b4bfc2dbd Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 22 Nov 2022 22:16:22 +1100 Subject: [PATCH 22/40] bump build_ext_version for `-proc` packages --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 772cb9123..8cb7fc17d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set version = "10.0.0" %} {% set cuda_enabled = cuda_compiler_version != "None" %} -{% set build_ext_version = "3.0.0" %} +{% set build_ext_version = "4.0.0" %} {% set build_ext = "cuda" if cuda_enabled else "cpu" %} {% set proc_build_number = "0" %} {% set llvm_version = "14" %} From e45494eb12291e6f923d64cafdd6ec5f05102710 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 22 Nov 2022 22:20:07 +1100 Subject: [PATCH 23/40] cross-compile aarch64 --- conda-forge.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda-forge.yml b/conda-forge.yml index deaae5c72..c56000135 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -7,6 +7,7 @@ bot: - 8.0.x - 9.0.x build_platform: + linux_aarch64: linux_64 linux_ppc64le: linux_64 osx_arm64: osx_64 conda_forge_output_validation: true From 25c29062b8b30a980d2b82ca167a1d746596f4fd Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 22 Nov 2022 22:32:06 +1100 Subject: [PATCH 24/40] add cross-compatible cuda migrator for aarch/ppc with changes from conda-forge/conda-forge-pinning-feedstock#3624 --- .../migrations/cuda_112_ppc64le_aarch64.yaml | 31 +++++++++++-------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/.ci_support/migrations/cuda_112_ppc64le_aarch64.yaml b/.ci_support/migrations/cuda_112_ppc64le_aarch64.yaml index 3b1495d2b..5d024931a 100644 --- a/.ci_support/migrations/cuda_112_ppc64le_aarch64.yaml +++ b/.ci_support/migrations/cuda_112_ppc64le_aarch64.yaml @@ -21,21 +21,26 @@ __migrator: arm_variant_type: # [aarch64] - sbsa # [aarch64] -c_compiler_version: # [aarch64] - - 10 # [aarch64] -cxx_compiler_version: # [aarch64] - - 10 # [aarch64] -fortran_compiler_version: # [aarch64] - - 10 # [aarch64] +c_compiler_version: # [ppc64le or aarch64] + - 10 # [ppc64le or aarch64] +cxx_compiler_version: # [ppc64le or aarch64] + - 10 # [ppc64le or aarch64] +fortran_compiler_version: # [ppc64le or aarch64] + - 10 # [ppc64le or aarch64] -cuda_compiler_version: # [aarch64] - - 11.2 # [aarch64] +cuda_compiler_version: # [ppc64le or aarch64] + - 11.2 # [ppc64le or aarch64] -cudnn: # [aarch64] - - 8 # [aarch64] +cudnn: # [ppc64le or aarch64] + - 8 # [ppc64le or aarch64] -cdt_name: # [aarch64] - - cos7 # [aarch64] +cdt_name: # [ppc64le or aarch64] + - cos7 # [ppc64le or aarch64] -docker_image: # [os.environ.get("BUILD_PLATFORM", "").startswith("linux") and aarch64] +docker_image: # [os.environ.get("BUILD_PLATFORM", "").startswith("linux") and (ppc64le or aarch64)] + # case: native compilation (build == target) + - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.2 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"] - quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] + # case: cross-compilation (build != target) + - quay.io/condaforge/linux-anvil-cuda:11.2 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-64"] + - quay.io/condaforge/linux-anvil-cuda:11.2 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] From 6c8b6c96206f76166bbba306fff363aab34d8fdd Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 22 Nov 2022 22:54:57 +1100 Subject: [PATCH 25/40] remove dependence on six --- recipe/meta.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8cb7fc17d..20e817594 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -245,7 +245,6 @@ outputs: - python - setuptools - setuptools_scm - - six run: - {{ pin_subpackage('libarrow', exact=True) }} - {{ pin_compatible('numpy') }} @@ -333,7 +332,6 @@ outputs: - python - setuptools - setuptools_scm - - six run: - {{ pin_subpackage('pyarrow', exact=True) }} - python From 1d6fb32594ab40dec054e0b4844861dcaa5c042d Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 23 Nov 2022 00:29:38 +1100 Subject: [PATCH 26/40] move about section to the end of each output --- recipe/meta.yaml | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 20e817594..92256058d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -126,13 +126,6 @@ outputs: # make sure we don't co-install with old version of old package name - arrow-cpp ={{ version }} - about: - home: http://github.com/apache/arrow - license: Apache-2.0 - license_file: - - LICENSE.txt - summary: C++ libraries for Apache Arrow - test: commands: # headers @@ -184,6 +177,13 @@ outputs: - if exist %PREFIX%\\Library\\lib\\parquet_static.lib exit 1 # [win] - if exist %PREFIX%\\Library\\lib\\gandiva_static.lib exit 1 # [win] + about: + home: http://github.com/apache/arrow + license: Apache-2.0 + license_file: + - LICENSE.txt + summary: C++ libraries for Apache Arrow + # compat output for old naming scheme; switched for 10.0.0; keep for a few versions - name: arrow-cpp version: {{ version }} @@ -255,13 +255,6 @@ outputs: - apache-arrow-proc =*={{ build_ext }} - cudatoolkit >={{ cuda_compiler_version_min }} # [cuda_compiler_version != "None"] - about: - home: http://github.com/apache/arrow - license: Apache-2.0 - license_file: - - LICENSE.txt - summary: Python libraries for Apache Arrow - test: files: - test_read_parquet.py @@ -297,6 +290,13 @@ outputs: - if not exist %SP_DIR%/pyarrow/_cuda.cp%PY_VER:.=%-win_amd64.pyd exit 1 # [win and cuda_compiler_version != "None"] - python test_read_parquet.py + about: + home: http://github.com/apache/arrow + license: Apache-2.0 + license_file: + - LICENSE.txt + summary: Python libraries for Apache Arrow + - name: pyarrow-tests script: build-pyarrow.sh # [not win] script: bld-pyarrow.bat # [win] @@ -339,6 +339,11 @@ outputs: - apache-arrow-proc =*={{ build_ext }} - cudatoolkit >={{ cuda_compiler_version_min }} # [cuda_compiler_version != "None"] + test: + commands: + - test -f ${SP_DIR}/pyarrow/tests/test_array.py # [unix] + - if not exist %SP_DIR%/pyarrow/tests/test_array.py exit 1 # [win] + about: home: http://github.com/apache/arrow license: Apache-2.0 @@ -346,11 +351,6 @@ outputs: - LICENSE.txt summary: Python test files for Apache Arrow - test: - commands: - - test -f ${SP_DIR}/pyarrow/tests/test_array.py # [unix] - - if not exist %SP_DIR%/pyarrow/tests/test_array.py exit 1 # [win] - about: home: http://github.com/apache/arrow license: Apache-2.0 From db5d504ab3b92b5ba32f7ab1d85256ab8ff964d5 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 23 Nov 2022 09:35:45 +1100 Subject: [PATCH 27/40] bump to 10.0.1 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 92256058d..d773312f2 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "10.0.0" %} +{% set version = "10.0.1" %} {% set cuda_enabled = cuda_compiler_version != "None" %} {% set build_ext_version = "4.0.0" %} {% set build_ext = "cuda" if cuda_enabled else "cpu" %} @@ -11,7 +11,7 @@ package: source: url: https://dist.apache.org/repos/dist/release/arrow/arrow-{{ version }}/apache-arrow-{{ version }}.tar.gz - sha256: 5b46fa4c54f53e5df0019fe0f9d421e93fc906b625ebe8e89eed010d561f1f12 + sha256: c814e0670112a22c1a6ec03ab420a52ae236a9a42e9e438c3cbd37f37e658fb3 build: number: 0 From 6c775e7f8dec9f26f9d5d5db3df534e68e7d8d67 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 23 Nov 2022 10:18:46 +1100 Subject: [PATCH 28/40] build arrow_flight_sql also on windows --- recipe/bld-arrow.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/bld-arrow.bat b/recipe/bld-arrow.bat index c2fd3f534..b3c283ddb 100644 --- a/recipe/bld-arrow.bat +++ b/recipe/bld-arrow.bat @@ -26,6 +26,7 @@ cmake -G "Ninja" ^ -DARROW_FILESYSTEM:BOOL=ON ^ -DARROW_FLIGHT:BOOL=ON ^ -DARROW_FLIGHT_REQUIRE_TLSCREDENTIALSOPTIONS:BOOL=ON ^ + -DARROW_FLIGHT_SQL:BOOL=ON ^ -DARROW_GANDIVA:BOOL=ON ^ -DARROW_GCS:BOOL=ON ^ -DARROW_HDFS:BOOL=ON ^ From 5d24f882ff9ca04f8ebba926b87e8d98530d32f9 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 23 Nov 2022 10:34:47 +1100 Subject: [PATCH 29/40] condense & complete libarrow tests --- recipe/meta.yaml | 72 +++++++++++++++++++----------------------------- 1 file changed, 29 insertions(+), 43 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d773312f2..10ca9046e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -128,54 +128,40 @@ outputs: test: commands: + {% set headers = [ + "arrow/api.h", "arrow/flight/types.h", "arrow/flight/sql/api.h", + "gandiva/engine.h", "parquet/api/reader.h" + ] %} + {% set headers = headers + ["plasma/client.h"] %} # [unix] + {% for each_header in headers %} # headers - - test -f $PREFIX/include/arrow/api.h # [unix] - - test -f $PREFIX/include/arrow/flight/types.h # [unix] - - test -f $PREFIX/include/arrow/flight/sql/api.h # [unix] - - test -f $PREFIX/include/plasma/client.h # [unix] - - test -f $PREFIX/include/gandiva/engine.h # [unix] - - test -f $PREFIX/include/parquet/api/reader.h # [unix] - - if not exist %LIBRARY_INC%\\arrow\\api.h exit 1 # [win] - - if not exist %LIBRARY_INC%\\gandiva\\engine.h exit 1 # [win] - - if not exist %LIBRARY_INC%\\parquet\\api\\reader.h exit 1 # [win] + - test -f $PREFIX/include/{{ each_header }} || (echo "{{ each_header }} not found" && exit 1) # [unix] + - if not exist %LIBRARY_INC%\{{ "\\".join(each_header.split("/")) }} exit 1 # [win] + {% endfor %} + {% set libs = (cuda_compiler_version != "None") * ["arrow_cuda"] + [ + "arrow", "arrow_dataset", "arrow_flight", "arrow_flight_sql", + "arrow_substrait", "gandiva", "parquet" + ] %} + {% set libs = libs + ["plasma"] %} # [unix] + {% for each_lib in libs %} # shared - - test -f $PREFIX/lib/libarrow.so # [linux] - - test -f $PREFIX/lib/libarrow_dataset.so # [linux] - - test -f $PREFIX/lib/libarrow_flight.so # [linux] - - test -f $PREFIX/lib/libarrow_flight_sql.so # [linux] - - test -f $PREFIX/lib/libparquet.so # [linux] - - test -f $PREFIX/lib/libgandiva.so # [linux] - - test -f $PREFIX/lib/libplasma.so # [linux] - - test -f $PREFIX/lib/libarrow_cuda${SHLIB_EXT} # [(cuda_compiler_version != "None") and unix] - - test ! -f $PREFIX/lib/libarrow_cuda${SHLIB_EXT} # [(cuda_compiler_version == "None") and unix] - - if not exist %PREFIX%\\Library\\bin\\arrow_cuda.dll exit 1 # [(cuda_compiler_version != "None") and win] - - if exist %PREFIX%\\Library\\bin\\arrow_cuda.dll exit 1 # [(cuda_compiler_version == "None") and win] - - test -f $PREFIX/lib/libarrow.dylib # [osx] - - test -f $PREFIX/lib/libarrow_dataset.dylib # [osx] - - test -f $PREFIX/lib/libgandiva.dylib # [osx] - - test -f $PREFIX/lib/libparquet.dylib # [osx] - - test -f $PREFIX/lib/libplasma.dylib # [osx] - - if not exist %PREFIX%\\Library\\bin\\arrow.dll exit 1 # [win] - - if not exist %PREFIX%\\Library\\bin\\arrow_dataset.dll exit 1 # [win] - - if not exist %PREFIX%\\Library\\bin\\arrow_flight.dll exit 1 # [win] - - if not exist %PREFIX%\\Library\\bin\\parquet.dll exit 1 # [win] - - if not exist %PREFIX%\\Library\\bin\\gandiva.dll exit 1 # [win] + - test -f $PREFIX/lib/lib{{ each_lib }}.so # [linux] + - test -f $PREFIX/lib/lib{{ each_lib }}.dylib # [osx] + - if not exist %LIBRARY_BIN%\{{ each_lib }}.dll exit 1 # [win] + - if not exist %LIBRARY_LIB%\{{ each_lib }}.lib exit 1 # [win] # absence of static libraries - - test ! -f $PREFIX/lib/libarrow.a # [unix] - - test ! -f $PREFIX/lib/libarrow_dataset.a # [unix] - - test ! -f $PREFIX/lib/libarrow_flight.a # [unix] - - test ! -f $PREFIX/lib/libarrow_flight_sql.a # [unix] - - test ! -f $PREFIX/lib/libplasma.a # [unix] - - test ! -f $PREFIX/lib/libparquet.a # [unix] - - test ! -f $PREFIX/lib/libgandiva.a # [unix] - - if exist %PREFIX%\\Library\\lib\\arrow_static.lib exit 1 # [win] - - if exist %PREFIX%\\Library\\lib\\arrow_dataset_static.lib exit 1 # [win] - - if exist %PREFIX%\\Library\\lib\\arrow_flight_static.lib exit 1 # [win] - - if exist %PREFIX%\\Library\\lib\\arrow_flight_sql_static.lib exit 1 # [win] - - if exist %PREFIX%\\Library\\lib\\parquet_static.lib exit 1 # [win] - - if exist %PREFIX%\\Library\\lib\\gandiva_static.lib exit 1 # [win] + - test ! -f $PREFIX/lib/lib{{ each_lib }}.a # [unix] + - if exist %LIBRARY_LIB%\{{ each_lib }}_static.lib exit 1 # [win] + {% endfor %} + + # absence of arrow_cuda for CPU builds + - test ! -f $PREFIX/lib/libarrow_cuda.so # [(cuda_compiler_version == "None") and linux] + - test ! -f $PREFIX/lib/libarrow_cuda.a # [(cuda_compiler_version == "None") and linux] + - if exist %LIBRARY_BIN%\arrow_cuda.dll exit 1 # [(cuda_compiler_version == "None") and win] + - if exist %LIBRARY_LIB%\arrow_cuda.lib exit 1 # [(cuda_compiler_version == "None") and win] + - if exist %LIBRARY_LIB%\arrow_cuda_static.lib exit 1 # [(cuda_compiler_version == "None") and win] about: home: http://github.com/apache/arrow From f6cd3c6d8b82a571227028450ee5f99b32a91ac9 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 23 Nov 2022 11:14:16 +1100 Subject: [PATCH 30/40] backport patch for including pyarrow header files; add tests --- recipe/meta.yaml | 6 ++ ...on-PyArrow-C-header-files-no-longer-.patch | 86 +++++++++++++++++++ 2 files changed, 92 insertions(+) create mode 100644 recipe/patches/0001-ARROW-18340-Python-PyArrow-C-header-files-no-longer-.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 10ca9046e..d6396631c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,6 +12,9 @@ package: source: url: https://dist.apache.org/repos/dist/release/arrow/arrow-{{ version }}/apache-arrow-{{ version }}.tar.gz sha256: c814e0670112a22c1a6ec03ab420a52ae236a9a42e9e438c3cbd37f37e658fb3 + 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 build: number: 0 @@ -270,6 +273,9 @@ outputs: - if not exist %SP_DIR%\pyarrow\arrow_python.dll exit 1 # [win] - if not exist %SP_DIR%\pyarrow\arrow_python_flight.dll exit 1 # [win] + - test -f ${SP_DIR}/pyarrow/include/arrow/python/pyarrow.h # [unix] + - if not exist %SP_DIR%\pyarrow\include\arrow\python\pyarrow.h exit 1 # [win] + - test ! -f ${SP_DIR}/pyarrow/tests/test_array.py # [unix] - if exist %SP_DIR%/pyarrow/tests/test_array.py exit 1 # [win] # Need to remove dot from PY_VER; %MYVAR:x=y% replaces "x" in %MYVAR% with "y" diff --git a/recipe/patches/0001-ARROW-18340-Python-PyArrow-C-header-files-no-longer-.patch b/recipe/patches/0001-ARROW-18340-Python-PyArrow-C-header-files-no-longer-.patch new file mode 100644 index 000000000..21320b2ab --- /dev/null +++ b/recipe/patches/0001-ARROW-18340-Python-PyArrow-C-header-files-no-longer-.patch @@ -0,0 +1,86 @@ +From 984b9c8cf0b72e24e8917900862b37964fb27e58 Mon Sep 17 00:00:00 2001 +From: Alenka Frim +Date: Tue, 22 Nov 2022 22:01:32 +0100 +Subject: [PATCH] ARROW-18340: [Python] PyArrow C++ header files no longer + always included in installed pyarrow (#14656) + +This PR adds code to `_run_cmake` to always copy PyArrow C++ header files to `pyarrow/iclude`. + +Lead-authored-by: Alenka Frim +Co-authored-by: Alenka Frim +Co-authored-by: Joris Van den Bossche +Signed-off-by: Sutou Kouhei +--- + python/pyarrow/tests/test_cpp_internals.py | 17 +++++++++++++++++ + python/setup.py | 16 ++++++++++------ + 2 files changed, 27 insertions(+), 6 deletions(-) + +diff --git a/python/pyarrow/tests/test_cpp_internals.py b/python/pyarrow/tests/test_cpp_internals.py +index 1c44bff9b..83800b77f 100644 +--- a/python/pyarrow/tests/test_cpp_internals.py ++++ b/python/pyarrow/tests/test_cpp_internals.py +@@ -15,6 +15,9 @@ + # specific language governing permissions and limitations + # under the License. + ++import os.path ++from os.path import join as pjoin ++ + from pyarrow._pyarrow_cpp_tests import get_cpp_tests + + +@@ -31,3 +34,17 @@ def inject_cpp_tests(ns): + + + inject_cpp_tests(globals()) ++ ++ ++def test_pyarrow_include(): ++ # We need to make sure that pyarrow/include is always ++ # created. Either with PyArrow C++ header files or with ++ # Arrow C++ and PyArrow C++ header files together ++ ++ source = os.path.dirname(os.path.abspath(__file__)) ++ pyarrow_dir = pjoin(source, '..') ++ pyarrow_include = pjoin(pyarrow_dir, 'include') ++ pyarrow_cpp_include = pjoin(pyarrow_include, 'arrow', 'python') ++ ++ assert os.path.exists(pyarrow_include) ++ assert os.path.exists(pyarrow_cpp_include) +diff --git a/python/setup.py b/python/setup.py +index 2a7e5f7a3..528d9537f 100755 +--- a/python/setup.py ++++ b/python/setup.py +@@ -442,19 +442,23 @@ class build_ext(_build_ext): + else: + build_prefix = self.build_type + ++ pyarrow_include = pjoin(build_lib, 'pyarrow', 'include') ++ # Move Arrow C++ headers to pyarrow/include + if self.bundle_arrow_cpp or self.bundle_arrow_cpp_headers: + arrow_cpp_include = pjoin(build_prefix, 'include') + print('Bundling includes: ' + arrow_cpp_include) +- pyarrow_include = pjoin(build_lib, 'pyarrow', 'include') + if os.path.exists(pyarrow_include): + shutil.rmtree(pyarrow_include) + shutil.move(arrow_cpp_include, pyarrow_include) + +- # pyarrow/include file is first deleted in the previous step +- # so we need to add the PyArrow C++ include folder again +- pyarrow_cpp_include = pjoin(pyarrow_cpp_home, 'include') +- shutil.move(pjoin(pyarrow_cpp_include, 'arrow', 'python'), +- pjoin(pyarrow_include, 'arrow', 'python')) ++ # Move PyArrow headers to pyarrow/include ++ pyarrow_cpp_include = pjoin(pyarrow_cpp_home, 'include') ++ pyarrow_include_sub = pjoin(pyarrow_include, 'arrow', 'python') ++ print('Moving PyArrow C++ includes: ' + pyarrow_include_sub) ++ if os.path.exists(pyarrow_include_sub): ++ shutil.rmtree(pyarrow_include_sub) ++ shutil.move(pjoin(pyarrow_cpp_include, 'arrow', 'python'), ++ pyarrow_include_sub) + + # Move the built C-extension to the place expected by the Python + # build +-- +2.38.1.windows.1 + From a86841bc4958484053f30709cbe65eba8d55701f Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 23 Nov 2022 16:44:35 +1100 Subject: [PATCH 31/40] run full test suite --- recipe/meta.yaml | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d6396631c..60bc11914 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,11 +10,15 @@ package: version: {{ version }} source: - url: https://dist.apache.org/repos/dist/release/arrow/arrow-{{ version }}/apache-arrow-{{ version }}.tar.gz - sha256: c814e0670112a22c1a6ec03ab420a52ae236a9a42e9e438c3cbd37f37e658fb3 - 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 + - url: https://dist.apache.org/repos/dist/release/arrow/arrow-{{ version }}/apache-arrow-{{ version }}.tar.gz + sha256: c814e0670112a22c1a6ec03ab420a52ae236a9a42e9e438c3cbd37f37e658fb3 + 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 + # testing-submodule not part of release tarball + - git_url: https://github.com/apache/arrow-testing.git + git_rev: 00c483283433b4c02cb811f260dbe35414c806a4 + folder: testing build: number: 0 @@ -332,9 +336,20 @@ outputs: - cudatoolkit >={{ cuda_compiler_version_min }} # [cuda_compiler_version != "None"] test: + requires: + - pytest + - pytest-lazy-fixture + - hypothesis + - pandas + - scipy + source_files: + - testing/data commands: - - test -f ${SP_DIR}/pyarrow/tests/test_array.py # [unix] - - if not exist %SP_DIR%/pyarrow/tests/test_array.py exit 1 # [win] + - cd ${SP_DIR}/pyarrow/tests # [unix] + - cd %SP_DIR%\pyarrow\tests # [win] + - export ARROW_TEST_DATA="${SRC_DIR}/testing/data" # [unix] + - set "ARROW_TEST_DATA=%SRC_DIR%\testing\data" # [win] + - pytest -v -rfEs about: home: http://github.com/apache/arrow From 2fe189b5283e96c9d8657079a7f21f2793bebdcd Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 23 Nov 2022 16:58:01 +1100 Subject: [PATCH 32/40] skip tests on linux that raise SIGINT --- recipe/meta.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 60bc11914..3969dc794 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -349,7 +349,12 @@ outputs: - cd %SP_DIR%\pyarrow\tests # [win] - export ARROW_TEST_DATA="${SRC_DIR}/testing/data" # [unix] - set "ARROW_TEST_DATA=%SRC_DIR%\testing\data" # [win] - - pytest -v -rfEs + + {% set tests_to_skip = "_not_a_real_test" %} + # skip tests that raise SIGINT and crash the test suite + {% set tests_to_skip = tests_to_skip + " or (test_csv and test_cancellation)" %} # [linux] + {% set tests_to_skip = tests_to_skip + " or (test_flight and test_interrupt)" %} # [linux] + - pytest -v -rfEs -k "not ({{ tests_to_skip }})" about: home: http://github.com/apache/arrow From cbdff410a817c84ba0f6bde7f51f79f904772558 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 23 Nov 2022 17:16:43 +1100 Subject: [PATCH 33/40] definitely skip all tests requiring gcs_server fixture --- recipe/meta.yaml | 3 ++ ...on-PyArrow-C-header-files-no-longer-.patch | 2 +- ...all-tests-requiring-gcs_server-fixtu.patch | 35 +++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 recipe/patches/0002-definitely-skip-all-tests-requiring-gcs_server-fixtu.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3969dc794..c8f55c3de 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -15,6 +15,9 @@ 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 + # https://github.com/googleapis/storage-testbench + - patches/0002-definitely-skip-all-tests-requiring-gcs_server-fixtu.patch # testing-submodule not part of release tarball - git_url: https://github.com/apache/arrow-testing.git git_rev: 00c483283433b4c02cb811f260dbe35414c806a4 diff --git a/recipe/patches/0001-ARROW-18340-Python-PyArrow-C-header-files-no-longer-.patch b/recipe/patches/0001-ARROW-18340-Python-PyArrow-C-header-files-no-longer-.patch index 21320b2ab..ffd541679 100644 --- a/recipe/patches/0001-ARROW-18340-Python-PyArrow-C-header-files-no-longer-.patch +++ b/recipe/patches/0001-ARROW-18340-Python-PyArrow-C-header-files-no-longer-.patch @@ -1,7 +1,7 @@ From 984b9c8cf0b72e24e8917900862b37964fb27e58 Mon Sep 17 00:00:00 2001 From: Alenka Frim Date: Tue, 22 Nov 2022 22:01:32 +0100 -Subject: [PATCH] ARROW-18340: [Python] PyArrow C++ header files no longer +Subject: [PATCH 1/2] ARROW-18340: [Python] PyArrow C++ header files no longer always included in installed pyarrow (#14656) This PR adds code to `_run_cmake` to always copy PyArrow C++ header files to `pyarrow/iclude`. diff --git a/recipe/patches/0002-definitely-skip-all-tests-requiring-gcs_server-fixtu.patch b/recipe/patches/0002-definitely-skip-all-tests-requiring-gcs_server-fixtu.patch new file mode 100644 index 000000000..f89c0cb5a --- /dev/null +++ b/recipe/patches/0002-definitely-skip-all-tests-requiring-gcs_server-fixtu.patch @@ -0,0 +1,35 @@ +From c7a26cd6d9578d98b2c6236971bcbcef03c6dd87 Mon Sep 17 00:00:00 2001 +From: "H. Vetinari" +Date: Wed, 23 Nov 2022 17:10:52 +1100 +Subject: [PATCH 2/2] definitely skip all tests requiring gcs_server fixture + +since we don't have https://github.com/googleapis/storage-testbench +in conda-forge so far, which is responsible for the `python -m testbench` +--- + python/pyarrow/tests/conftest.py | 13 +------------ + 1 file changed, 1 insertion(+), 12 deletions(-) + +diff --git a/python/pyarrow/tests/conftest.py b/python/pyarrow/tests/conftest.py +index a06ac9209..0969d4e09 100644 +--- a/python/pyarrow/tests/conftest.py ++++ b/python/pyarrow/tests/conftest.py +@@ -182,15 +182,4 @@ def gcs_server(): + env = os.environ.copy() + args = [sys.executable, '-m', 'testbench', '--port', str(port)] + proc = None +- try: +- proc = subprocess.Popen(args, env=env) +- except OSError as e: +- pytest.skip(f"Command {args} failed to execute: {e}") +- else: +- yield { +- 'connection': ('localhost', port), +- 'process': proc, +- } +- finally: +- if proc is not None: +- proc.kill() ++ pytest.skip(f"Tests depending on gcs_server disabled in conda-forge") +-- +2.38.1.windows.1 + From 54bb405d3ee8a7793d6b5e28e254be883860f901 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 24 Nov 2022 16:26:52 +1100 Subject: [PATCH 34/40] build substrait support in pyarrow --- recipe/bld-pyarrow.bat | 1 + recipe/build-pyarrow.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/recipe/bld-pyarrow.bat b/recipe/bld-pyarrow.bat index dfc46b551..a92e675aa 100644 --- a/recipe/bld-pyarrow.bat +++ b/recipe/bld-pyarrow.bat @@ -23,6 +23,7 @@ SET PYARROW_WITH_HDFS=1 SET PYARROW_WITH_PARQUET=1 SET PYARROW_WITH_PARQUET_ENCRYPTION=1 SET PYARROW_WITH_S3=1 +SET PYARROW_WITH_SUBSTRAIT=1 SET PYARROW_CMAKE_GENERATOR=Ninja :: Enable CUDA support diff --git a/recipe/build-pyarrow.sh b/recipe/build-pyarrow.sh index 9f5b70649..692ffb780 100644 --- a/recipe/build-pyarrow.sh +++ b/recipe/build-pyarrow.sh @@ -19,6 +19,7 @@ export PYARROW_WITH_PARQUET=1 export PYARROW_WITH_PARQUET_ENCRYPTION=1 export PYARROW_WITH_PLASMA=1 export PYARROW_WITH_S3=1 +export PYARROW_WITH_SUBSTRAIT=1 export PYARROW_CMAKE_GENERATOR=Ninja export PYARROW_CMAKE_OPTIONS="-DARROW_SIMD_LEVEL=NONE" BUILD_EXT_FLAGS="" From 4869c04f2ebac35cd0957ff0c9e349e256abedd8 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 24 Nov 2022 17:00:10 +1100 Subject: [PATCH 35/40] add some more optional test dependencies --- recipe/meta.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c8f55c3de..b89d691a6 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -342,9 +342,25 @@ outputs: requires: - pytest - pytest-lazy-fixture + - backports.zoneinfo # [py<39] + - cffi + - cloudpickle + - cython + - fastparquet + - fsspec - hypothesis - pandas + # not all arches available in conda-forge; osx-arm not tested anyway + - pytorch * # [unix and not ppc64le and py<311] - scipy + # we're not building java bindings + # - jpype1 + # doesn't get picked up correctly + # - libhdfs3 + # causes segfaults + # - sparse + # not rebuilt for grpc 1.49 yet + # - tensorflow source_files: - testing/data commands: From e6f75edbeae55ce482c3fc08a1d969e14bd4a4fc Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 24 Nov 2022 12:08:33 +1100 Subject: [PATCH 36/40] add skips for tests that cannot succeed --- recipe/meta.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b89d691a6..eab22acf4 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -370,9 +370,17 @@ outputs: - set "ARROW_TEST_DATA=%SRC_DIR%\testing\data" # [win] {% set tests_to_skip = "_not_a_real_test" %} + # we do not have GPUs in CI --> cannot test cuda + {% set tests_to_skip = tests_to_skip + " or test_cuda" %} # skip tests that raise SIGINT and crash the test suite {% set tests_to_skip = tests_to_skip + " or (test_csv and test_cancellation)" %} # [linux] {% set tests_to_skip = tests_to_skip + " or (test_flight and test_interrupt)" %} # [linux] + # skip tests that make invalid(-for-conda) assumptions about the compilers setup + {% set tests_to_skip = tests_to_skip + " or test_cython_api" %} # [unix] + {% set tests_to_skip = tests_to_skip + " or test_visit_strings" %} # [unix] + # skip tests that cannot succeed in emulation + {% set tests_to_skip = tests_to_skip + " or test_debug_memory_pool_disabled" %} # [aarch64 or ppc64le] + {% set tests_to_skip = tests_to_skip + " or test_env_var_io_thread_count" %} # [aarch64 or ppc64le] - pytest -v -rfEs -k "not ({{ tests_to_skip }})" about: From 128015a3ba2112aef59e4cec1b1c5e385f7e0642 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 29 Nov 2022 22:28:42 +1100 Subject: [PATCH 37/40] add some currently necessary test skips --- recipe/meta.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index eab22acf4..84e7bc41e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -381,6 +381,13 @@ outputs: # skip tests that cannot succeed in emulation {% set tests_to_skip = tests_to_skip + " or test_debug_memory_pool_disabled" %} # [aarch64 or ppc64le] {% set tests_to_skip = tests_to_skip + " or test_env_var_io_thread_count" %} # [aarch64 or ppc64le] + # vvvvvvv TESTS THAT SHOULDN'T HAVE TO BE SKIPPED vvvvvvv + # failing on linux with "OSError: Could not connect to socket /tmp/[...]/plasma.sock" + {% set tests_to_skip = tests_to_skip + " or test_plasma" %} # [linux] + # "Unsupported backend 'nonexistent' specified in ARROW_DEFAULT_MEMORY_POOL" + {% set tests_to_skip = tests_to_skip + " or (test_memory and test_env_var)" %} # [unix] + # test is broken; header is in $PREFIX, not $SP_DIR + {% set tests_to_skip = tests_to_skip + " or (test_misc and test_get_include)" %} # [unix] - pytest -v -rfEs -k "not ({{ tests_to_skip }})" about: From 72b66099e1b35b0ab8e470a30e5bf85ce0a54cce Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 29 Nov 2022 22:29:30 +1100 Subject: [PATCH 38/40] skip running test suite on PPC; same reason as for numpy/scipy --- recipe/meta.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 84e7bc41e..54d8a26b3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -388,7 +388,9 @@ outputs: {% set tests_to_skip = tests_to_skip + " or (test_memory and test_env_var)" %} # [unix] # test is broken; header is in $PREFIX, not $SP_DIR {% set tests_to_skip = tests_to_skip + " or (test_misc and test_get_include)" %} # [unix] - - pytest -v -rfEs -k "not ({{ tests_to_skip }})" + - pytest -v -rfEs -k "not ({{ tests_to_skip }})" # [not ppc64le] + # NOTE: test suite is skipped on ppc due to bugs in QEMU code that cause + # CI to fail, even though the tests would run through on native hardware about: home: http://github.com/apache/arrow From eb770992ac4c13e6df2a433779d63f5c1b10d893 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 29 Nov 2022 22:34:40 +1100 Subject: [PATCH 39/40] TEMP: skip CUDA on aarch64 until we can cross-compile --- recipe/meta.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 54d8a26b3..174a31d43 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -28,6 +28,9 @@ build: # 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)] + # temporary: skip CUDA on aarch/ppc until cross-compilation works, see + # https://github.com/conda-forge/conda-forge-ci-setup-feedstock/pull/210 + skip: true # [(aarch64 or ppc64le) and (cuda_compiler_version != "None")] run_exports: - {{ pin_subpackage("libarrow", max_pin="x.x.x") }} From cef4c3f3ec19fcf9225fae2c70e42823caaeff70 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 29 Nov 2022 23:03:00 +1100 Subject: [PATCH 40/40] MNT: Re-rendered with conda-build 3.23.1, conda-smithy 3.22.0, and conda-forge-pinning 2022.11.27.15.56.36 --- .azure-pipelines/azure-pipelines-linux.yml | 85 ++---- .azure-pipelines/azure-pipelines-osx.yml | 29 +- .azure-pipelines/azure-pipelines-win.yml | 31 +-- ...rsion10numpy1.20python3.8.____cpython.yaml | 70 ----- ...rsion10numpy1.20python3.9.____cpython.yaml | 70 ----- ...ersion7numpy1.20python3.8.____cpython.yaml | 70 ----- ...ersion7numpy1.20python3.9.____cpython.yaml | 70 ----- ...uda_compiler_version10.2openssl1.1.1.yaml} | 10 + ...64_cuda_compiler_version10.2openssl3.yaml} | 12 +- ...uda_compiler_versionNoneopenssl1.1.1.yaml} | 10 + ...64_cuda_compiler_versionNoneopenssl3.yaml} | 12 +- ...ion11.2numpy1.20python3.8.____cpython.yaml | 74 ------ ...ion11.2numpy1.20python3.9.____cpython.yaml | 74 ------ ...on11.2numpy1.21python3.10.____cpython.yaml | 74 ------ ...on11.2numpy1.23python3.11.____cpython.yaml | 74 ------ ...ionNonenumpy1.20python3.8.____cpython.yaml | 74 ------ ...ionNonenumpy1.20python3.9.____cpython.yaml | 74 ------ ...uda_compiler_versionNoneopenssl1.1.1.yaml} | 12 +- ...64_cuda_compiler_versionNoneopenssl3.yaml} | 14 +- ...uda_compiler_versionNoneopenssl1.1.1.yaml} | 8 + ...le_cuda_compiler_versionNoneopenssl3.yaml} | 10 +- ...pc64le_numpy1.20python3.8.____cpython.yaml | 68 ----- ...pc64le_numpy1.20python3.9.____cpython.yaml | 68 ----- .../migrations/google_cloud_cpp230.yaml | 11 - .ci_support/migrations/grpc_cpp149.yaml | 13 - .ci_support/migrations/libprotobuf321.yaml | 7 - ...osx_64_numpy1.20python3.8.____cpython.yaml | 65 ----- ...osx_64_numpy1.20python3.9.____cpython.yaml | 65 ----- ..._cpython.yaml => osx_64_openssl1.1.1.yaml} | 8 + ....____cpython.yaml => osx_64_openssl3.yaml} | 10 +- ..._arm64_numpy1.20python3.8.____cpython.yaml | 65 ----- ..._arm64_numpy1.20python3.9.____cpython.yaml | 65 ----- ...ython.yaml => osx_arm64_openssl1.1.1.yaml} | 8 + ...__cpython.yaml => osx_arm64_openssl3.yaml} | 10 +- ...uda_compiler_version10.2openssl1.1.1.yaml} | 14 + ...64_cuda_compiler_version10.2openssl3.yaml} | 16 +- ...ionNonenumpy1.20python3.8.____cpython.yaml | 55 ---- ...ionNonenumpy1.20python3.9.____cpython.yaml | 55 ---- ...onNonenumpy1.21python3.10.____cpython.yaml | 55 ---- ...onNonenumpy1.23python3.11.____cpython.yaml | 55 ---- ...uda_compiler_versionNoneopenssl1.1.1.yaml} | 14 + ...64_cuda_compiler_versionNoneopenssl3.yaml} | 16 +- .circleci/config.yml | 2 +- .scripts/build_steps.sh | 4 +- .scripts/run_osx_build.sh | 5 +- README.md | 248 ++++-------------- 46 files changed, 265 insertions(+), 1694 deletions(-) delete mode 100644 .ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10numpy1.20python3.8.____cpython.yaml delete mode 100644 .ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10numpy1.20python3.9.____cpython.yaml delete mode 100644 .ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.20python3.8.____cpython.yaml delete mode 100644 .ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.20python3.9.____cpython.yaml rename .ci_support/{linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.21python3.10.____cpython.yaml => linux_64_cuda_compiler_version10.2openssl1.1.1.yaml} (85%) rename .ci_support/{linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.23python3.11.____cpython.yaml => linux_64_cuda_compiler_version10.2openssl3.yaml} (84%) rename .ci_support/{linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10numpy1.21python3.10.____cpython.yaml => linux_64_cuda_compiler_versionNoneopenssl1.1.1.yaml} (85%) rename .ci_support/{linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10numpy1.23python3.11.____cpython.yaml => linux_64_cuda_compiler_versionNoneopenssl3.yaml} (84%) delete mode 100644 .ci_support/linux_aarch64_cuda_compiler_version11.2numpy1.20python3.8.____cpython.yaml delete mode 100644 .ci_support/linux_aarch64_cuda_compiler_version11.2numpy1.20python3.9.____cpython.yaml delete mode 100644 .ci_support/linux_aarch64_cuda_compiler_version11.2numpy1.21python3.10.____cpython.yaml delete mode 100644 .ci_support/linux_aarch64_cuda_compiler_version11.2numpy1.23python3.11.____cpython.yaml delete mode 100644 .ci_support/linux_aarch64_cuda_compiler_versionNonenumpy1.20python3.8.____cpython.yaml delete mode 100644 .ci_support/linux_aarch64_cuda_compiler_versionNonenumpy1.20python3.9.____cpython.yaml rename .ci_support/{linux_aarch64_cuda_compiler_versionNonenumpy1.21python3.10.____cpython.yaml => linux_aarch64_cuda_compiler_versionNoneopenssl1.1.1.yaml} (84%) rename .ci_support/{linux_aarch64_cuda_compiler_versionNonenumpy1.23python3.11.____cpython.yaml => linux_aarch64_cuda_compiler_versionNoneopenssl3.yaml} (84%) rename .ci_support/{linux_ppc64le_numpy1.21python3.10.____cpython.yaml => linux_ppc64le_cuda_compiler_versionNoneopenssl1.1.1.yaml} (88%) rename .ci_support/{linux_ppc64le_numpy1.23python3.11.____cpython.yaml => linux_ppc64le_cuda_compiler_versionNoneopenssl3.yaml} (87%) delete mode 100644 .ci_support/linux_ppc64le_numpy1.20python3.8.____cpython.yaml delete mode 100644 .ci_support/linux_ppc64le_numpy1.20python3.9.____cpython.yaml delete mode 100644 .ci_support/migrations/google_cloud_cpp230.yaml delete mode 100644 .ci_support/migrations/grpc_cpp149.yaml delete mode 100644 .ci_support/migrations/libprotobuf321.yaml delete mode 100644 .ci_support/osx_64_numpy1.20python3.8.____cpython.yaml delete mode 100644 .ci_support/osx_64_numpy1.20python3.9.____cpython.yaml rename .ci_support/{osx_64_numpy1.21python3.10.____cpython.yaml => osx_64_openssl1.1.1.yaml} (87%) rename .ci_support/{osx_64_numpy1.23python3.11.____cpython.yaml => osx_64_openssl3.yaml} (87%) delete mode 100644 .ci_support/osx_arm64_numpy1.20python3.8.____cpython.yaml delete mode 100644 .ci_support/osx_arm64_numpy1.20python3.9.____cpython.yaml rename .ci_support/{osx_arm64_numpy1.21python3.10.____cpython.yaml => osx_arm64_openssl1.1.1.yaml} (87%) rename .ci_support/{osx_arm64_numpy1.23python3.11.____cpython.yaml => osx_arm64_openssl3.yaml} (87%) rename .ci_support/{win_64_cuda_compiler_version10.2numpy1.23python3.11.____cpython.yaml => win_64_cuda_compiler_version10.2openssl1.1.1.yaml} (77%) rename .ci_support/{win_64_cuda_compiler_version10.2numpy1.20python3.9.____cpython.yaml => win_64_cuda_compiler_version10.2openssl3.yaml} (76%) delete mode 100644 .ci_support/win_64_cuda_compiler_versionNonenumpy1.20python3.8.____cpython.yaml delete mode 100644 .ci_support/win_64_cuda_compiler_versionNonenumpy1.20python3.9.____cpython.yaml delete mode 100644 .ci_support/win_64_cuda_compiler_versionNonenumpy1.21python3.10.____cpython.yaml delete mode 100644 .ci_support/win_64_cuda_compiler_versionNonenumpy1.23python3.11.____cpython.yaml rename .ci_support/{win_64_cuda_compiler_version10.2numpy1.21python3.10.____cpython.yaml => win_64_cuda_compiler_versionNoneopenssl1.1.1.yaml} (77%) rename .ci_support/{win_64_cuda_compiler_version10.2numpy1.20python3.8.____cpython.yaml => win_64_cuda_compiler_versionNoneopenssl3.yaml} (76%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 183259685..5924d685d 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,87 +8,38 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10numpy1.20python3.8.____cpython: - CONFIG: linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10numpy1.20python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10numpy1.20python3.9.____cpython: - CONFIG: linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10numpy1.20python3.9.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10numpy1.21python3.10.____cpython: - CONFIG: linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10numpy1.21python3.10.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10numpy1.23python3.11.____cpython: - CONFIG: linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10numpy1.23python3.11.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.20python3.8.____cpython: - CONFIG: linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.20python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-cuda:10.2 - linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.20python3.9.____cpython: - CONFIG: linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.20python3.9.____cpython + linux_64_cuda_compiler_version10.2openssl1.1.1: + CONFIG: linux_64_cuda_compiler_version10.2openssl1.1.1 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-cuda:10.2 - linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.21python3.10.____cpython: - CONFIG: linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.21python3.10.____cpython + linux_64_cuda_compiler_version10.2openssl3: + CONFIG: linux_64_cuda_compiler_version10.2openssl3 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-cuda:10.2 - linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.23python3.11.____cpython: - CONFIG: linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.23python3.11.____cpython + linux_64_cuda_compiler_versionNoneopenssl1.1.1: + CONFIG: linux_64_cuda_compiler_versionNoneopenssl1.1.1 UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-cuda:10.2 - linux_aarch64_cuda_compiler_version11.2numpy1.20python3.8.____cpython: - CONFIG: linux_aarch64_cuda_compiler_version11.2numpy1.20python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 - linux_aarch64_cuda_compiler_version11.2numpy1.20python3.9.____cpython: - CONFIG: linux_aarch64_cuda_compiler_version11.2numpy1.20python3.9.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 - linux_aarch64_cuda_compiler_version11.2numpy1.21python3.10.____cpython: - CONFIG: linux_aarch64_cuda_compiler_version11.2numpy1.21python3.10.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 - linux_aarch64_cuda_compiler_version11.2numpy1.23python3.11.____cpython: - CONFIG: linux_aarch64_cuda_compiler_version11.2numpy1.23python3.11.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 - linux_aarch64_cuda_compiler_versionNonenumpy1.20python3.8.____cpython: - CONFIG: linux_aarch64_cuda_compiler_versionNonenumpy1.20python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 - linux_aarch64_cuda_compiler_versionNonenumpy1.20python3.9.____cpython: - CONFIG: linux_aarch64_cuda_compiler_versionNonenumpy1.20python3.9.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 - linux_aarch64_cuda_compiler_versionNonenumpy1.21python3.10.____cpython: - CONFIG: linux_aarch64_cuda_compiler_versionNonenumpy1.21python3.10.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 - linux_aarch64_cuda_compiler_versionNonenumpy1.23python3.11.____cpython: - CONFIG: linux_aarch64_cuda_compiler_versionNonenumpy1.23python3.11.____cpython + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_cuda_compiler_versionNoneopenssl3: + CONFIG: linux_64_cuda_compiler_versionNoneopenssl3 UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 - linux_ppc64le_numpy1.20python3.8.____cpython: - CONFIG: linux_ppc64le_numpy1.20python3.8.____cpython + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_cuda_compiler_versionNoneopenssl1.1.1: + CONFIG: linux_aarch64_cuda_compiler_versionNoneopenssl1.1.1 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.20python3.9.____cpython: - CONFIG: linux_ppc64le_numpy1.20python3.9.____cpython + linux_aarch64_cuda_compiler_versionNoneopenssl3: + CONFIG: linux_aarch64_cuda_compiler_versionNoneopenssl3 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.21python3.10.____cpython: - CONFIG: linux_ppc64le_numpy1.21python3.10.____cpython + linux_ppc64le_cuda_compiler_versionNoneopenssl1.1.1: + CONFIG: linux_ppc64le_cuda_compiler_versionNoneopenssl1.1.1 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.23python3.11.____cpython: - CONFIG: linux_ppc64le_numpy1.23python3.11.____cpython + linux_ppc64le_cuda_compiler_versionNoneopenssl3: + CONFIG: linux_ppc64le_cuda_compiler_versionNoneopenssl3 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - maxParallel: 11 timeoutInMinutes: 360 steps: diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 249ae90ab..5fa9ba9cb 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,31 +8,18 @@ jobs: vmImage: macOS-11 strategy: matrix: - osx_64_numpy1.20python3.8.____cpython: - CONFIG: osx_64_numpy1.20python3.8.____cpython + osx_64_openssl1.1.1: + CONFIG: osx_64_openssl1.1.1 UPLOAD_PACKAGES: 'True' - osx_64_numpy1.20python3.9.____cpython: - CONFIG: osx_64_numpy1.20python3.9.____cpython + osx_64_openssl3: + CONFIG: osx_64_openssl3 UPLOAD_PACKAGES: 'True' - osx_64_numpy1.21python3.10.____cpython: - CONFIG: osx_64_numpy1.21python3.10.____cpython + osx_arm64_openssl1.1.1: + CONFIG: osx_arm64_openssl1.1.1 UPLOAD_PACKAGES: 'True' - osx_64_numpy1.23python3.11.____cpython: - CONFIG: osx_64_numpy1.23python3.11.____cpython + osx_arm64_openssl3: + CONFIG: osx_arm64_openssl3 UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.20python3.8.____cpython: - CONFIG: osx_arm64_numpy1.20python3.8.____cpython - UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.20python3.9.____cpython: - CONFIG: osx_arm64_numpy1.20python3.9.____cpython - UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.21python3.10.____cpython: - CONFIG: osx_arm64_numpy1.21python3.10.____cpython - UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.23python3.11.____cpython: - CONFIG: osx_arm64_numpy1.23python3.11.____cpython - UPLOAD_PACKAGES: 'True' - maxParallel: 4 timeoutInMinutes: 360 steps: diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index cf57026b8..7f5ea9a96 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,31 +8,18 @@ jobs: vmImage: windows-2019 strategy: matrix: - win_64_cuda_compiler_version10.2numpy1.20python3.8.____cpython: - CONFIG: win_64_cuda_compiler_version10.2numpy1.20python3.8.____cpython + win_64_cuda_compiler_version10.2openssl1.1.1: + CONFIG: win_64_cuda_compiler_version10.2openssl1.1.1 UPLOAD_PACKAGES: 'True' - win_64_cuda_compiler_version10.2numpy1.20python3.9.____cpython: - CONFIG: win_64_cuda_compiler_version10.2numpy1.20python3.9.____cpython + win_64_cuda_compiler_version10.2openssl3: + CONFIG: win_64_cuda_compiler_version10.2openssl3 UPLOAD_PACKAGES: 'True' - win_64_cuda_compiler_version10.2numpy1.21python3.10.____cpython: - CONFIG: win_64_cuda_compiler_version10.2numpy1.21python3.10.____cpython + win_64_cuda_compiler_versionNoneopenssl1.1.1: + CONFIG: win_64_cuda_compiler_versionNoneopenssl1.1.1 UPLOAD_PACKAGES: 'True' - win_64_cuda_compiler_version10.2numpy1.23python3.11.____cpython: - CONFIG: win_64_cuda_compiler_version10.2numpy1.23python3.11.____cpython + win_64_cuda_compiler_versionNoneopenssl3: + CONFIG: win_64_cuda_compiler_versionNoneopenssl3 UPLOAD_PACKAGES: 'True' - win_64_cuda_compiler_versionNonenumpy1.20python3.8.____cpython: - CONFIG: win_64_cuda_compiler_versionNonenumpy1.20python3.8.____cpython - UPLOAD_PACKAGES: 'True' - win_64_cuda_compiler_versionNonenumpy1.20python3.9.____cpython: - CONFIG: win_64_cuda_compiler_versionNonenumpy1.20python3.9.____cpython - UPLOAD_PACKAGES: 'True' - win_64_cuda_compiler_versionNonenumpy1.21python3.10.____cpython: - CONFIG: win_64_cuda_compiler_versionNonenumpy1.21python3.10.____cpython - UPLOAD_PACKAGES: 'True' - win_64_cuda_compiler_versionNonenumpy1.23python3.11.____cpython: - CONFIG: win_64_cuda_compiler_versionNonenumpy1.23python3.11.____cpython - UPLOAD_PACKAGES: 'True' - maxParallel: 4 timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ @@ -57,7 +44,7 @@ jobs: - script: | call activate base - mamba.exe install 'python=3.9' conda-build conda pip boa 'conda-forge-ci-setup=3' -c conda-forge --strict-channel-priority --yes + mamba.exe install "python=3.9" conda-build conda pip boa conda-forge-ci-setup=3 "py-lief<0.12" -c conda-forge --strict-channel-priority --yes displayName: Install conda-build - script: set PYTHONUNBUFFERED=1 diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10numpy1.20python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10numpy1.20python3.8.____cpython.yaml deleted file mode 100644 index c016ef26d..000000000 --- a/.ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10numpy1.20python3.8.____cpython.yaml +++ /dev/null @@ -1,70 +0,0 @@ -bzip2: -- '1' -c_ares: -- '1' -c_compiler: -- gcc -c_compiler_version: -- '10' -cdt_name: -- cos6 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- None -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -gflags: -- '2.2' -glog: -- '0.6' -google_cloud_cpp: -- 2.3.0 -libabseil: -- '20220623.0' -libgrpc: -- '1.49' -libprotobuf: -- '3.21' -lz4_c: -- 1.9.3 -numpy: -- '1.20' -openssl: -- 1.1.1 -orc: -- 1.8.0 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -re2: -- 2022.06.01 -snappy: -- '1' -target_platform: -- linux-64 -thrift_cpp: -- 0.16.0 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cuda_compiler_version - - cdt_name - - docker_image -- - python - - numpy -zlib: -- '1.2' -zstd: -- '1.5' diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10numpy1.20python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10numpy1.20python3.9.____cpython.yaml deleted file mode 100644 index bc0d303c7..000000000 --- a/.ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10numpy1.20python3.9.____cpython.yaml +++ /dev/null @@ -1,70 +0,0 @@ -bzip2: -- '1' -c_ares: -- '1' -c_compiler: -- gcc -c_compiler_version: -- '10' -cdt_name: -- cos6 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- None -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -gflags: -- '2.2' -glog: -- '0.6' -google_cloud_cpp: -- 2.3.0 -libabseil: -- '20220623.0' -libgrpc: -- '1.49' -libprotobuf: -- '3.21' -lz4_c: -- 1.9.3 -numpy: -- '1.20' -openssl: -- 1.1.1 -orc: -- 1.8.0 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -re2: -- 2022.06.01 -snappy: -- '1' -target_platform: -- linux-64 -thrift_cpp: -- 0.16.0 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cuda_compiler_version - - cdt_name - - docker_image -- - python - - numpy -zlib: -- '1.2' -zstd: -- '1.5' diff --git a/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.20python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.20python3.8.____cpython.yaml deleted file mode 100644 index b61e772c5..000000000 --- a/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.20python3.8.____cpython.yaml +++ /dev/null @@ -1,70 +0,0 @@ -bzip2: -- '1' -c_ares: -- '1' -c_compiler: -- gcc -c_compiler_version: -- '7' -cdt_name: -- cos6 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '10.2' -cxx_compiler: -- gxx -cxx_compiler_version: -- '7' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-cuda:10.2 -gflags: -- '2.2' -glog: -- '0.6' -google_cloud_cpp: -- 2.3.0 -libabseil: -- '20220623.0' -libgrpc: -- '1.49' -libprotobuf: -- '3.21' -lz4_c: -- 1.9.3 -numpy: -- '1.20' -openssl: -- 1.1.1 -orc: -- 1.8.0 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -re2: -- 2022.06.01 -snappy: -- '1' -target_platform: -- linux-64 -thrift_cpp: -- 0.16.0 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cuda_compiler_version - - cdt_name - - docker_image -- - python - - numpy -zlib: -- '1.2' -zstd: -- '1.5' diff --git a/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.20python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.20python3.9.____cpython.yaml deleted file mode 100644 index 0fb0c7df6..000000000 --- a/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.20python3.9.____cpython.yaml +++ /dev/null @@ -1,70 +0,0 @@ -bzip2: -- '1' -c_ares: -- '1' -c_compiler: -- gcc -c_compiler_version: -- '7' -cdt_name: -- cos6 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '10.2' -cxx_compiler: -- gxx -cxx_compiler_version: -- '7' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-cuda:10.2 -gflags: -- '2.2' -glog: -- '0.6' -google_cloud_cpp: -- 2.3.0 -libabseil: -- '20220623.0' -libgrpc: -- '1.49' -libprotobuf: -- '3.21' -lz4_c: -- 1.9.3 -numpy: -- '1.20' -openssl: -- 1.1.1 -orc: -- 1.8.0 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -re2: -- 2022.06.01 -snappy: -- '1' -target_platform: -- linux-64 -thrift_cpp: -- 0.16.0 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cuda_compiler_version - - cdt_name - - docker_image -- - python - - numpy -zlib: -- '1.2' -zstd: -- '1.5' diff --git a/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_64_cuda_compiler_version10.2openssl1.1.1.yaml similarity index 85% rename from .ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.21python3.10.____cpython.yaml rename to .ci_support/linux_64_cuda_compiler_version10.2openssl1.1.1.yaml index edcf2b278..09e8dfb73 100644 --- a/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_64_cuda_compiler_version10.2openssl1.1.1.yaml @@ -1,3 +1,5 @@ +aws_sdk_cpp: +- 1.9.379 bzip2: - '1' c_ares: @@ -16,6 +18,8 @@ cuda_compiler: - nvcc cuda_compiler_version: - '10.2' +cuda_compiler_version_min: +- '10.2' cxx_compiler: - gxx cxx_compiler_version: @@ -38,6 +42,9 @@ lz4_c: - 1.9.3 numpy: - '1.21' +- '1.23' +- '1.20' +- '1.20' openssl: - 1.1.1 orc: @@ -48,6 +55,9 @@ pin_run_as_build: max_pin: x.x python: - 3.10.* *_cpython +- 3.11.* *_cpython +- 3.8.* *_cpython +- 3.9.* *_cpython re2: - 2022.06.01 snappy: diff --git a/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_cuda_compiler_version10.2openssl3.yaml similarity index 84% rename from .ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.23python3.11.____cpython.yaml rename to .ci_support/linux_64_cuda_compiler_version10.2openssl3.yaml index 412c2d205..99022e848 100644 --- a/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_cuda_compiler_version10.2openssl3.yaml @@ -1,3 +1,5 @@ +aws_sdk_cpp: +- 1.9.379 bzip2: - '1' c_ares: @@ -16,6 +18,8 @@ cuda_compiler: - nvcc cuda_compiler_version: - '10.2' +cuda_compiler_version_min: +- '10.2' cxx_compiler: - gxx cxx_compiler_version: @@ -37,9 +41,12 @@ libprotobuf: lz4_c: - 1.9.3 numpy: +- '1.21' - '1.23' +- '1.20' +- '1.20' openssl: -- 1.1.1 +- '3' orc: - 1.8.0 pin_run_as_build: @@ -47,7 +54,10 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: +- 3.10.* *_cpython - 3.11.* *_cpython +- 3.8.* *_cpython +- 3.9.* *_cpython re2: - 2022.06.01 snappy: diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_64_cuda_compiler_versionNoneopenssl1.1.1.yaml similarity index 85% rename from .ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10numpy1.21python3.10.____cpython.yaml rename to .ci_support/linux_64_cuda_compiler_versionNoneopenssl1.1.1.yaml index a5521c757..edba301f4 100644 --- a/.ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_64_cuda_compiler_versionNoneopenssl1.1.1.yaml @@ -1,3 +1,5 @@ +aws_sdk_cpp: +- 1.9.379 bzip2: - '1' c_ares: @@ -16,6 +18,8 @@ cuda_compiler: - nvcc cuda_compiler_version: - None +cuda_compiler_version_min: +- '10.2' cxx_compiler: - gxx cxx_compiler_version: @@ -38,6 +42,9 @@ lz4_c: - 1.9.3 numpy: - '1.21' +- '1.23' +- '1.20' +- '1.20' openssl: - 1.1.1 orc: @@ -48,6 +55,9 @@ pin_run_as_build: max_pin: x.x python: - 3.10.* *_cpython +- 3.11.* *_cpython +- 3.8.* *_cpython +- 3.9.* *_cpython re2: - 2022.06.01 snappy: diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_cuda_compiler_versionNoneopenssl3.yaml similarity index 84% rename from .ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10numpy1.23python3.11.____cpython.yaml rename to .ci_support/linux_64_cuda_compiler_versionNoneopenssl3.yaml index 36e6a73bb..120d8eb62 100644 --- a/.ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_cuda_compiler_versionNoneopenssl3.yaml @@ -1,3 +1,5 @@ +aws_sdk_cpp: +- 1.9.379 bzip2: - '1' c_ares: @@ -16,6 +18,8 @@ cuda_compiler: - nvcc cuda_compiler_version: - None +cuda_compiler_version_min: +- '10.2' cxx_compiler: - gxx cxx_compiler_version: @@ -37,9 +41,12 @@ libprotobuf: lz4_c: - 1.9.3 numpy: +- '1.21' - '1.23' +- '1.20' +- '1.20' openssl: -- 1.1.1 +- '3' orc: - 1.8.0 pin_run_as_build: @@ -47,7 +54,10 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: +- 3.10.* *_cpython - 3.11.* *_cpython +- 3.8.* *_cpython +- 3.9.* *_cpython re2: - 2022.06.01 snappy: diff --git a/.ci_support/linux_aarch64_cuda_compiler_version11.2numpy1.20python3.8.____cpython.yaml b/.ci_support/linux_aarch64_cuda_compiler_version11.2numpy1.20python3.8.____cpython.yaml deleted file mode 100644 index 7e619ac81..000000000 --- a/.ci_support/linux_aarch64_cuda_compiler_version11.2numpy1.20python3.8.____cpython.yaml +++ /dev/null @@ -1,74 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -bzip2: -- '1' -c_ares: -- '1' -c_compiler: -- gcc -c_compiler_version: -- '10' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '11.2' -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -docker_image: -- quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 -gflags: -- '2.2' -glog: -- '0.6' -google_cloud_cpp: -- 2.3.0 -libabseil: -- '20220623.0' -libgrpc: -- '1.49' -libprotobuf: -- '3.21' -lz4_c: -- 1.9.3 -numpy: -- '1.20' -openssl: -- 1.1.1 -orc: -- 1.8.0 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -re2: -- 2022.06.01 -snappy: -- '1' -target_platform: -- linux-aarch64 -thrift_cpp: -- 0.16.0 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cuda_compiler_version - - cdt_name - - docker_image -- - python - - numpy -zlib: -- '1.2' -zstd: -- '1.5' diff --git a/.ci_support/linux_aarch64_cuda_compiler_version11.2numpy1.20python3.9.____cpython.yaml b/.ci_support/linux_aarch64_cuda_compiler_version11.2numpy1.20python3.9.____cpython.yaml deleted file mode 100644 index d3ada5039..000000000 --- a/.ci_support/linux_aarch64_cuda_compiler_version11.2numpy1.20python3.9.____cpython.yaml +++ /dev/null @@ -1,74 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -bzip2: -- '1' -c_ares: -- '1' -c_compiler: -- gcc -c_compiler_version: -- '10' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '11.2' -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -docker_image: -- quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 -gflags: -- '2.2' -glog: -- '0.6' -google_cloud_cpp: -- 2.3.0 -libabseil: -- '20220623.0' -libgrpc: -- '1.49' -libprotobuf: -- '3.21' -lz4_c: -- 1.9.3 -numpy: -- '1.20' -openssl: -- 1.1.1 -orc: -- 1.8.0 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -re2: -- 2022.06.01 -snappy: -- '1' -target_platform: -- linux-aarch64 -thrift_cpp: -- 0.16.0 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cuda_compiler_version - - cdt_name - - docker_image -- - python - - numpy -zlib: -- '1.2' -zstd: -- '1.5' diff --git a/.ci_support/linux_aarch64_cuda_compiler_version11.2numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_aarch64_cuda_compiler_version11.2numpy1.21python3.10.____cpython.yaml deleted file mode 100644 index 4a4b5d054..000000000 --- a/.ci_support/linux_aarch64_cuda_compiler_version11.2numpy1.21python3.10.____cpython.yaml +++ /dev/null @@ -1,74 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -bzip2: -- '1' -c_ares: -- '1' -c_compiler: -- gcc -c_compiler_version: -- '10' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '11.2' -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -docker_image: -- quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 -gflags: -- '2.2' -glog: -- '0.6' -google_cloud_cpp: -- 2.3.0 -libabseil: -- '20220623.0' -libgrpc: -- '1.49' -libprotobuf: -- '3.21' -lz4_c: -- 1.9.3 -numpy: -- '1.21' -openssl: -- 1.1.1 -orc: -- 1.8.0 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -re2: -- 2022.06.01 -snappy: -- '1' -target_platform: -- linux-aarch64 -thrift_cpp: -- 0.16.0 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cuda_compiler_version - - cdt_name - - docker_image -- - python - - numpy -zlib: -- '1.2' -zstd: -- '1.5' diff --git a/.ci_support/linux_aarch64_cuda_compiler_version11.2numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_aarch64_cuda_compiler_version11.2numpy1.23python3.11.____cpython.yaml deleted file mode 100644 index 4f42261ec..000000000 --- a/.ci_support/linux_aarch64_cuda_compiler_version11.2numpy1.23python3.11.____cpython.yaml +++ /dev/null @@ -1,74 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -bzip2: -- '1' -c_ares: -- '1' -c_compiler: -- gcc -c_compiler_version: -- '10' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '11.2' -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -docker_image: -- quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 -gflags: -- '2.2' -glog: -- '0.6' -google_cloud_cpp: -- 2.3.0 -libabseil: -- '20220623.0' -libgrpc: -- '1.49' -libprotobuf: -- '3.21' -lz4_c: -- 1.9.3 -numpy: -- '1.23' -openssl: -- 1.1.1 -orc: -- 1.8.0 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.11.* *_cpython -re2: -- 2022.06.01 -snappy: -- '1' -target_platform: -- linux-aarch64 -thrift_cpp: -- 0.16.0 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cuda_compiler_version - - cdt_name - - docker_image -- - python - - numpy -zlib: -- '1.2' -zstd: -- '1.5' diff --git a/.ci_support/linux_aarch64_cuda_compiler_versionNonenumpy1.20python3.8.____cpython.yaml b/.ci_support/linux_aarch64_cuda_compiler_versionNonenumpy1.20python3.8.____cpython.yaml deleted file mode 100644 index 98af94c30..000000000 --- a/.ci_support/linux_aarch64_cuda_compiler_versionNonenumpy1.20python3.8.____cpython.yaml +++ /dev/null @@ -1,74 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -bzip2: -- '1' -c_ares: -- '1' -c_compiler: -- gcc -c_compiler_version: -- '10' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- None -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -docker_image: -- quay.io/condaforge/linux-anvil-aarch64 -gflags: -- '2.2' -glog: -- '0.6' -google_cloud_cpp: -- 2.3.0 -libabseil: -- '20220623.0' -libgrpc: -- '1.49' -libprotobuf: -- '3.21' -lz4_c: -- 1.9.3 -numpy: -- '1.20' -openssl: -- 1.1.1 -orc: -- 1.8.0 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -re2: -- 2022.06.01 -snappy: -- '1' -target_platform: -- linux-aarch64 -thrift_cpp: -- 0.16.0 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cuda_compiler_version - - cdt_name - - docker_image -- - python - - numpy -zlib: -- '1.2' -zstd: -- '1.5' diff --git a/.ci_support/linux_aarch64_cuda_compiler_versionNonenumpy1.20python3.9.____cpython.yaml b/.ci_support/linux_aarch64_cuda_compiler_versionNonenumpy1.20python3.9.____cpython.yaml deleted file mode 100644 index 598e98be5..000000000 --- a/.ci_support/linux_aarch64_cuda_compiler_versionNonenumpy1.20python3.9.____cpython.yaml +++ /dev/null @@ -1,74 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -bzip2: -- '1' -c_ares: -- '1' -c_compiler: -- gcc -c_compiler_version: -- '10' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- None -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -docker_image: -- quay.io/condaforge/linux-anvil-aarch64 -gflags: -- '2.2' -glog: -- '0.6' -google_cloud_cpp: -- 2.3.0 -libabseil: -- '20220623.0' -libgrpc: -- '1.49' -libprotobuf: -- '3.21' -lz4_c: -- 1.9.3 -numpy: -- '1.20' -openssl: -- 1.1.1 -orc: -- 1.8.0 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -re2: -- 2022.06.01 -snappy: -- '1' -target_platform: -- linux-aarch64 -thrift_cpp: -- 0.16.0 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cuda_compiler_version - - cdt_name - - docker_image -- - python - - numpy -zlib: -- '1.2' -zstd: -- '1.5' diff --git a/.ci_support/linux_aarch64_cuda_compiler_versionNonenumpy1.21python3.10.____cpython.yaml b/.ci_support/linux_aarch64_cuda_compiler_versionNoneopenssl1.1.1.yaml similarity index 84% rename from .ci_support/linux_aarch64_cuda_compiler_versionNonenumpy1.21python3.10.____cpython.yaml rename to .ci_support/linux_aarch64_cuda_compiler_versionNoneopenssl1.1.1.yaml index 64a5ef4bb..7ec61b35a 100644 --- a/.ci_support/linux_aarch64_cuda_compiler_versionNonenumpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_cuda_compiler_versionNoneopenssl1.1.1.yaml @@ -1,5 +1,7 @@ BUILD: - aarch64-conda_cos7-linux-gnu +aws_sdk_cpp: +- 1.9.379 bzip2: - '1' c_ares: @@ -16,8 +18,6 @@ channel_sources: - conda-forge channel_targets: - conda-forge main -cuda_compiler: -- nvcc cuda_compiler_version: - None cxx_compiler: @@ -25,7 +25,7 @@ cxx_compiler: cxx_compiler_version: - '10' docker_image: -- quay.io/condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-cos7-x86_64 gflags: - '2.2' glog: @@ -42,6 +42,9 @@ lz4_c: - 1.9.3 numpy: - '1.21' +- '1.23' +- '1.20' +- '1.20' openssl: - 1.1.1 orc: @@ -52,6 +55,9 @@ pin_run_as_build: max_pin: x.x python: - 3.10.* *_cpython +- 3.11.* *_cpython +- 3.8.* *_cpython +- 3.9.* *_cpython re2: - 2022.06.01 snappy: diff --git a/.ci_support/linux_aarch64_cuda_compiler_versionNonenumpy1.23python3.11.____cpython.yaml b/.ci_support/linux_aarch64_cuda_compiler_versionNoneopenssl3.yaml similarity index 84% rename from .ci_support/linux_aarch64_cuda_compiler_versionNonenumpy1.23python3.11.____cpython.yaml rename to .ci_support/linux_aarch64_cuda_compiler_versionNoneopenssl3.yaml index 8a329ab76..fa91ba903 100644 --- a/.ci_support/linux_aarch64_cuda_compiler_versionNonenumpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_cuda_compiler_versionNoneopenssl3.yaml @@ -1,5 +1,7 @@ BUILD: - aarch64-conda_cos7-linux-gnu +aws_sdk_cpp: +- 1.9.379 bzip2: - '1' c_ares: @@ -16,8 +18,6 @@ channel_sources: - conda-forge channel_targets: - conda-forge main -cuda_compiler: -- nvcc cuda_compiler_version: - None cxx_compiler: @@ -25,7 +25,7 @@ cxx_compiler: cxx_compiler_version: - '10' docker_image: -- quay.io/condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-cos7-x86_64 gflags: - '2.2' glog: @@ -41,9 +41,12 @@ libprotobuf: lz4_c: - 1.9.3 numpy: +- '1.21' - '1.23' +- '1.20' +- '1.20' openssl: -- 1.1.1 +- '3' orc: - 1.8.0 pin_run_as_build: @@ -51,7 +54,10 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: +- 3.10.* *_cpython - 3.11.* *_cpython +- 3.8.* *_cpython +- 3.9.* *_cpython re2: - 2022.06.01 snappy: diff --git a/.ci_support/linux_ppc64le_numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_cuda_compiler_versionNoneopenssl1.1.1.yaml similarity index 88% rename from .ci_support/linux_ppc64le_numpy1.21python3.10.____cpython.yaml rename to .ci_support/linux_ppc64le_cuda_compiler_versionNoneopenssl1.1.1.yaml index 68b3f3cb5..c5a546f91 100644 --- a/.ci_support/linux_ppc64le_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_cuda_compiler_versionNoneopenssl1.1.1.yaml @@ -1,3 +1,5 @@ +aws_sdk_cpp: +- 1.9.379 bzip2: - '1' c_ares: @@ -36,6 +38,9 @@ lz4_c: - 1.9.3 numpy: - '1.21' +- '1.23' +- '1.20' +- '1.20' openssl: - 1.1.1 orc: @@ -46,6 +51,9 @@ pin_run_as_build: max_pin: x.x python: - 3.10.* *_cpython +- 3.11.* *_cpython +- 3.8.* *_cpython +- 3.9.* *_cpython re2: - 2022.06.01 snappy: diff --git a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_cuda_compiler_versionNoneopenssl3.yaml similarity index 87% rename from .ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml rename to .ci_support/linux_ppc64le_cuda_compiler_versionNoneopenssl3.yaml index 06df2c3a3..16c569275 100644 --- a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_cuda_compiler_versionNoneopenssl3.yaml @@ -1,3 +1,5 @@ +aws_sdk_cpp: +- 1.9.379 bzip2: - '1' c_ares: @@ -35,9 +37,12 @@ libprotobuf: lz4_c: - 1.9.3 numpy: +- '1.21' - '1.23' +- '1.20' +- '1.20' openssl: -- 1.1.1 +- '3' orc: - 1.8.0 pin_run_as_build: @@ -45,7 +50,10 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: +- 3.10.* *_cpython - 3.11.* *_cpython +- 3.8.* *_cpython +- 3.9.* *_cpython re2: - 2022.06.01 snappy: diff --git a/.ci_support/linux_ppc64le_numpy1.20python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.20python3.8.____cpython.yaml deleted file mode 100644 index e5d270b8a..000000000 --- a/.ci_support/linux_ppc64le_numpy1.20python3.8.____cpython.yaml +++ /dev/null @@ -1,68 +0,0 @@ -bzip2: -- '1' -c_ares: -- '1' -c_compiler: -- gcc -c_compiler_version: -- '10' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler_version: -- None -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -gflags: -- '2.2' -glog: -- '0.6' -google_cloud_cpp: -- 2.3.0 -libabseil: -- '20220623.0' -libgrpc: -- '1.49' -libprotobuf: -- '3.21' -lz4_c: -- 1.9.3 -numpy: -- '1.20' -openssl: -- 1.1.1 -orc: -- 1.8.0 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -re2: -- 2022.06.01 -snappy: -- '1' -target_platform: -- linux-ppc64le -thrift_cpp: -- 0.16.0 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cuda_compiler_version - - cdt_name - - docker_image -- - python - - numpy -zlib: -- '1.2' -zstd: -- '1.5' diff --git a/.ci_support/linux_ppc64le_numpy1.20python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.20python3.9.____cpython.yaml deleted file mode 100644 index a9f1c3ed6..000000000 --- a/.ci_support/linux_ppc64le_numpy1.20python3.9.____cpython.yaml +++ /dev/null @@ -1,68 +0,0 @@ -bzip2: -- '1' -c_ares: -- '1' -c_compiler: -- gcc -c_compiler_version: -- '10' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler_version: -- None -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -gflags: -- '2.2' -glog: -- '0.6' -google_cloud_cpp: -- 2.3.0 -libabseil: -- '20220623.0' -libgrpc: -- '1.49' -libprotobuf: -- '3.21' -lz4_c: -- 1.9.3 -numpy: -- '1.20' -openssl: -- 1.1.1 -orc: -- 1.8.0 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -re2: -- 2022.06.01 -snappy: -- '1' -target_platform: -- linux-ppc64le -thrift_cpp: -- 0.16.0 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cuda_compiler_version - - cdt_name - - docker_image -- - python - - numpy -zlib: -- '1.2' -zstd: -- '1.5' diff --git a/.ci_support/migrations/google_cloud_cpp230.yaml b/.ci_support/migrations/google_cloud_cpp230.yaml deleted file mode 100644 index 558051c96..000000000 --- a/.ci_support/migrations/google_cloud_cpp230.yaml +++ /dev/null @@ -1,11 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 - -# needs to pin down to patch level due to inline namespaces changing, see -# https://github.com/conda-forge/conda-forge-pinning-feedstock/pull/3430 -google_cloud_cpp: -- '2.3.0' - -migrator_ts: 1667209142.8457868 diff --git a/.ci_support/migrations/grpc_cpp149.yaml b/.ci_support/migrations/grpc_cpp149.yaml deleted file mode 100644 index e3819d791..000000000 --- a/.ci_support/migrations/grpc_cpp149.yaml +++ /dev/null @@ -1,13 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 - -# TODO: once the migration finishes and all feedstocks -# have changed to the new output, remove grpc_cpp -libgrpc: -- '1.49' -grpc_cpp: -- '1.49' - -migrator_ts: 1666974156.3232300 diff --git a/.ci_support/migrations/libprotobuf321.yaml b/.ci_support/migrations/libprotobuf321.yaml deleted file mode 100644 index 41701fa3b..000000000 --- a/.ci_support/migrations/libprotobuf321.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -libprotobuf: -- '3.21' -migrator_ts: 1661531047.2553904 diff --git a/.ci_support/osx_64_numpy1.20python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.20python3.8.____cpython.yaml deleted file mode 100644 index ddc974376..000000000 --- a/.ci_support/osx_64_numpy1.20python3.8.____cpython.yaml +++ /dev/null @@ -1,65 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -bzip2: -- '1' -c_ares: -- '1' -c_compiler: -- clang -c_compiler_version: -- '14' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler_version: -- None -cxx_compiler: -- clangxx -cxx_compiler_version: -- '14' -gflags: -- '2.2' -glog: -- '0.6' -google_cloud_cpp: -- 2.3.0 -libabseil: -- '20220623.0' -libgrpc: -- '1.49' -libprotobuf: -- '3.21' -lz4_c: -- 1.9.3 -macos_machine: -- x86_64-apple-darwin13.4.0 -numpy: -- '1.20' -openssl: -- 1.1.1 -orc: -- 1.8.0 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -re2: -- 2022.06.01 -snappy: -- '1' -target_platform: -- osx-64 -thrift_cpp: -- 0.16.0 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy -zlib: -- '1.2' -zstd: -- '1.5' diff --git a/.ci_support/osx_64_numpy1.20python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.20python3.9.____cpython.yaml deleted file mode 100644 index 87f31cbf6..000000000 --- a/.ci_support/osx_64_numpy1.20python3.9.____cpython.yaml +++ /dev/null @@ -1,65 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -bzip2: -- '1' -c_ares: -- '1' -c_compiler: -- clang -c_compiler_version: -- '14' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler_version: -- None -cxx_compiler: -- clangxx -cxx_compiler_version: -- '14' -gflags: -- '2.2' -glog: -- '0.6' -google_cloud_cpp: -- 2.3.0 -libabseil: -- '20220623.0' -libgrpc: -- '1.49' -libprotobuf: -- '3.21' -lz4_c: -- 1.9.3 -macos_machine: -- x86_64-apple-darwin13.4.0 -numpy: -- '1.20' -openssl: -- 1.1.1 -orc: -- 1.8.0 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -re2: -- 2022.06.01 -snappy: -- '1' -target_platform: -- osx-64 -thrift_cpp: -- 0.16.0 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy -zlib: -- '1.2' -zstd: -- '1.5' diff --git a/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/osx_64_openssl1.1.1.yaml similarity index 87% rename from .ci_support/osx_64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/osx_64_openssl1.1.1.yaml index 5e6aa1dbb..a52bf9bbd 100644 --- a/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/osx_64_openssl1.1.1.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' +aws_sdk_cpp: +- 1.9.379 bzip2: - '1' c_ares: @@ -36,6 +38,9 @@ macos_machine: - x86_64-apple-darwin13.4.0 numpy: - '1.21' +- '1.23' +- '1.20' +- '1.20' openssl: - 1.1.1 orc: @@ -46,6 +51,9 @@ pin_run_as_build: max_pin: x.x python: - 3.10.* *_cpython +- 3.11.* *_cpython +- 3.8.* *_cpython +- 3.9.* *_cpython re2: - 2022.06.01 snappy: diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_openssl3.yaml similarity index 87% rename from .ci_support/osx_64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/osx_64_openssl3.yaml index 96206e02f..f47c333a5 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_openssl3.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' +aws_sdk_cpp: +- 1.9.379 bzip2: - '1' c_ares: @@ -35,9 +37,12 @@ lz4_c: macos_machine: - x86_64-apple-darwin13.4.0 numpy: +- '1.21' - '1.23' +- '1.20' +- '1.20' openssl: -- 1.1.1 +- '3' orc: - 1.8.0 pin_run_as_build: @@ -45,7 +50,10 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: +- 3.10.* *_cpython - 3.11.* *_cpython +- 3.8.* *_cpython +- 3.9.* *_cpython re2: - 2022.06.01 snappy: diff --git a/.ci_support/osx_arm64_numpy1.20python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.20python3.8.____cpython.yaml deleted file mode 100644 index c86096903..000000000 --- a/.ci_support/osx_arm64_numpy1.20python3.8.____cpython.yaml +++ /dev/null @@ -1,65 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '11.0' -bzip2: -- '1' -c_ares: -- '1' -c_compiler: -- clang -c_compiler_version: -- '14' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler_version: -- None -cxx_compiler: -- clangxx -cxx_compiler_version: -- '14' -gflags: -- '2.2' -glog: -- '0.6' -google_cloud_cpp: -- 2.3.0 -libabseil: -- '20220623.0' -libgrpc: -- '1.49' -libprotobuf: -- '3.21' -lz4_c: -- 1.9.3 -macos_machine: -- arm64-apple-darwin20.0.0 -numpy: -- '1.20' -openssl: -- 1.1.1 -orc: -- 1.8.0 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -re2: -- 2022.06.01 -snappy: -- '1' -target_platform: -- osx-arm64 -thrift_cpp: -- 0.16.0 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy -zlib: -- '1.2' -zstd: -- '1.5' diff --git a/.ci_support/osx_arm64_numpy1.20python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.20python3.9.____cpython.yaml deleted file mode 100644 index a1f31c9c4..000000000 --- a/.ci_support/osx_arm64_numpy1.20python3.9.____cpython.yaml +++ /dev/null @@ -1,65 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '11.0' -bzip2: -- '1' -c_ares: -- '1' -c_compiler: -- clang -c_compiler_version: -- '14' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler_version: -- None -cxx_compiler: -- clangxx -cxx_compiler_version: -- '14' -gflags: -- '2.2' -glog: -- '0.6' -google_cloud_cpp: -- 2.3.0 -libabseil: -- '20220623.0' -libgrpc: -- '1.49' -libprotobuf: -- '3.21' -lz4_c: -- 1.9.3 -macos_machine: -- arm64-apple-darwin20.0.0 -numpy: -- '1.20' -openssl: -- 1.1.1 -orc: -- 1.8.0 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -re2: -- 2022.06.01 -snappy: -- '1' -target_platform: -- osx-arm64 -thrift_cpp: -- 0.16.0 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy -zlib: -- '1.2' -zstd: -- '1.5' diff --git a/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml b/.ci_support/osx_arm64_openssl1.1.1.yaml similarity index 87% rename from .ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/osx_arm64_openssl1.1.1.yaml index 4b28768c2..59128de87 100644 --- a/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_openssl1.1.1.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +aws_sdk_cpp: +- 1.9.379 bzip2: - '1' c_ares: @@ -36,6 +38,9 @@ macos_machine: - arm64-apple-darwin20.0.0 numpy: - '1.21' +- '1.23' +- '1.20' +- '1.20' openssl: - 1.1.1 orc: @@ -46,6 +51,9 @@ pin_run_as_build: max_pin: x.x python: - 3.10.* *_cpython +- 3.11.* *_cpython +- 3.8.* *_cpython +- 3.9.* *_cpython re2: - 2022.06.01 snappy: diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_openssl3.yaml similarity index 87% rename from .ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/osx_arm64_openssl3.yaml index eda849c10..4c08c312f 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_openssl3.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +aws_sdk_cpp: +- 1.9.379 bzip2: - '1' c_ares: @@ -35,9 +37,12 @@ lz4_c: macos_machine: - arm64-apple-darwin20.0.0 numpy: +- '1.21' - '1.23' +- '1.20' +- '1.20' openssl: -- 1.1.1 +- '3' orc: - 1.8.0 pin_run_as_build: @@ -45,7 +50,10 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: +- 3.10.* *_cpython - 3.11.* *_cpython +- 3.8.* *_cpython +- 3.9.* *_cpython re2: - 2022.06.01 snappy: diff --git a/.ci_support/win_64_cuda_compiler_version10.2numpy1.23python3.11.____cpython.yaml b/.ci_support/win_64_cuda_compiler_version10.2openssl1.1.1.yaml similarity index 77% rename from .ci_support/win_64_cuda_compiler_version10.2numpy1.23python3.11.____cpython.yaml rename to .ci_support/win_64_cuda_compiler_version10.2openssl1.1.1.yaml index a61a9a505..58533cf57 100644 --- a/.ci_support/win_64_cuda_compiler_version10.2numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/win_64_cuda_compiler_version10.2openssl1.1.1.yaml @@ -1,3 +1,5 @@ +aws_sdk_cpp: +- 1.9.379 bzip2: - '1' c_ares: @@ -12,6 +14,8 @@ cuda_compiler: - nvcc cuda_compiler_version: - '10.2' +cuda_compiler_version_min: +- '10.2' cxx_compiler: - vs2019 gflags: @@ -22,6 +26,10 @@ google_cloud_cpp: - 2.3.0 libabseil: - '20220623.0' +libcrc32c: +- '1.1' +libcurl: +- '7' libgrpc: - '1.49' libprotobuf: @@ -29,7 +37,10 @@ libprotobuf: lz4_c: - 1.9.3 numpy: +- '1.21' - '1.23' +- '1.20' +- '1.20' openssl: - 1.1.1 pin_run_as_build: @@ -37,7 +48,10 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: +- 3.10.* *_cpython - 3.11.* *_cpython +- 3.8.* *_cpython +- 3.9.* *_cpython re2: - 2022.06.01 snappy: diff --git a/.ci_support/win_64_cuda_compiler_version10.2numpy1.20python3.9.____cpython.yaml b/.ci_support/win_64_cuda_compiler_version10.2openssl3.yaml similarity index 76% rename from .ci_support/win_64_cuda_compiler_version10.2numpy1.20python3.9.____cpython.yaml rename to .ci_support/win_64_cuda_compiler_version10.2openssl3.yaml index a7a58c8fc..076758348 100644 --- a/.ci_support/win_64_cuda_compiler_version10.2numpy1.20python3.9.____cpython.yaml +++ b/.ci_support/win_64_cuda_compiler_version10.2openssl3.yaml @@ -1,3 +1,5 @@ +aws_sdk_cpp: +- 1.9.379 bzip2: - '1' c_ares: @@ -12,6 +14,8 @@ cuda_compiler: - nvcc cuda_compiler_version: - '10.2' +cuda_compiler_version_min: +- '10.2' cxx_compiler: - vs2019 gflags: @@ -22,6 +26,10 @@ google_cloud_cpp: - 2.3.0 libabseil: - '20220623.0' +libcrc32c: +- '1.1' +libcurl: +- '7' libgrpc: - '1.49' libprotobuf: @@ -29,14 +37,20 @@ libprotobuf: lz4_c: - 1.9.3 numpy: +- '1.21' +- '1.23' +- '1.20' - '1.20' openssl: -- 1.1.1 +- '3' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: +- 3.10.* *_cpython +- 3.11.* *_cpython +- 3.8.* *_cpython - 3.9.* *_cpython re2: - 2022.06.01 diff --git a/.ci_support/win_64_cuda_compiler_versionNonenumpy1.20python3.8.____cpython.yaml b/.ci_support/win_64_cuda_compiler_versionNonenumpy1.20python3.8.____cpython.yaml deleted file mode 100644 index bc45e7117..000000000 --- a/.ci_support/win_64_cuda_compiler_versionNonenumpy1.20python3.8.____cpython.yaml +++ /dev/null @@ -1,55 +0,0 @@ -bzip2: -- '1' -c_ares: -- '1' -c_compiler: -- vs2019 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- None -cxx_compiler: -- vs2019 -gflags: -- '2.2' -glog: -- '0.6' -google_cloud_cpp: -- 2.3.0 -libabseil: -- '20220623.0' -libgrpc: -- '1.49' -libprotobuf: -- '3.21' -lz4_c: -- 1.9.3 -numpy: -- '1.20' -openssl: -- 1.1.1 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -re2: -- 2022.06.01 -snappy: -- '1' -target_platform: -- win-64 -thrift_cpp: -- 0.16.0 -zip_keys: -- - python - - numpy -zlib: -- '1.2' -zstd: -- '1.5' diff --git a/.ci_support/win_64_cuda_compiler_versionNonenumpy1.20python3.9.____cpython.yaml b/.ci_support/win_64_cuda_compiler_versionNonenumpy1.20python3.9.____cpython.yaml deleted file mode 100644 index 185f53d58..000000000 --- a/.ci_support/win_64_cuda_compiler_versionNonenumpy1.20python3.9.____cpython.yaml +++ /dev/null @@ -1,55 +0,0 @@ -bzip2: -- '1' -c_ares: -- '1' -c_compiler: -- vs2019 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- None -cxx_compiler: -- vs2019 -gflags: -- '2.2' -glog: -- '0.6' -google_cloud_cpp: -- 2.3.0 -libabseil: -- '20220623.0' -libgrpc: -- '1.49' -libprotobuf: -- '3.21' -lz4_c: -- 1.9.3 -numpy: -- '1.20' -openssl: -- 1.1.1 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -re2: -- 2022.06.01 -snappy: -- '1' -target_platform: -- win-64 -thrift_cpp: -- 0.16.0 -zip_keys: -- - python - - numpy -zlib: -- '1.2' -zstd: -- '1.5' diff --git a/.ci_support/win_64_cuda_compiler_versionNonenumpy1.21python3.10.____cpython.yaml b/.ci_support/win_64_cuda_compiler_versionNonenumpy1.21python3.10.____cpython.yaml deleted file mode 100644 index 282eb86d3..000000000 --- a/.ci_support/win_64_cuda_compiler_versionNonenumpy1.21python3.10.____cpython.yaml +++ /dev/null @@ -1,55 +0,0 @@ -bzip2: -- '1' -c_ares: -- '1' -c_compiler: -- vs2019 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- None -cxx_compiler: -- vs2019 -gflags: -- '2.2' -glog: -- '0.6' -google_cloud_cpp: -- 2.3.0 -libabseil: -- '20220623.0' -libgrpc: -- '1.49' -libprotobuf: -- '3.21' -lz4_c: -- 1.9.3 -numpy: -- '1.21' -openssl: -- 1.1.1 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -re2: -- 2022.06.01 -snappy: -- '1' -target_platform: -- win-64 -thrift_cpp: -- 0.16.0 -zip_keys: -- - python - - numpy -zlib: -- '1.2' -zstd: -- '1.5' diff --git a/.ci_support/win_64_cuda_compiler_versionNonenumpy1.23python3.11.____cpython.yaml b/.ci_support/win_64_cuda_compiler_versionNonenumpy1.23python3.11.____cpython.yaml deleted file mode 100644 index 661ef99e2..000000000 --- a/.ci_support/win_64_cuda_compiler_versionNonenumpy1.23python3.11.____cpython.yaml +++ /dev/null @@ -1,55 +0,0 @@ -bzip2: -- '1' -c_ares: -- '1' -c_compiler: -- vs2019 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- None -cxx_compiler: -- vs2019 -gflags: -- '2.2' -glog: -- '0.6' -google_cloud_cpp: -- 2.3.0 -libabseil: -- '20220623.0' -libgrpc: -- '1.49' -libprotobuf: -- '3.21' -lz4_c: -- 1.9.3 -numpy: -- '1.23' -openssl: -- 1.1.1 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.11.* *_cpython -re2: -- 2022.06.01 -snappy: -- '1' -target_platform: -- win-64 -thrift_cpp: -- 0.16.0 -zip_keys: -- - python - - numpy -zlib: -- '1.2' -zstd: -- '1.5' diff --git a/.ci_support/win_64_cuda_compiler_version10.2numpy1.21python3.10.____cpython.yaml b/.ci_support/win_64_cuda_compiler_versionNoneopenssl1.1.1.yaml similarity index 77% rename from .ci_support/win_64_cuda_compiler_version10.2numpy1.21python3.10.____cpython.yaml rename to .ci_support/win_64_cuda_compiler_versionNoneopenssl1.1.1.yaml index 9d97a0318..610426257 100644 --- a/.ci_support/win_64_cuda_compiler_version10.2numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/win_64_cuda_compiler_versionNoneopenssl1.1.1.yaml @@ -1,3 +1,5 @@ +aws_sdk_cpp: +- 1.9.379 bzip2: - '1' c_ares: @@ -11,6 +13,8 @@ channel_targets: cuda_compiler: - nvcc cuda_compiler_version: +- None +cuda_compiler_version_min: - '10.2' cxx_compiler: - vs2019 @@ -22,6 +26,10 @@ google_cloud_cpp: - 2.3.0 libabseil: - '20220623.0' +libcrc32c: +- '1.1' +libcurl: +- '7' libgrpc: - '1.49' libprotobuf: @@ -30,6 +38,9 @@ lz4_c: - 1.9.3 numpy: - '1.21' +- '1.23' +- '1.20' +- '1.20' openssl: - 1.1.1 pin_run_as_build: @@ -38,6 +49,9 @@ pin_run_as_build: max_pin: x.x python: - 3.10.* *_cpython +- 3.11.* *_cpython +- 3.8.* *_cpython +- 3.9.* *_cpython re2: - 2022.06.01 snappy: diff --git a/.ci_support/win_64_cuda_compiler_version10.2numpy1.20python3.8.____cpython.yaml b/.ci_support/win_64_cuda_compiler_versionNoneopenssl3.yaml similarity index 76% rename from .ci_support/win_64_cuda_compiler_version10.2numpy1.20python3.8.____cpython.yaml rename to .ci_support/win_64_cuda_compiler_versionNoneopenssl3.yaml index 47e84f9e6..6430884da 100644 --- a/.ci_support/win_64_cuda_compiler_version10.2numpy1.20python3.8.____cpython.yaml +++ b/.ci_support/win_64_cuda_compiler_versionNoneopenssl3.yaml @@ -1,3 +1,5 @@ +aws_sdk_cpp: +- 1.9.379 bzip2: - '1' c_ares: @@ -11,6 +13,8 @@ channel_targets: cuda_compiler: - nvcc cuda_compiler_version: +- None +cuda_compiler_version_min: - '10.2' cxx_compiler: - vs2019 @@ -22,6 +26,10 @@ google_cloud_cpp: - 2.3.0 libabseil: - '20220623.0' +libcrc32c: +- '1.1' +libcurl: +- '7' libgrpc: - '1.49' libprotobuf: @@ -29,15 +37,21 @@ libprotobuf: lz4_c: - 1.9.3 numpy: +- '1.21' +- '1.23' +- '1.20' - '1.20' openssl: -- 1.1.1 +- '3' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: +- 3.10.* *_cpython +- 3.11.* *_cpython - 3.8.* *_cpython +- 3.9.* *_cpython re2: - 2022.06.01 snappy: diff --git a/.circleci/config.yml b/.circleci/config.yml index 3e61aa24d..8b4ef2f99 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ # This file was generated automatically from conda-smithy. To update this configuration, # update the conda-forge.yml and/or the recipe/meta.yaml. -# -*- mode: yaml -*- +# -*- mode: jinja-yaml -*- version: 2 diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index a6b09f6b7..84431a630 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -33,9 +33,9 @@ CONDARC mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 736a39a09..b3abaeb54 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -23,11 +23,10 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base -echo -e "\n\nInstalling ['conda-forge-ci-setup=3'] and conda-build." mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" diff --git a/README.md b/README.md index 533fc55f4..351973999 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -About arrow-cpp-ext -=================== +About arrow-cpp +=============== Home: http://github.com/apache/arrow @@ -7,7 +7,7 @@ Package license: Apache-2.0 Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/arrow-cpp-feedstock/blob/main/LICENSE.txt) -Summary: C++ libraries for Apache Arrow +Summary: A meta-package to select Arrow build variant Current build status ==================== @@ -27,255 +27,115 @@ Current build status - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -291,56 +151,58 @@ Current release info | Name | Downloads | Version | Platforms | | --- | --- | --- | --- | +| [![Conda Recipe](https://img.shields.io/badge/recipe-apache--arrow--proc-green.svg)](https://anaconda.org/conda-forge/apache-arrow-proc) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/apache-arrow-proc.svg)](https://anaconda.org/conda-forge/apache-arrow-proc) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/apache-arrow-proc.svg)](https://anaconda.org/conda-forge/apache-arrow-proc) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/apache-arrow-proc.svg)](https://anaconda.org/conda-forge/apache-arrow-proc) | | [![Conda Recipe](https://img.shields.io/badge/recipe-arrow--cpp-green.svg)](https://anaconda.org/conda-forge/arrow-cpp) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/arrow-cpp.svg)](https://anaconda.org/conda-forge/arrow-cpp) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/arrow-cpp.svg)](https://anaconda.org/conda-forge/arrow-cpp) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/arrow-cpp.svg)](https://anaconda.org/conda-forge/arrow-cpp) | | [![Conda Recipe](https://img.shields.io/badge/recipe-arrow--cpp--proc-green.svg)](https://anaconda.org/conda-forge/arrow-cpp-proc) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/arrow-cpp-proc.svg)](https://anaconda.org/conda-forge/arrow-cpp-proc) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/arrow-cpp-proc.svg)](https://anaconda.org/conda-forge/arrow-cpp-proc) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/arrow-cpp-proc.svg)](https://anaconda.org/conda-forge/arrow-cpp-proc) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-libarrow-green.svg)](https://anaconda.org/conda-forge/libarrow) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libarrow.svg)](https://anaconda.org/conda-forge/libarrow) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libarrow.svg)](https://anaconda.org/conda-forge/libarrow) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libarrow.svg)](https://anaconda.org/conda-forge/libarrow) | | [![Conda Recipe](https://img.shields.io/badge/recipe-pyarrow-green.svg)](https://anaconda.org/conda-forge/pyarrow) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/pyarrow.svg)](https://anaconda.org/conda-forge/pyarrow) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/pyarrow.svg)](https://anaconda.org/conda-forge/pyarrow) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/pyarrow.svg)](https://anaconda.org/conda-forge/pyarrow) | | [![Conda Recipe](https://img.shields.io/badge/recipe-pyarrow--tests-green.svg)](https://anaconda.org/conda-forge/pyarrow-tests) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/pyarrow-tests.svg)](https://anaconda.org/conda-forge/pyarrow-tests) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/pyarrow-tests.svg)](https://anaconda.org/conda-forge/pyarrow-tests) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/pyarrow-tests.svg)](https://anaconda.org/conda-forge/pyarrow-tests) | -Installing arrow-cpp-ext -======================== +Installing arrow-cpp +==================== -Installing `arrow-cpp-ext` from the `conda-forge` channel can be achieved by adding `conda-forge` to your channels with: +Installing `arrow-cpp` from the `conda-forge` channel can be achieved by adding `conda-forge` to your channels with: ``` conda config --add channels conda-forge conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `arrow-cpp, arrow-cpp-proc, pyarrow, pyarrow-tests` can be installed with `conda`: +Once the `conda-forge` channel has been enabled, `apache-arrow-proc, arrow-cpp, arrow-cpp-proc, libarrow, pyarrow, pyarrow-tests` can be installed with `conda`: ``` -conda install arrow-cpp arrow-cpp-proc pyarrow pyarrow-tests +conda install apache-arrow-proc arrow-cpp arrow-cpp-proc libarrow pyarrow pyarrow-tests ``` or with `mamba`: ``` -mamba install arrow-cpp arrow-cpp-proc pyarrow pyarrow-tests +mamba install apache-arrow-proc arrow-cpp arrow-cpp-proc libarrow pyarrow pyarrow-tests ``` -It is possible to list all of the versions of `arrow-cpp` available on your platform with `conda`: +It is possible to list all of the versions of `apache-arrow-proc` available on your platform with `conda`: ``` -conda search arrow-cpp --channel conda-forge +conda search apache-arrow-proc --channel conda-forge ``` or with `mamba`: ``` -mamba search arrow-cpp --channel conda-forge +mamba search apache-arrow-proc --channel conda-forge ``` Alternatively, `mamba repoquery` may provide more information: ``` # Search all versions available on your platform: -mamba repoquery search arrow-cpp --channel conda-forge +mamba repoquery search apache-arrow-proc --channel conda-forge -# List packages depending on `arrow-cpp`: -mamba repoquery whoneeds arrow-cpp --channel conda-forge +# List packages depending on `apache-arrow-proc`: +mamba repoquery whoneeds apache-arrow-proc --channel conda-forge -# List dependencies of `arrow-cpp`: -mamba repoquery depends arrow-cpp --channel conda-forge +# List dependencies of `apache-arrow-proc`: +mamba repoquery depends apache-arrow-proc --channel conda-forge ``` @@ -385,17 +247,17 @@ Terminology produce the finished article (built conda distributions) -Updating arrow-cpp-ext-feedstock -================================ +Updating arrow-cpp-feedstock +============================ -If you would like to improve the arrow-cpp-ext recipe or build a new +If you would like to improve the arrow-cpp recipe or build a new package version, please fork this repository and submit a PR. Upon submission, your changes will be run on the appropriate platforms to give the reviewer an opportunity to confirm that the changes result in a successful build. Once merged, the recipe will be re-built and uploaded automatically to the `conda-forge` channel, whereupon the built conda packages will be available for everybody to install and use from the `conda-forge` channel. -Note that all branches in the conda-forge/arrow-cpp-ext-feedstock are +Note that all branches in the conda-forge/arrow-cpp-feedstock are immediately built and any created packages are uploaded, so PRs should be based on branches in forks and branches in the main repository should only be used to build distinct package versions.
VariantStatus
linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10numpy1.20python3.8.____cpythonlinux_64_cuda_compiler_version10.2openssl1.1.1 - variant + variant
linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10numpy1.20python3.9.____cpythonlinux_64_cuda_compiler_version10.2openssl3 - variant + variant
linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10numpy1.21python3.10.____cpythonlinux_64_cuda_compiler_versionNoneopenssl1.1.1 - variant + variant
linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10numpy1.23python3.11.____cpythonlinux_64_cuda_compiler_versionNoneopenssl3 - variant + variant
linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.20python3.8.____cpythonlinux_aarch64_cuda_compiler_versionNoneopenssl1.1.1 - variant + variant
linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.20python3.9.____cpythonlinux_aarch64_cuda_compiler_versionNoneopenssl3 - variant + variant
linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.21python3.10.____cpythonlinux_ppc64le_cuda_compiler_versionNoneopenssl1.1.1 - variant + variant
linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.23python3.11.____cpythonlinux_ppc64le_cuda_compiler_versionNoneopenssl3 - variant + variant
linux_aarch64_cuda_compiler_version11.2numpy1.20python3.8.____cpythonosx_64_openssl1.1.1 - variant + variant
linux_aarch64_cuda_compiler_version11.2numpy1.20python3.9.____cpythonosx_64_openssl3 - variant + variant
linux_aarch64_cuda_compiler_version11.2numpy1.21python3.10.____cpythonosx_arm64_openssl1.1.1 - variant + variant
linux_aarch64_cuda_compiler_version11.2numpy1.23python3.11.____cpythonosx_arm64_openssl3 - variant + variant
linux_aarch64_cuda_compiler_versionNonenumpy1.20python3.8.____cpythonwin_64_cuda_compiler_version10.2openssl1.1.1 - variant + variant
linux_aarch64_cuda_compiler_versionNonenumpy1.20python3.9.____cpythonwin_64_cuda_compiler_version10.2openssl3 - variant + variant
linux_aarch64_cuda_compiler_versionNonenumpy1.21python3.10.____cpythonwin_64_cuda_compiler_versionNoneopenssl1.1.1 - variant + variant
linux_aarch64_cuda_compiler_versionNonenumpy1.23python3.11.____cpythonwin_64_cuda_compiler_versionNoneopenssl3 - variant - -
linux_ppc64le_numpy1.20python3.8.____cpython - - variant - -
linux_ppc64le_numpy1.20python3.9.____cpython - - variant - -
linux_ppc64le_numpy1.21python3.10.____cpython - - variant - -
linux_ppc64le_numpy1.23python3.11.____cpython - - variant - -
osx_64_numpy1.20python3.8.____cpython - - variant - -
osx_64_numpy1.20python3.9.____cpython - - variant - -
osx_64_numpy1.21python3.10.____cpython - - variant - -
osx_64_numpy1.23python3.11.____cpython - - variant - -
osx_arm64_numpy1.20python3.8.____cpython - - variant - -
osx_arm64_numpy1.20python3.9.____cpython - - variant - -
osx_arm64_numpy1.21python3.10.____cpython - - variant - -
osx_arm64_numpy1.23python3.11.____cpython - - variant - -
win_64_cuda_compiler_version10.2numpy1.20python3.8.____cpython - - variant - -
win_64_cuda_compiler_version10.2numpy1.20python3.9.____cpython - - variant - -
win_64_cuda_compiler_version10.2numpy1.21python3.10.____cpython - - variant - -
win_64_cuda_compiler_version10.2numpy1.23python3.11.____cpython - - variant - -
win_64_cuda_compiler_versionNonenumpy1.20python3.8.____cpython - - variant - -
win_64_cuda_compiler_versionNonenumpy1.20python3.9.____cpython - - variant - -
win_64_cuda_compiler_versionNonenumpy1.21python3.10.____cpython - - variant - -
win_64_cuda_compiler_versionNonenumpy1.23python3.11.____cpython - - variant + variant