You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by GitBox <gi...@apache.org> on 2019/01/16 03:24:13 UTC
[arrow] Diff for: [GitHub] kszucs closed pull request #3411: ARROW-4270:
[Packaging][Conda] Update xcode version and remove toolchain builds
diff --git a/dev/tasks/conda-recipes/appveyor.yml b/dev/tasks/conda-recipes/appveyor.yml
index 3d3ba43be7..b3a4743d9a 100644
--- a/dev/tasks/conda-recipes/appveyor.yml
+++ b/dev/tasks/conda-recipes/appveyor.yml
@@ -35,25 +35,26 @@ install:
- cmd: set PYTHONUNBUFFERED=1
- # Add our channels.
- - cmd: conda.exe config --set show_channel_urls true
- - cmd: conda.exe config --remove channels defaults
- - cmd: conda.exe config --add channels defaults
- - cmd: conda.exe config --add channels conda-forge
-
# Configure the VM.
- - cmd: conda.exe install -n root --quiet --yes conda-forge-ci-setup=1
- - cmd: run_conda_forge_build_setup
+ - cmd: conda.exe install -n root -c conda-forge --quiet --yes conda-forge-ci-setup=2
# Skip .NET project specific build phase.
build: off
test_script:
+ # Clone arrow
- git clone -b {{ arrow.branch }} {{ arrow.remote }} arrow || exit /B
- git -C arrow checkout {{ arrow.head }} || exit /B
-
- pushd arrow\dev\tasks\conda-recipes
- - conda.exe build --output-folder . -m {{ variant_config_file }} parquet-cpp arrow-cpp pyarrow
+
+ # Configure conda
+ - cmd: setup_conda_rc .\ .\ variants\{{ config }}.yaml
+ - cmd: run_conda_forge_build_setup
+
+ # Build the recipes
+ - conda.exe build --output-folder . -m variants\{{ config }}.yaml parquet-cpp arrow-cpp pyarrow
+
+ # Rename artifacts
- pushd win-64
- for %%f in (*.tar.bz2) do (
set %%g=%%~nf
diff --git a/dev/tasks/conda-recipes/travis.linux.yml b/dev/tasks/conda-recipes/travis.linux.yml
index f0c4c77ada..cf2895f408 100644
--- a/dev/tasks/conda-recipes/travis.linux.yml
+++ b/dev/tasks/conda-recipes/travis.linux.yml
@@ -38,6 +38,7 @@ install:
MINICONDA_FILE="Miniconda3-latest-Linux-x86_64.sh"
curl -L -O "${MINICONDA_URL}/${MINICONDA_FILE}"
bash $MINICONDA_FILE -b
+
# Install conda build dependency
- |
echo ""
@@ -49,16 +50,16 @@ before_script:
- git clone -b {{ arrow.branch }} {{ arrow.remote }} arrow
- git -C arrow checkout {{ arrow.head }}
- pushd arrow/dev/tasks/conda-recipes
+
# Configure conda
- - setup_conda_rc ./ ./ {{ variant_config_file }}
+ - setup_conda_rc ./ ./ variants/{{ config }}.yaml
- source run_conda_forge_build_setup
script:
- # Don't need to run make_build_number, no build number decrementation happens, it's always 0
- |
conda build --croot $TRAVIS_HOME/conda_build_root \
--output-folder . \
- -m {{ variant_config_file }} \
+ -m variants/{{ config }}.yaml \
parquet-cpp arrow-cpp pyarrow
deploy:
diff --git a/dev/tasks/conda-recipes/travis.osx.yml b/dev/tasks/conda-recipes/travis.osx.yml
index 23fd6e104a..31b8b76517 100644
--- a/dev/tasks/conda-recipes/travis.osx.yml
+++ b/dev/tasks/conda-recipes/travis.osx.yml
@@ -16,7 +16,7 @@
# under the License.
os: osx
-osx_image: xcode6.4
+osx_image: xcode9.4
language: generic
# don't build twice
@@ -52,22 +52,23 @@ install:
echo ""
echo "Configuring conda."
source /Users/travis/miniconda3/bin/activate root
+
conda install -n root -c conda-forge --quiet --yes conda-forge-ci-setup=2
+
before_script:
- git clone -b {{ arrow.branch }} {{ arrow.remote }} arrow
- git -C arrow checkout {{ arrow.head }}
- pushd arrow/dev/tasks/conda-recipes
+
# Configure conda
- - setup_conda_rc ./ ./ {{ variant_config_file }}
+ - setup_conda_rc ./ ./ variants/{{ config }}.yaml
- source run_conda_forge_build_setup
script:
- # Don't need to run make_build_number, no build number decrementation happens, it's always 0
- |
- conda build --croot $TRAVIS_HOME/conda_build_root \
- --output-folder . \
- -m {{ variant_config_file }} \
+ conda build --output-folder . \
+ -m variants/{{ config }}.yaml \
parquet-cpp arrow-cpp pyarrow
deploy:
diff --git a/dev/tasks/conda-recipes/variants/linux_c_compilergcccxx_compilergxxpython2.7.yaml b/dev/tasks/conda-recipes/variants/linux_c_compilergcccxx_compilergxxpython2.7.yaml
index 43b2902b59..149d5fdffc 100644
--- a/dev/tasks/conda-recipes/variants/linux_c_compilergcccxx_compilergxxpython2.7.yaml
+++ b/dev/tasks/conda-recipes/variants/linux_c_compilergcccxx_compilergxxpython2.7.yaml
@@ -2,24 +2,40 @@ boost_cpp:
- 1.68.0
build_number_decrement:
- '0'
-c_compiler:
-- gcc
channel_sources:
-- conda-forge/label/gcc7,defaults
+- conda-forge,defaults
channel_targets:
-- conda-forge gcc7
+- conda-forge main
+c_compiler:
+- gcc
cxx_compiler:
- gxx
docker_image:
- condaforge/linux-anvil-comp7
+libprotobuf:
+- '3.6'
+lz4_c:
+- 1.8.1
pin_run_as_build:
boost-cpp:
max_pin: x.x.x
+ libprotobuf:
+ max_pin: x.x
+ lz4-c:
+ max_pin: x.x.x
python:
min_pin: x.x
max_pin: x.x
+ snappy:
+ max_pin: x.x.x
+ zlib:
+ max_pin: x.x
+ zstd:
+ max_pin: x.x.x
python:
- '2.7'
+snappy:
+- 1.1.7
zip_keys:
- - c_compiler
- cxx_compiler
@@ -27,3 +43,7 @@ zip_keys:
- channel_targets
- docker_image
- build_number_decrement
+zlib:
+- '1.2'
+zstd:
+- 1.3.3
diff --git a/dev/tasks/conda-recipes/variants/linux_c_compilergcccxx_compilergxxpython3.6.yaml b/dev/tasks/conda-recipes/variants/linux_c_compilergcccxx_compilergxxpython3.6.yaml
index e5c89f2fed..b71d9de27b 100644
--- a/dev/tasks/conda-recipes/variants/linux_c_compilergcccxx_compilergxxpython3.6.yaml
+++ b/dev/tasks/conda-recipes/variants/linux_c_compilergcccxx_compilergxxpython3.6.yaml
@@ -2,24 +2,40 @@ boost_cpp:
- 1.68.0
build_number_decrement:
- '0'
-c_compiler:
-- gcc
channel_sources:
-- conda-forge/label/gcc7,defaults
+- conda-forge,defaults
channel_targets:
-- conda-forge gcc7
+- conda-forge main
+c_compiler:
+- gcc
cxx_compiler:
- gxx
docker_image:
- condaforge/linux-anvil-comp7
+libprotobuf:
+- '3.6'
+lz4_c:
+- 1.8.1
pin_run_as_build:
boost-cpp:
max_pin: x.x.x
+ libprotobuf:
+ max_pin: x.x
+ lz4-c:
+ max_pin: x.x.x
python:
min_pin: x.x
max_pin: x.x
+ snappy:
+ max_pin: x.x.x
+ zlib:
+ max_pin: x.x
+ zstd:
+ max_pin: x.x.x
python:
- '3.6'
+snappy:
+- 1.1.7
zip_keys:
- - c_compiler
- cxx_compiler
@@ -27,3 +43,7 @@ zip_keys:
- channel_targets
- docker_image
- build_number_decrement
+zlib:
+- '1.2'
+zstd:
+- 1.3.3
diff --git a/dev/tasks/conda-recipes/variants/linux_c_compilergcccxx_compilergxxpython3.7.yaml b/dev/tasks/conda-recipes/variants/linux_c_compilergcccxx_compilergxxpython3.7.yaml
index 3892e5e8a5..e5dbba5b34 100644
--- a/dev/tasks/conda-recipes/variants/linux_c_compilergcccxx_compilergxxpython3.7.yaml
+++ b/dev/tasks/conda-recipes/variants/linux_c_compilergcccxx_compilergxxpython3.7.yaml
@@ -2,24 +2,40 @@ boost_cpp:
- 1.68.0
build_number_decrement:
- '0'
-c_compiler:
-- gcc
channel_sources:
-- conda-forge/label/gcc7,defaults
+- conda-forge,defaults
channel_targets:
-- conda-forge gcc7
+- conda-forge main
+c_compiler:
+- gcc
cxx_compiler:
- gxx
docker_image:
- condaforge/linux-anvil-comp7
+libprotobuf:
+- '3.6'
+lz4_c:
+- 1.8.1
pin_run_as_build:
boost-cpp:
max_pin: x.x.x
+ libprotobuf:
+ max_pin: x.x
+ lz4-c:
+ max_pin: x.x.x
python:
min_pin: x.x
max_pin: x.x
+ snappy:
+ max_pin: x.x.x
+ zlib:
+ max_pin: x.x
+ zstd:
+ max_pin: x.x.x
python:
- '3.7'
+snappy:
+- 1.1.7
zip_keys:
- - c_compiler
- cxx_compiler
@@ -27,3 +43,7 @@ zip_keys:
- channel_targets
- docker_image
- build_number_decrement
+zlib:
+- '1.2'
+zstd:
+- 1.3.3
diff --git a/dev/tasks/conda-recipes/variants/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7.yaml b/dev/tasks/conda-recipes/variants/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7.yaml
deleted file mode 100644
index 9a9e0f79ce..0000000000
--- a/dev/tasks/conda-recipes/variants/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-boost_cpp:
-- 1.68.0
-build_number_decrement:
-- '1000'
-c_compiler:
-- toolchain_c
-channel_sources:
-- conda-forge,defaults
-channel_targets:
-- conda-forge main
-cxx_compiler:
-- toolchain_cxx
-docker_image:
-- condaforge/linux-anvil
-pin_run_as_build:
- boost-cpp:
- max_pin: x.x.x
- python:
- min_pin: x.x
- max_pin: x.x
-python:
-- '2.7'
-zip_keys:
-- - c_compiler
- - cxx_compiler
- - channel_sources
- - channel_targets
- - docker_image
- - build_number_decrement
diff --git a/dev/tasks/conda-recipes/variants/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6.yaml b/dev/tasks/conda-recipes/variants/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6.yaml
deleted file mode 100644
index 5f01b786de..0000000000
--- a/dev/tasks/conda-recipes/variants/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-boost_cpp:
-- 1.68.0
-build_number_decrement:
-- '1000'
-c_compiler:
-- toolchain_c
-channel_sources:
-- conda-forge,defaults
-channel_targets:
-- conda-forge main
-cxx_compiler:
-- toolchain_cxx
-docker_image:
-- condaforge/linux-anvil
-pin_run_as_build:
- boost-cpp:
- max_pin: x.x.x
- python:
- min_pin: x.x
- max_pin: x.x
-python:
-- '3.6'
-zip_keys:
-- - c_compiler
- - cxx_compiler
- - channel_sources
- - channel_targets
- - docker_image
- - build_number_decrement
diff --git a/dev/tasks/conda-recipes/variants/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7.yaml b/dev/tasks/conda-recipes/variants/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7.yaml
deleted file mode 100644
index 0e27f2ec29..0000000000
--- a/dev/tasks/conda-recipes/variants/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-boost_cpp:
-- 1.68.0
-build_number_decrement:
-- '1000'
-c_compiler:
-- toolchain_c
-channel_sources:
-- conda-forge,defaults
-channel_targets:
-- conda-forge main
-cxx_compiler:
-- toolchain_cxx
-docker_image:
-- condaforge/linux-anvil
-pin_run_as_build:
- boost-cpp:
- max_pin: x.x.x
- python:
- min_pin: x.x
- max_pin: x.x
-python:
-- '3.7'
-zip_keys:
-- - c_compiler
- - cxx_compiler
- - channel_sources
- - channel_targets
- - docker_image
- - build_number_decrement
diff --git a/dev/tasks/conda-recipes/variants/osx_c_compilerclangcxx_compilerclangxxpython2.7.yaml b/dev/tasks/conda-recipes/variants/osx_c_compilerclangcxx_compilerclangxxpython2.7.yaml
index caf6bf7ebb..85d3db6a5a 100644
--- a/dev/tasks/conda-recipes/variants/osx_c_compilerclangcxx_compilerclangxxpython2.7.yaml
+++ b/dev/tasks/conda-recipes/variants/osx_c_compilerclangcxx_compilerclangxxpython2.7.yaml
@@ -4,14 +4,18 @@ boost_cpp:
- 1.68.0
build_number_decrement:
- '0'
-c_compiler:
-- clang
channel_sources:
-- conda-forge/label/gcc7,defaults
+- conda-forge,defaults
channel_targets:
-- conda-forge gcc7
+- conda-forge main
+c_compiler:
+- clang
cxx_compiler:
- clangxx
+libprotobuf:
+- '3.6'
+lz4_c:
+- 1.8.1
macos_machine:
- x86_64-apple-darwin13.4.0
macos_min_version:
@@ -19,14 +23,30 @@ macos_min_version:
pin_run_as_build:
boost-cpp:
max_pin: x.x.x
+ libprotobuf:
+ max_pin: x.x
+ lz4-c:
+ max_pin: x.x.x
python:
min_pin: x.x
max_pin: x.x
+ snappy:
+ max_pin: x.x.x
+ zlib:
+ max_pin: x.x
+ zstd:
+ max_pin: x.x.x
python:
- '2.7'
+snappy:
+- 1.1.7
zip_keys:
- - c_compiler
- cxx_compiler
- channel_sources
- channel_targets
- build_number_decrement
+zlib:
+- '1.2'
+zstd:
+- 1.3.3
diff --git a/dev/tasks/conda-recipes/variants/osx_c_compilerclangcxx_compilerclangxxpython3.6.yaml b/dev/tasks/conda-recipes/variants/osx_c_compilerclangcxx_compilerclangxxpython3.6.yaml
index 94f51c0ac1..4fd6bd2b52 100644
--- a/dev/tasks/conda-recipes/variants/osx_c_compilerclangcxx_compilerclangxxpython3.6.yaml
+++ b/dev/tasks/conda-recipes/variants/osx_c_compilerclangcxx_compilerclangxxpython3.6.yaml
@@ -4,14 +4,18 @@ boost_cpp:
- 1.68.0
build_number_decrement:
- '0'
-c_compiler:
-- clang
channel_sources:
-- conda-forge/label/gcc7,defaults
+- conda-forge,defaults
channel_targets:
-- conda-forge gcc7
+- conda-forge main
+c_compiler:
+- clang
cxx_compiler:
- clangxx
+libprotobuf:
+- '3.6'
+lz4_c:
+- 1.8.1
macos_machine:
- x86_64-apple-darwin13.4.0
macos_min_version:
@@ -19,14 +23,30 @@ macos_min_version:
pin_run_as_build:
boost-cpp:
max_pin: x.x.x
+ libprotobuf:
+ max_pin: x.x
+ lz4-c:
+ max_pin: x.x.x
python:
min_pin: x.x
max_pin: x.x
+ snappy:
+ max_pin: x.x.x
+ zlib:
+ max_pin: x.x
+ zstd:
+ max_pin: x.x.x
python:
- '3.6'
+snappy:
+- 1.1.7
zip_keys:
- - c_compiler
- cxx_compiler
- channel_sources
- channel_targets
- build_number_decrement
+zlib:
+- '1.2'
+zstd:
+- 1.3.3
diff --git a/dev/tasks/conda-recipes/variants/osx_c_compilerclangcxx_compilerclangxxpython3.7.yaml b/dev/tasks/conda-recipes/variants/osx_c_compilerclangcxx_compilerclangxxpython3.7.yaml
index 25b5c4175d..4e4a8df8bd 100644
--- a/dev/tasks/conda-recipes/variants/osx_c_compilerclangcxx_compilerclangxxpython3.7.yaml
+++ b/dev/tasks/conda-recipes/variants/osx_c_compilerclangcxx_compilerclangxxpython3.7.yaml
@@ -4,14 +4,18 @@ boost_cpp:
- 1.68.0
build_number_decrement:
- '0'
-c_compiler:
-- clang
channel_sources:
-- conda-forge/label/gcc7,defaults
+- conda-forge,defaults
channel_targets:
-- conda-forge gcc7
+- conda-forge main
+c_compiler:
+- clang
cxx_compiler:
- clangxx
+libprotobuf:
+- '3.6'
+lz4_c:
+- 1.8.1
macos_machine:
- x86_64-apple-darwin13.4.0
macos_min_version:
@@ -19,14 +23,30 @@ macos_min_version:
pin_run_as_build:
boost-cpp:
max_pin: x.x.x
+ libprotobuf:
+ max_pin: x.x
+ lz4-c:
+ max_pin: x.x.x
python:
min_pin: x.x
max_pin: x.x
+ snappy:
+ max_pin: x.x.x
+ zlib:
+ max_pin: x.x
+ zstd:
+ max_pin: x.x.x
python:
- '3.7'
+snappy:
+- 1.1.7
zip_keys:
- - c_compiler
- cxx_compiler
- channel_sources
- channel_targets
- build_number_decrement
+zlib:
+- '1.2'
+zstd:
+- 1.3.3
diff --git a/dev/tasks/conda-recipes/variants/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7.yaml b/dev/tasks/conda-recipes/variants/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7.yaml
deleted file mode 100644
index e11b9f8c60..0000000000
--- a/dev/tasks/conda-recipes/variants/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-MACOSX_DEPLOYMENT_TARGET:
-- '10.9'
-boost_cpp:
-- 1.68.0
-build_number_decrement:
-- '1000'
-c_compiler:
-- toolchain_c
-channel_sources:
-- conda-forge,defaults
-channel_targets:
-- conda-forge main
-cxx_compiler:
-- toolchain_cxx
-macos_machine:
-- x86_64-apple-darwin13.4.0
-macos_min_version:
-- '10.9'
-pin_run_as_build:
- boost-cpp:
- max_pin: x.x.x
- python:
- min_pin: x.x
- max_pin: x.x
-python:
-- '2.7'
-zip_keys:
-- - c_compiler
- - cxx_compiler
- - channel_sources
- - channel_targets
- - build_number_decrement
diff --git a/dev/tasks/conda-recipes/variants/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6.yaml b/dev/tasks/conda-recipes/variants/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6.yaml
deleted file mode 100644
index 01aa8595a1..0000000000
--- a/dev/tasks/conda-recipes/variants/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-MACOSX_DEPLOYMENT_TARGET:
-- '10.9'
-boost_cpp:
-- 1.68.0
-build_number_decrement:
-- '1000'
-c_compiler:
-- toolchain_c
-channel_sources:
-- conda-forge,defaults
-channel_targets:
-- conda-forge main
-cxx_compiler:
-- toolchain_cxx
-macos_machine:
-- x86_64-apple-darwin13.4.0
-macos_min_version:
-- '10.9'
-pin_run_as_build:
- boost-cpp:
- max_pin: x.x.x
- python:
- min_pin: x.x
- max_pin: x.x
-python:
-- '3.6'
-zip_keys:
-- - c_compiler
- - cxx_compiler
- - channel_sources
- - channel_targets
- - build_number_decrement
diff --git a/dev/tasks/conda-recipes/variants/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7.yaml b/dev/tasks/conda-recipes/variants/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7.yaml
deleted file mode 100644
index 836650a03a..0000000000
--- a/dev/tasks/conda-recipes/variants/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-MACOSX_DEPLOYMENT_TARGET:
-- '10.9'
-boost_cpp:
-- 1.68.0
-build_number_decrement:
-- '1000'
-c_compiler:
-- toolchain_c
-channel_sources:
-- conda-forge,defaults
-channel_targets:
-- conda-forge main
-cxx_compiler:
-- toolchain_cxx
-macos_machine:
-- x86_64-apple-darwin13.4.0
-macos_min_version:
-- '10.9'
-pin_run_as_build:
- boost-cpp:
- max_pin: x.x.x
- python:
- min_pin: x.x
- max_pin: x.x
-python:
-- '3.7'
-zip_keys:
-- - c_compiler
- - cxx_compiler
- - channel_sources
- - channel_targets
- - build_number_decrement
diff --git a/dev/tasks/conda-recipes/variants/win_c_compilervs2015cxx_compilervs2015python3.6.yaml b/dev/tasks/conda-recipes/variants/win_c_compilervs2015cxx_compilervs2015python3.6.yaml
index a56ee638f6..5a57d02fd0 100644
--- a/dev/tasks/conda-recipes/variants/win_c_compilervs2015cxx_compilervs2015python3.6.yaml
+++ b/dev/tasks/conda-recipes/variants/win_c_compilervs2015cxx_compilervs2015python3.6.yaml
@@ -8,15 +8,35 @@ channel_targets:
- conda-forge main
cxx_compiler:
- vs2015
+libprotobuf:
+- '3.6'
+lz4_c:
+- 1.8.1
pin_run_as_build:
boost-cpp:
max_pin: x.x.x
+ libprotobuf:
+ max_pin: x.x
+ lz4-c:
+ max_pin: x.x.x
python:
min_pin: x.x
max_pin: x.x
+ snappy:
+ max_pin: x.x.x
+ zlib:
+ max_pin: x.x
+ zstd:
+ max_pin: x.x.x
python:
- '3.6'
+snappy:
+- 1.1.7
zip_keys:
- - python
- c_compiler
- cxx_compiler
+zlib:
+- '1.2'
+zstd:
+- 1.3.3
diff --git a/dev/tasks/conda-recipes/variants/win_c_compilervs2015cxx_compilervs2015python3.7.yaml b/dev/tasks/conda-recipes/variants/win_c_compilervs2015cxx_compilervs2015python3.7.yaml
index 1cce7445c7..06bd37d5ea 100644
--- a/dev/tasks/conda-recipes/variants/win_c_compilervs2015cxx_compilervs2015python3.7.yaml
+++ b/dev/tasks/conda-recipes/variants/win_c_compilervs2015cxx_compilervs2015python3.7.yaml
@@ -8,15 +8,35 @@ channel_targets:
- conda-forge main
cxx_compiler:
- vs2015
+libprotobuf:
+- '3.6'
+lz4_c:
+- 1.8.1
pin_run_as_build:
boost-cpp:
max_pin: x.x.x
+ libprotobuf:
+ max_pin: x.x
+ lz4-c:
+ max_pin: x.x.x
python:
min_pin: x.x
max_pin: x.x
+ snappy:
+ max_pin: x.x.x
+ zlib:
+ max_pin: x.x
+ zstd:
+ max_pin: x.x.x
python:
- '3.7'
+snappy:
+- 1.1.7
zip_keys:
- - python
- c_compiler
- cxx_compiler
+zlib:
+- '1.2'
+zstd:
+- 1.3.3
diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml
index e676458096..9d397ec5de 100644
--- a/dev/tasks/tasks.yml
+++ b/dev/tasks/tasks.yml
@@ -22,15 +22,9 @@ groups:
- conda-linux-gcc-py27
- conda-linux-gcc-py36
- conda-linux-gcc-py37
- - conda-linux-toolchain-py27
- - conda-linux-toolchain-py36
- - conda-linux-toolchain-py37
- # - conda-osx-clang-py27
- # - conda-osx-clang-py36
- # - conda-osx-clang-py37
- - conda-osx-toolchain-py27
- - conda-osx-toolchain-py36
- - conda-osx-toolchain-py37
+ - conda-osx-clang-py27
+ - conda-osx-clang-py36
+ - conda-osx-clang-py37
- conda-win-vs2015-py36
- conda-win-vs2015-py37
wheel:
@@ -74,7 +68,7 @@ tasks:
platform: linux
template: conda-recipes/travis.linux.yml
params:
- variant_config_file: variants/linux_c_compilergcccxx_compilergxxpython2.7.yaml
+ config: linux_c_compilergcccxx_compilergxxpython2.7
artifacts:
- arrow-cpp-{no_rc_version}-py27(h[a-z0-9]+)_0.tar.bz2
- pyarrow-{no_rc_version}-py27(h[a-z0-9]+)_0.tar.bz2
@@ -83,7 +77,7 @@ tasks:
platform: linux
template: conda-recipes/travis.linux.yml
params:
- variant_config_file: variants/linux_c_compilergcccxx_compilergxxpython3.6.yaml
+ config: linux_c_compilergcccxx_compilergxxpython3.6
artifacts:
- arrow-cpp-{no_rc_version}-py36(h[a-z0-9]+)_0.tar.bz2
- pyarrow-{no_rc_version}-py36(h[a-z0-9]+)_0.tar.bz2
@@ -92,90 +86,36 @@ tasks:
platform: linux
template: conda-recipes/travis.linux.yml
params:
- variant_config_file: variants/linux_c_compilergcccxx_compilergxxpython3.7.yaml
- artifacts:
- - arrow-cpp-{no_rc_version}-py37(h[a-z0-9]+)_0.tar.bz2
- - pyarrow-{no_rc_version}-py37(h[a-z0-9]+)_0.tar.bz2
-
- conda-linux-toolchain-py27:
- platform: linux
- template: conda-recipes/travis.linux.yml
- params:
- variant_config_file: variants/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7.yaml
- artifacts:
- - arrow-cpp-{no_rc_version}-py27(h[a-z0-9]+)_0.tar.bz2
- - pyarrow-{no_rc_version}-py27(h[a-z0-9]+)_0.tar.bz2
-
- conda-linux-toolchain-py36:
- platform: linux
- template: conda-recipes/travis.linux.yml
- params:
- variant_config_file: variants/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6.yaml
- artifacts:
- - arrow-cpp-{no_rc_version}-py36(h[a-z0-9]+)_0.tar.bz2
- - pyarrow-{no_rc_version}-py36(h[a-z0-9]+)_0.tar.bz2
-
- conda-linux-toolchain-py37:
- platform: linux
- template: conda-recipes/travis.linux.yml
- params:
- variant_config_file: variants/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7.yaml
+ config: linux_c_compilergcccxx_compilergxxpython3.7
artifacts:
- arrow-cpp-{no_rc_version}-py37(h[a-z0-9]+)_0.tar.bz2
- pyarrow-{no_rc_version}-py37(h[a-z0-9]+)_0.tar.bz2
############################## Conda OSX ####################################
- # conda-osx-clang-py27:
- # platform: osx
- # template: conda-recipes/travis.osx.yml
- # params:
- # variant_config_file: variants/osx_c_compilerclangcxx_compilerclangxxpython2.7.yaml
- # artifacts:
- # - arrow-cpp-{no_rc_version}-py27(h[a-z0-9]+)_0.tar.bz2
- # - pyarrow-{no_rc_version}-py27(h[a-z0-9]+)_0.tar.bz2
- #
- # conda-osx-clang-py36:
- # platform: osx
- # template: conda-recipes/travis.osx.yml
- # params:
- # variant_config_file: variants/osx_c_compilerclangcxx_compilerclangxxpython3.6.yaml
- # artifacts:
- # - arrow-cpp-{no_rc_version}-py36(h[a-z0-9]+)_0.tar.bz2
- # - pyarrow-{no_rc_version}-py36(h[a-z0-9]+)_0.tar.bz2
- #
- # conda-osx-clang-py37:
- # platform: osx
- # template: conda-recipes/travis.osx.yml
- # params:
- # variant_config_file: variants/osx_c_compilerclangcxx_compilerclangxxpython3.7.yaml
- # artifacts:
- # - arrow-cpp-{no_rc_version}-py37(h[a-z0-9]+)_0.tar.bz2
- # - pyarrow-{no_rc_version}-py37(h[a-z0-9]+)_0.tar.bz2
-
- conda-osx-toolchain-py27:
+ conda-osx-clang-py27:
platform: osx
template: conda-recipes/travis.osx.yml
params:
- variant_config_file: variants/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7.yaml
+ config: osx_c_compilerclangcxx_compilerclangxxpython2.7
artifacts:
- arrow-cpp-{no_rc_version}-py27(h[a-z0-9]+)_0.tar.bz2
- pyarrow-{no_rc_version}-py27(h[a-z0-9]+)_0.tar.bz2
- conda-osx-toolchain-py36:
+ conda-osx-clang-py36:
platform: osx
template: conda-recipes/travis.osx.yml
params:
- variant_config_file: variants/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6.yaml
+ config: osx_c_compilerclangcxx_compilerclangxxpython3.6
artifacts:
- arrow-cpp-{no_rc_version}-py36(h[a-z0-9]+)_0.tar.bz2
- pyarrow-{no_rc_version}-py36(h[a-z0-9]+)_0.tar.bz2
- conda-osx-toolchain-py37:
+ conda-osx-clang-py37:
platform: osx
template: conda-recipes/travis.osx.yml
params:
- variant_config_file: variants/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7.yaml
+ config: osx_c_compilerclangcxx_compilerclangxxpython3.7
artifacts:
- arrow-cpp-{no_rc_version}-py37(h[a-z0-9]+)_0.tar.bz2
- pyarrow-{no_rc_version}-py37(h[a-z0-9]+)_0.tar.bz2
@@ -186,7 +126,7 @@ tasks:
platform: win
template: conda-recipes/appveyor.yml
params:
- variant_config_file: variants\win_c_compilervs2015cxx_compilervs2015python3.6.yaml
+ config: win_c_compilervs2015cxx_compilervs2015python3.6
artifacts:
- arrow-cpp-{no_rc_version}-py36_vc14(h[a-z0-9]+)_0.tar.bz2
- pyarrow-{no_rc_version}-py36(h[a-z0-9]+)_0.tar.bz2
@@ -195,7 +135,7 @@ tasks:
platform: win
template: conda-recipes/appveyor.yml
params:
- variant_config_file: variants\win_c_compilervs2015cxx_compilervs2015python3.7.yaml
+ config: win_c_compilervs2015cxx_compilervs2015python3.7
artifacts:
- arrow-cpp-{no_rc_version}-py37_vc14(h[a-z0-9]+)_0.tar.bz2
- pyarrow-{no_rc_version}-py37(h[a-z0-9]+)_0.tar.bz2
With regards,
Apache Git Services