From ce5ea578ed1d2fff2c22f2f9857601762bc406b5 Mon Sep 17 00:00:00 2001 From: Phil Elson Date: Sun, 5 Jun 2016 16:32:50 +0100 Subject: [PATCH] Made perl a build-time only dependency (for make check). --- .travis.yml | 3 +++ ci_support/run_docker_build.sh | 3 +++ recipe/meta.yaml | 3 +-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 01d2d93..d4df71f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,9 @@ language: objective-c env: + matrix: + + - CONDA_PERL=5.20.3.1 global: # The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml. - secure: "v0mvI/xxHfeEBJmgcfIHLLSpQzD9ZU1Fb5X6s/9po8fszmneoHBFoOPAruya1F/EdERT9Oij0yQsZHu4BxO/0Zk29S7+Zw7hPF/nWJIt/VGuACT8AWGuDQVGqpodnD23tC/oCQNHDxFogLCn7DGp/nm7oQHUDGRDh6X2lN1wC9qmLfcOCbs04TBjaY76yATsV6TMB+Quw4eOYeRNAMLvlwp4+t46eGTwun1V9RviwZd744EpBRXm4aQVb7l+l+7eAFVFvz8VzDnCpsi+uIQ2/BbaPyQjhp4dt2HGp1MLDtfNAGIBKmFNcQ+dloFKdpKFr5C7CLyBNO0bn2T+QlkoFknYODUhBqWBK14U1Ti42x/qjp919xzqbd0BaRU8A7FISApkW0m7YtjmMIkETfiAgFM2Za+tEWEIRrRwg5csBp5OZnioGz3FH96fro2A3SqGrO2NESV1ndNf0KtW1IjcLU2oN/d/NrmeDwiFtiQPHH4AYiD6LK8G7AWnXB8O59YGfNzoO9UnW6nnCFNBkROgRRxUXb83eqAyyTFkkwfKxoZU9TT+IwxMRLu3SKzpF+aBGaisToxxSORzBhYuH83L3Iz54oq6JieI/weIOxXQB+D5UchhcO5x40jX2lW33W785gLjCQDQaNe2pvlV9kRyM6f63paN6rUVG741Jol/hkc=" diff --git a/ci_support/run_docker_build.sh b/ci_support/run_docker_build.sh index 8c527c8..3d68894 100755 --- a/ci_support/run_docker_build.sh +++ b/ci_support/run_docker_build.sh @@ -44,6 +44,9 @@ conda install --yes conda-build conda info # Embarking on 1 case(s). + set -x + export CONDA_PERL=5.20.3.1 + set +x conda build /recipe_root --quiet || exit 1 /feedstock_root/ci_support/upload_or_check_non_existence.py /recipe_root conda-forge --channel=main || exit 1 EOF diff --git a/recipe/meta.yaml b/recipe/meta.yaml index eb50562..da8b379 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -21,13 +21,12 @@ requirements: - jasper - libpng >=1.6.21,<1.7 - libnetcdf 4.4.* - - perl >=5.20 + - perl run: - boost 1.61.* - jasper - libpng >=1.6.21,<1.7 - libnetcdf 4.4.* - - perl >=5.20 test: commands: