ARROW-4270: [Packaging][Conda] Update xcode version and remove toolch…

…ain builds Author: Krisztián Szűcs <[email protected]> Closes apache#3411 from kszucs/cf-clang and squashes the following commits: f1a2efca <Krisztián Szűcs> update variant files 34c2fb9e <Krisztián Szűcs> no need of clobber file 92d0fe2d <Krisztián Szűcs> variant and clobber paths a152b373 <Krisztián Szűcs> update osx build b86c13f5 <Krisztián Szűcs> update channels 113fe013 <Krisztián Szűcs> update xcode for conda osx clang builds and remove conda toolchain entries
milevin · Jan 16, 2019 · 2404c1d · 2404c1d
1 parent eed3215
commit 2404c1d
Show file tree

Hide file tree

Showing 18 changed files with 220 additions and 300 deletions.
diff --git 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
@@ -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
@@ -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
@@ -2,28 +2,48 @@ 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
   - channel_sources
   - 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
@@ -2,28 +2,48 @@ 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
   - channel_sources
   - 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
@@ -2,28 +2,48 @@ 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
   - channel_sources
   - channel_targets
   - docker_image
   - build_number_decrement
+zlib:
+- '1.2'
+zstd:
+- 1.3.3
diff --git a/...conda-recipes/variants/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7.yaml b/...conda-recipes/variants/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7.yaml
diff --git a/...conda-recipes/variants/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6.yaml b/...conda-recipes/variants/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6.yaml
diff --git a/...conda-recipes/variants/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7.yaml b/...conda-recipes/variants/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7.yaml