You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by we...@apache.org on 2019/01/10 19:24:31 UTC
[arrow] branch master updated: ARROW-3819: [Packaging] Update conda
variant files to conform with feedstock after compiler migration
This is an automated email from the ASF dual-hosted git repository.
wesm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 9d342ec ARROW-3819: [Packaging] Update conda variant files to conform with feedstock after compiler migration
9d342ec is described below
commit 9d342ec4ffe2441ab0b072c90a4f652aa2678dc8
Author: Krisztián Szűcs <sz...@gmail.com>
AuthorDate: Thu Jan 10 13:24:23 2019 -0600
ARROW-3819: [Packaging] Update conda variant files to conform with feedstock after compiler migration
Crossbow builds:
- [kszucs/crossbow/build-403](https://github.com/kszucs/crossbow/branches/all?utf8=%E2%9C%93&query=build-403)
- [kszucs/crossbow/build-404](https://github.com/kszucs/crossbow/branches/all?utf8=%E2%9C%93&query=build-404)
- [kszucs/crossbow/build-405](https://github.com/kszucs/crossbow/branches/all?utf8=%E2%9C%93&query=build-405)
- [kszucs/crossbow/build-406](https://github.com/kszucs/crossbow/branches/all?utf8=%E2%9C%93&query=build-406)
- [kszucs/crossbow/build-407](https://github.com/kszucs/crossbow/branches/all?utf8=%E2%9C%93&query=build-407)
Author: Krisztián Szűcs <sz...@gmail.com>
Closes #3368 from kszucs/conda_forge_migration and squashes the following commits:
e0a5a6422 <Krisztián Szűcs> use --croot
3749a2ff9 <Krisztián Szűcs> git on osx; set FEEDSTOSK_ROOT
ca7217d7f <Krisztián Szűcs> support channel sources from variant files
33cba7118 <Krisztián Szűcs> fix conda path on linux
2505828b7 <Krisztián Szűcs> fix task names
0c4a10bc3 <Krisztián Szűcs> conda recipes for python 3.7; compiler migration
---
LICENSE.txt | 33 ++++++
dev/release/rat_exclude_files.txt | 1 +
dev/tasks/conda-recipes/travis.linux.yml | 23 ++--
dev/tasks/conda-recipes/travis.osx.yml | 24 ++--
...inux_c_compilergcccxx_compilergxxpython2.7.yaml | 29 +++++
...inux_c_compilergcccxx_compilergxxpython3.6.yaml | 29 +++++
...inux_c_compilergcccxx_compilergxxpython3.7.yaml | 29 +++++
...lchain_ccxx_compilertoolchain_cxxpython2.7.yaml | 29 +++++
...lchain_ccxx_compilertoolchain_cxxpython3.6.yaml | 29 +++++
...lchain_ccxx_compilertoolchain_cxxpython3.7.yaml | 29 +++++
.../conda-recipes/variants/linux_python2.7.yaml | 47 --------
.../conda-recipes/variants/linux_python3.5.yaml | 47 --------
.../conda-recipes/variants/linux_python3.6.yaml | 47 --------
..._compilerclangcxx_compilerclangxxpython2.7.yaml | 32 ++++++
..._compilerclangcxx_compilerclangxxpython3.6.yaml | 32 ++++++
..._compilerclangcxx_compilerclangxxpython3.7.yaml | 32 ++++++
...lchain_ccxx_compilertoolchain_cxxpython2.7.yaml | 32 ++++++
...lchain_ccxx_compilertoolchain_cxxpython3.6.yaml | 32 ++++++
...lchain_ccxx_compilertoolchain_cxxpython3.7.yaml | 32 ++++++
.../conda-recipes/variants/osx_python2.7.yaml | 53 ---------
.../conda-recipes/variants/osx_python3.5.yaml | 53 ---------
.../conda-recipes/variants/osx_python3.6.yaml | 47 --------
..._compilervs2015cxx_compilervs2015python3.5.yaml | 51 ---------
..._compilervs2015cxx_compilervs2015python3.6.yaml | 39 +------
..._compilervs2015cxx_compilervs2015python3.7.yaml | 22 ++++
dev/tasks/tasks.yml | 124 +++++++++++++++------
26 files changed, 547 insertions(+), 430 deletions(-)
diff --git a/LICENSE.txt b/LICENSE.txt
index 572d3ef..ad2255d 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -795,3 +795,36 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
You can contact the author at :
- xxHash homepage: http://www.xxhash.com
- xxHash source repository : https://github.com/Cyan4973/xxHash
+
+--------------------------------------------------------------------------------
+
+The files in dev/tasks/conda-recipes/variants have the following license
+
+BSD 3-clause license
+Copyright (c) 2015-2018, conda-forge
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors
+ may be used to endorse or promote products derived from this software without
+ specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/dev/release/rat_exclude_files.txt b/dev/release/rat_exclude_files.txt
index 720b19d..282f57c 100644
--- a/dev/release/rat_exclude_files.txt
+++ b/dev/release/rat_exclude_files.txt
@@ -114,6 +114,7 @@ dev/tasks/linux-packages/debian/plasma-store-server.install
dev/tasks/linux-packages/debian/rules
dev/tasks/linux-packages/debian/source/format
dev/tasks/linux-packages/debian/watch
+dev/tasks/conda-recipes/variants/*.yaml
docs/requirements.txt
go/arrow/go.sum
go/arrow/Gopkg.lock
diff --git a/dev/tasks/conda-recipes/travis.linux.yml b/dev/tasks/conda-recipes/travis.linux.yml
index c0fc71d..a3c2929 100644
--- a/dev/tasks/conda-recipes/travis.linux.yml
+++ b/dev/tasks/conda-recipes/travis.linux.yml
@@ -38,23 +38,28 @@ install:
MINICONDA_FILE="Miniconda3-latest-Linux-x86_64.sh"
curl -L -O "${MINICONDA_URL}/${MINICONDA_FILE}"
bash $MINICONDA_FILE -b
-
- # Configure conda.
+ # Install conda build dependency
- |
echo ""
echo "Configuring conda."
source /home/travis/miniconda3/bin/activate root
- conda config --remove channels defaults
- conda config --add channels defaults
- conda config --add channels conda-forge
- conda config --set show_channel_urls true
- conda install --yes --quiet conda-build
+ conda install -n root -c conda-forge --quiet --yes conda-forge-ci-setup=2
-script:
+before_script:
- git clone -b {{ arrow.branch }} {{ arrow.remote }} arrow
- git -C arrow checkout {{ arrow.head }}
- pushd arrow/dev/tasks/conda-recipes
- - conda build --output-folder . -m {{ variant_config_file }} parquet-cpp arrow-cpp pyarrow
+ # Configure conda
+ - setup_conda_rc ./ ./ {{ variant_config_file }}
+ - 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 }} \
+ parquet-cpp arrow-cpp pyarrow
deploy:
provider: releases
diff --git a/dev/tasks/conda-recipes/travis.osx.yml b/dev/tasks/conda-recipes/travis.osx.yml
index 193539d..6b3e561 100644
--- a/dev/tasks/conda-recipes/travis.osx.yml
+++ b/dev/tasks/conda-recipes/travis.osx.yml
@@ -47,24 +47,28 @@ install:
MINICONDA_FILE="Miniconda3-latest-MacOSX-x86_64.sh"
curl -L -O "${MINICONDA_URL}/${MINICONDA_FILE}"
bash $MINICONDA_FILE -b
-
- # Configure conda.
+ # Install conda build dependency
- |
echo ""
echo "Configuring conda."
source /Users/travis/miniconda3/bin/activate root
- conda config --remove channels defaults
- conda config --add channels defaults
- conda config --add channels conda-forge
- conda config --set show_channel_urls true
- conda install --yes --quiet conda-forge-ci-setup=1
- source run_conda_forge_build_setup
+ conda install -n root -c conda-forge --quiet --yes conda-forge-ci-setup=2
-script:
+before_script:
- git clone -b {{ arrow.branch }} {{ arrow.remote }} arrow
- git -C arrow checkout {{ arrow.head }}
- pushd arrow/dev/tasks/conda-recipes
- - conda build --output-folder . -m {{ variant_config_file }} parquet-cpp arrow-cpp pyarrow
+ # Configure conda
+ - setup_conda_rc ./ ./ {{ variant_config_file }}
+ - 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 }} \
+ parquet-cpp arrow-cpp pyarrow
deploy:
provider: releases
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
new file mode 100644
index 0000000..43b2902
--- /dev/null
+++ b/dev/tasks/conda-recipes/variants/linux_c_compilergcccxx_compilergxxpython2.7.yaml
@@ -0,0 +1,29 @@
+boost_cpp:
+- 1.68.0
+build_number_decrement:
+- '0'
+c_compiler:
+- gcc
+channel_sources:
+- conda-forge/label/gcc7,defaults
+channel_targets:
+- conda-forge gcc7
+cxx_compiler:
+- gxx
+docker_image:
+- condaforge/linux-anvil-comp7
+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_compilergcccxx_compilergxxpython3.6.yaml b/dev/tasks/conda-recipes/variants/linux_c_compilergcccxx_compilergxxpython3.6.yaml
new file mode 100644
index 0000000..e5c89f2
--- /dev/null
+++ b/dev/tasks/conda-recipes/variants/linux_c_compilergcccxx_compilergxxpython3.6.yaml
@@ -0,0 +1,29 @@
+boost_cpp:
+- 1.68.0
+build_number_decrement:
+- '0'
+c_compiler:
+- gcc
+channel_sources:
+- conda-forge/label/gcc7,defaults
+channel_targets:
+- conda-forge gcc7
+cxx_compiler:
+- gxx
+docker_image:
+- condaforge/linux-anvil-comp7
+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_compilergcccxx_compilergxxpython3.7.yaml b/dev/tasks/conda-recipes/variants/linux_c_compilergcccxx_compilergxxpython3.7.yaml
new file mode 100644
index 0000000..3892e5e
--- /dev/null
+++ b/dev/tasks/conda-recipes/variants/linux_c_compilergcccxx_compilergxxpython3.7.yaml
@@ -0,0 +1,29 @@
+boost_cpp:
+- 1.68.0
+build_number_decrement:
+- '0'
+c_compiler:
+- gcc
+channel_sources:
+- conda-forge/label/gcc7,defaults
+channel_targets:
+- conda-forge gcc7
+cxx_compiler:
+- gxx
+docker_image:
+- condaforge/linux-anvil-comp7
+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/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7.yaml b/dev/tasks/conda-recipes/variants/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7.yaml
new file mode 100644
index 0000000..9a9e0f7
--- /dev/null
+++ b/dev/tasks/conda-recipes/variants/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7.yaml
@@ -0,0 +1,29 @@
+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
new file mode 100644
index 0000000..5f01b78
--- /dev/null
+++ b/dev/tasks/conda-recipes/variants/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6.yaml
@@ -0,0 +1,29 @@
+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
new file mode 100644
index 0000000..0e27f2e
--- /dev/null
+++ b/dev/tasks/conda-recipes/variants/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7.yaml
@@ -0,0 +1,29 @@
+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/linux_python2.7.yaml b/dev/tasks/conda-recipes/variants/linux_python2.7.yaml
deleted file mode 100644
index 45026b0..0000000
--- a/dev/tasks/conda-recipes/variants/linux_python2.7.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-boost_cpp:
-- 1.67.0
-c_compiler:
-- toolchain_c
-cxx_compiler:
-- toolchain_cxx
-lz4_c:
-- 1.8.1
-pin_run_as_build:
- boost-cpp:
- max_pin: x.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
-zlib:
-- '1.2'
-zstd:
-- 1.3.3
diff --git a/dev/tasks/conda-recipes/variants/linux_python3.5.yaml b/dev/tasks/conda-recipes/variants/linux_python3.5.yaml
deleted file mode 100644
index 683022f..0000000
--- a/dev/tasks/conda-recipes/variants/linux_python3.5.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-boost_cpp:
-- 1.67.0
-c_compiler:
-- toolchain_c
-cxx_compiler:
-- toolchain_cxx
-lz4_c:
-- 1.8.1
-pin_run_as_build:
- boost-cpp:
- max_pin: x.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.5'
-snappy:
-- 1.1.7
-zlib:
-- '1.2'
-zstd:
-- 1.3.3
diff --git a/dev/tasks/conda-recipes/variants/linux_python3.6.yaml b/dev/tasks/conda-recipes/variants/linux_python3.6.yaml
deleted file mode 100644
index 6b7d889..0000000
--- a/dev/tasks/conda-recipes/variants/linux_python3.6.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-boost_cpp:
-- 1.67.0
-c_compiler:
-- toolchain_c
-cxx_compiler:
-- toolchain_cxx
-lz4_c:
-- 1.8.1
-pin_run_as_build:
- boost-cpp:
- max_pin: x.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
-zlib:
-- '1.2'
-zstd:
-- 1.3.3
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
new file mode 100644
index 0000000..caf6bf7
--- /dev/null
+++ b/dev/tasks/conda-recipes/variants/osx_c_compilerclangcxx_compilerclangxxpython2.7.yaml
@@ -0,0 +1,32 @@
+MACOSX_DEPLOYMENT_TARGET:
+- '10.9'
+boost_cpp:
+- 1.68.0
+build_number_decrement:
+- '0'
+c_compiler:
+- clang
+channel_sources:
+- conda-forge/label/gcc7,defaults
+channel_targets:
+- conda-forge gcc7
+cxx_compiler:
+- clangxx
+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_compilerclangcxx_compilerclangxxpython3.6.yaml b/dev/tasks/conda-recipes/variants/osx_c_compilerclangcxx_compilerclangxxpython3.6.yaml
new file mode 100644
index 0000000..94f51c0
--- /dev/null
+++ b/dev/tasks/conda-recipes/variants/osx_c_compilerclangcxx_compilerclangxxpython3.6.yaml
@@ -0,0 +1,32 @@
+MACOSX_DEPLOYMENT_TARGET:
+- '10.9'
+boost_cpp:
+- 1.68.0
+build_number_decrement:
+- '0'
+c_compiler:
+- clang
+channel_sources:
+- conda-forge/label/gcc7,defaults
+channel_targets:
+- conda-forge gcc7
+cxx_compiler:
+- clangxx
+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_compilerclangcxx_compilerclangxxpython3.7.yaml b/dev/tasks/conda-recipes/variants/osx_c_compilerclangcxx_compilerclangxxpython3.7.yaml
new file mode 100644
index 0000000..25b5c41
--- /dev/null
+++ b/dev/tasks/conda-recipes/variants/osx_c_compilerclangcxx_compilerclangxxpython3.7.yaml
@@ -0,0 +1,32 @@
+MACOSX_DEPLOYMENT_TARGET:
+- '10.9'
+boost_cpp:
+- 1.68.0
+build_number_decrement:
+- '0'
+c_compiler:
+- clang
+channel_sources:
+- conda-forge/label/gcc7,defaults
+channel_targets:
+- conda-forge gcc7
+cxx_compiler:
+- clangxx
+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/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7.yaml b/dev/tasks/conda-recipes/variants/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7.yaml
new file mode 100644
index 0000000..e11b9f8
--- /dev/null
+++ b/dev/tasks/conda-recipes/variants/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7.yaml
@@ -0,0 +1,32 @@
+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
new file mode 100644
index 0000000..01aa859
--- /dev/null
+++ b/dev/tasks/conda-recipes/variants/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6.yaml
@@ -0,0 +1,32 @@
+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
new file mode 100644
index 0000000..836650a
--- /dev/null
+++ b/dev/tasks/conda-recipes/variants/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7.yaml
@@ -0,0 +1,32 @@
+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/osx_python2.7.yaml b/dev/tasks/conda-recipes/variants/osx_python2.7.yaml
deleted file mode 100644
index b8fc15f..0000000
--- a/dev/tasks/conda-recipes/variants/osx_python2.7.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-MACOSX_DEPLOYMENT_TARGET:
-- '10.9'
-boost_cpp:
-- 1.67.0
-c_compiler:
-- toolchain_c
-cxx_compiler:
-- toolchain_cxx
-lz4_c:
-- 1.8.1
-macos_machine:
-- x86_64-apple-darwin13.4.0
-macos_min_version:
-- '10.9'
-pin_run_as_build:
- boost-cpp:
- max_pin: x.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
-zlib:
-- '1.2'
-zstd:
-- 1.3.3
diff --git a/dev/tasks/conda-recipes/variants/osx_python3.5.yaml b/dev/tasks/conda-recipes/variants/osx_python3.5.yaml
deleted file mode 100644
index 05f7a8d..0000000
--- a/dev/tasks/conda-recipes/variants/osx_python3.5.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-MACOSX_DEPLOYMENT_TARGET:
-- '10.9'
-boost_cpp:
-- 1.67.0
-c_compiler:
-- toolchain_c
-cxx_compiler:
-- toolchain_cxx
-lz4_c:
-- 1.8.1
-macos_machine:
-- x86_64-apple-darwin13.4.0
-macos_min_version:
-- '10.9'
-pin_run_as_build:
- boost-cpp:
- max_pin: x.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.5'
-snappy:
-- 1.1.7
-zlib:
-- '1.2'
-zstd:
-- 1.3.3
diff --git a/dev/tasks/conda-recipes/variants/osx_python3.6.yaml b/dev/tasks/conda-recipes/variants/osx_python3.6.yaml
deleted file mode 100644
index 6b7d889..0000000
--- a/dev/tasks/conda-recipes/variants/osx_python3.6.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-boost_cpp:
-- 1.67.0
-c_compiler:
-- toolchain_c
-cxx_compiler:
-- toolchain_cxx
-lz4_c:
-- 1.8.1
-pin_run_as_build:
- boost-cpp:
- max_pin: x.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
-zlib:
-- '1.2'
-zstd:
-- 1.3.3
diff --git a/dev/tasks/conda-recipes/variants/win_c_compilervs2015cxx_compilervs2015python3.5.yaml b/dev/tasks/conda-recipes/variants/win_c_compilervs2015cxx_compilervs2015python3.5.yaml
deleted file mode 100644
index d886b0e..0000000
--- a/dev/tasks/conda-recipes/variants/win_c_compilervs2015cxx_compilervs2015python3.5.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-boost_cpp:
-- 1.67.0
-c_compiler:
-- vs2015
-cxx_compiler:
-- vs2015
-lz4_c:
-- 1.8.1
-pin_run_as_build:
- boost-cpp:
- max_pin: x.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.5'
-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.6.yaml b/dev/tasks/conda-recipes/variants/win_c_compilervs2015cxx_compilervs2015python3.6.yaml
index 880642f..a56ee63 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
@@ -1,51 +1,22 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
boost_cpp:
-- 1.67.0
+- 1.68.0
c_compiler:
- vs2015
+channel_sources:
+- conda-forge,defaults
+channel_targets:
+- conda-forge main
cxx_compiler:
- vs2015
-lz4_c:
-- 1.8.1
pin_run_as_build:
boost-cpp:
max_pin: x.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
new file mode 100644
index 0000000..1cce744
--- /dev/null
+++ b/dev/tasks/conda-recipes/variants/win_c_compilervs2015cxx_compilervs2015python3.7.yaml
@@ -0,0 +1,22 @@
+boost_cpp:
+- 1.68.0
+c_compiler:
+- vs2015
+channel_sources:
+- conda-forge,defaults
+channel_targets:
+- conda-forge main
+cxx_compiler:
+- vs2015
+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:
+- - python
+ - c_compiler
+ - cxx_compiler
diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml
index 52bbc57..4b10b57 100644
--- a/dev/tasks/tasks.yml
+++ b/dev/tasks/tasks.yml
@@ -19,14 +19,20 @@ groups:
# these groups are just for convenience
# makes it easier to submit related tasks
conda:
- - conda-linux-py27
- - conda-linux-py35
- - conda-linux-py36
- - conda-osx-py27
- - conda-osx-py35
- - conda-osx-py36
- - conda-win-py35
- - conda-win-py36
+ - 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-win-vs2015-py36
+ - conda-win-vs2015-py37
wheel:
- wheel-linux-cp27m
- wheel-linux-cp27mu
@@ -64,81 +70,135 @@ tasks:
############################## Conda Linux ##################################
- conda-linux-py27:
+ conda-linux-gcc-py27:
platform: linux
template: conda-recipes/travis.linux.yml
params:
- variant_config_file: variants/linux_python2.7.yaml
+ variant_config_file: variants/linux_c_compilergcccxx_compilergxxpython2.7.yaml
artifacts:
- arrow-cpp-{version}-py27(h[a-z0-9]+)_0.tar.bz2
- pyarrow-{version}-py27(h[a-z0-9]+)_0.tar.bz2
- conda-linux-py35:
+ conda-linux-gcc-py36:
platform: linux
template: conda-recipes/travis.linux.yml
params:
- variant_config_file: variants/linux_python3.5.yaml
+ variant_config_file: variants/linux_c_compilergcccxx_compilergxxpython3.6.yaml
artifacts:
- - arrow-cpp-{version}-py35(h[a-z0-9]+)_0.tar.bz2
- - pyarrow-{version}-py35(h[a-z0-9]+)_0.tar.bz2
+ - arrow-cpp-{version}-py36(h[a-z0-9]+)_0.tar.bz2
+ - pyarrow-{version}-py36(h[a-z0-9]+)_0.tar.bz2
+
+ conda-linux-gcc-py37:
+ platform: linux
+ template: conda-recipes/travis.linux.yml
+ params:
+ variant_config_file: variants/linux_c_compilergcccxx_compilergxxpython3.7.yaml
+ artifacts:
+ - arrow-cpp-{version}-py37(h[a-z0-9]+)_0.tar.bz2
+ - pyarrow-{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-{version}-py27(h[a-z0-9]+)_0.tar.bz2
+ - pyarrow-{version}-py27(h[a-z0-9]+)_0.tar.bz2
- conda-linux-py36:
+ conda-linux-toolchain-py36:
platform: linux
template: conda-recipes/travis.linux.yml
params:
- variant_config_file: variants/linux_python3.6.yaml
+ variant_config_file: variants/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6.yaml
artifacts:
- arrow-cpp-{version}-py36(h[a-z0-9]+)_0.tar.bz2
- pyarrow-{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
+ artifacts:
+ - arrow-cpp-{version}-py37(h[a-z0-9]+)_0.tar.bz2
+ - pyarrow-{version}-py37(h[a-z0-9]+)_0.tar.bz2
+
############################## Conda OSX ####################################
- conda-osx-py27:
+ conda-osx-clang-py27:
platform: osx
template: conda-recipes/travis.osx.yml
params:
- variant_config_file: variants/osx_python2.7.yaml
+ variant_config_file: variants/osx_c_compilerclangcxx_compilerclangxxpython2.7.yaml
artifacts:
- arrow-cpp-{version}-py27(h[a-z0-9]+)_0.tar.bz2
- pyarrow-{version}-py27(h[a-z0-9]+)_0.tar.bz2
- conda-osx-py35:
+ 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-{version}-py36(h[a-z0-9]+)_0.tar.bz2
+ - pyarrow-{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_python3.5.yaml
+ variant_config_file: variants/osx_c_compilerclangcxx_compilerclangxxpython3.7.yaml
artifacts:
- - arrow-cpp-{version}-py35(h[a-z0-9]+)_0.tar.bz2
- - pyarrow-{version}-py35(h[a-z0-9]+)_0.tar.bz2
+ - arrow-cpp-{version}-py37(h[a-z0-9]+)_0.tar.bz2
+ - pyarrow-{version}-py37(h[a-z0-9]+)_0.tar.bz2
+
+ conda-osx-toolchain-py27:
+ platform: osx
+ template: conda-recipes/travis.osx.yml
+ params:
+ variant_config_file: variants/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7.yaml
+ artifacts:
+ - arrow-cpp-{version}-py27(h[a-z0-9]+)_0.tar.bz2
+ - pyarrow-{version}-py27(h[a-z0-9]+)_0.tar.bz2
- conda-osx-py36:
+ conda-osx-toolchain-py36:
platform: osx
template: conda-recipes/travis.osx.yml
params:
- variant_config_file: variants/osx_python3.6.yaml
+ variant_config_file: variants/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6.yaml
artifacts:
- arrow-cpp-{version}-py36(h[a-z0-9]+)_0.tar.bz2
- pyarrow-{version}-py36(h[a-z0-9]+)_0.tar.bz2
+ conda-osx-toolchain-py37:
+ platform: osx
+ template: conda-recipes/travis.osx.yml
+ params:
+ variant_config_file: variants/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7.yaml
+ artifacts:
+ - arrow-cpp-{version}-py37(h[a-z0-9]+)_0.tar.bz2
+ - pyarrow-{version}-py37(h[a-z0-9]+)_0.tar.bz2
+
############################## Conda Windows ################################
- conda-win-py35:
+ conda-win-vs2015-py36:
platform: win
template: conda-recipes/appveyor.yml
params:
- variant_config_file: variants\win_c_compilervs2015cxx_compilervs2015python3.5.yaml
+ variant_config_file: variants\win_c_compilervs2015cxx_compilervs2015python3.6.yaml
artifacts:
- - arrow-cpp-{version}-py35_vc14(h[a-z0-9]+)_0.tar.bz2
- - pyarrow-{version}-py35(h[a-z0-9]+)_0.tar.bz2
+ - arrow-cpp-{version}-py36_vc14(h[a-z0-9]+)_0.tar.bz2
+ - pyarrow-{version}-py36(h[a-z0-9]+)_0.tar.bz2
- conda-win-py36:
+ conda-win-vs2015-py37:
platform: win
template: conda-recipes/appveyor.yml
params:
- variant_config_file: variants\win_c_compilervs2015cxx_compilervs2015python3.6.yaml
+ variant_config_file: variants\win_c_compilervs2015cxx_compilervs2015python3.7.yaml
artifacts:
- - arrow-cpp-{version}-py36_vc14(h[a-z0-9]+)_0.tar.bz2
- - pyarrow-{version}-py36(h[a-z0-9]+)_0.tar.bz2
+ - arrow-cpp-{version}-py37_vc14(h[a-z0-9]+)_0.tar.bz2
+ - pyarrow-{version}-py37(h[a-z0-9]+)_0.tar.bz2
############################## Wheel Linux ##################################