From 997aaa0e12efaec17b6f1d864af758b24fe94253 Mon Sep 17 00:00:00 2001 From: Filipe Fernandes Date: Mon, 31 Jul 2017 10:54:14 -0300 Subject: [PATCH] sane numpy matrix --- .travis.yml | 12 ++----- appveyor.yml | 66 ---------------------------------- ci_support/run_docker_build.sh | 47 +----------------------- recipe/meta.yaml | 7 ++-- 4 files changed, 7 insertions(+), 125 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6934d1dd..2216c49e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,15 +9,9 @@ osx_image: xcode6.4 env: matrix: - - CONDA_NPY=111 CONDA_PY=27 - - CONDA_NPY=112 CONDA_PY=27 - - CONDA_NPY=113 CONDA_PY=27 - - CONDA_NPY=111 CONDA_PY=35 - - CONDA_NPY=112 CONDA_PY=35 - - CONDA_NPY=113 CONDA_PY=35 - - CONDA_NPY=111 CONDA_PY=36 - - CONDA_NPY=112 CONDA_PY=36 - - CONDA_NPY=113 CONDA_PY=36 + - CONDA_PY=27 + - CONDA_PY=35 + - CONDA_PY=36 global: # The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml. - secure: "Y1f4ZD0cRx4goI3XXl5I8PZnTpvve1/zl8v/uK9EU0smIaphz6lPoUz/RCDOmbYLJcubxLqfW+EE7+dKli/37nAT6AeV9wi//LyUXdyenDUy2N3kT7jo3C/OQmqvG89O9d/8lG0FAiNZRNXMcIBcH3tZWkYKitgPuQD1S/Mky2EIVjGbQkTmRV9kIjq+zI2NMpg8GkToV28mCY+iy3dgU4SYXQDiygvHDUqBqyasyaIU1mQaBjMfKvTXAuC14ZDBSR6UyZ4LyrZE0tlh3DXfgE/0+x1qZJ+0m8yFjrTulDlYh5Jt5jwux2OaqWxuz1qt0qhaOr+stFrNVjPranykkceFXoVLeEewxyBzeSnai/EaDj9BKqwoAeQr5ak9A60u/qCTyOCE5ueeZgfMn2AktlW94oms1r7DxCN96KoWO7EC3b4JhNHEyhjtD+vodtoaQ9FnOOsjXfabO1N9NJIcYvTNBtlW+sCHNMGTHjzH8THASsrgYnnUByi7M/dNX//fpKdpx9+XfgGaI4vNoNHVrhA6gsN6YocHHcDdh5B7ikUEEMRpNO2V/3pAg2fL+RWUQTnAkWiWOHEoBFqQ3b2SNPykSZJ8U+8dv9MdPAdJRA8/wbXCHfstq4ODW//IF3SI9haqqgiknOTPj+mY9utuWQsRL27l36Q7ealT/zeKYd4=" diff --git a/appveyor.yml b/appveyor.yml index d5190da7..cdcc1301 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,92 +10,26 @@ environment: matrix: - TARGET_ARCH: x86 - CONDA_NPY: 111 CONDA_PY: 27 CONDA_INSTALL_LOCN: C:\\Miniconda - TARGET_ARCH: x64 - CONDA_NPY: 111 CONDA_PY: 27 CONDA_INSTALL_LOCN: C:\\Miniconda-x64 - TARGET_ARCH: x86 - CONDA_NPY: 112 - CONDA_PY: 27 - CONDA_INSTALL_LOCN: C:\\Miniconda - - - TARGET_ARCH: x64 - CONDA_NPY: 112 - CONDA_PY: 27 - CONDA_INSTALL_LOCN: C:\\Miniconda-x64 - - - TARGET_ARCH: x86 - CONDA_NPY: 113 - CONDA_PY: 27 - CONDA_INSTALL_LOCN: C:\\Miniconda - - - TARGET_ARCH: x64 - CONDA_NPY: 113 - CONDA_PY: 27 - CONDA_INSTALL_LOCN: C:\\Miniconda-x64 - - - TARGET_ARCH: x86 - CONDA_NPY: 111 - CONDA_PY: 35 - CONDA_INSTALL_LOCN: C:\\Miniconda35 - - - TARGET_ARCH: x64 - CONDA_NPY: 111 - CONDA_PY: 35 - CONDA_INSTALL_LOCN: C:\\Miniconda35-x64 - - - TARGET_ARCH: x86 - CONDA_NPY: 112 CONDA_PY: 35 CONDA_INSTALL_LOCN: C:\\Miniconda35 - TARGET_ARCH: x64 - CONDA_NPY: 112 CONDA_PY: 35 CONDA_INSTALL_LOCN: C:\\Miniconda35-x64 - TARGET_ARCH: x86 - CONDA_NPY: 113 - CONDA_PY: 35 - CONDA_INSTALL_LOCN: C:\\Miniconda35 - - - TARGET_ARCH: x64 - CONDA_NPY: 113 - CONDA_PY: 35 - CONDA_INSTALL_LOCN: C:\\Miniconda35-x64 - - - TARGET_ARCH: x86 - CONDA_NPY: 111 - CONDA_PY: 36 - CONDA_INSTALL_LOCN: C:\\Miniconda36 - - - TARGET_ARCH: x64 - CONDA_NPY: 111 - CONDA_PY: 36 - CONDA_INSTALL_LOCN: C:\\Miniconda36-x64 - - - TARGET_ARCH: x86 - CONDA_NPY: 112 - CONDA_PY: 36 - CONDA_INSTALL_LOCN: C:\\Miniconda36 - - - TARGET_ARCH: x64 - CONDA_NPY: 112 - CONDA_PY: 36 - CONDA_INSTALL_LOCN: C:\\Miniconda36-x64 - - - TARGET_ARCH: x86 - CONDA_NPY: 113 CONDA_PY: 36 CONDA_INSTALL_LOCN: C:\\Miniconda36 - TARGET_ARCH: x64 - CONDA_NPY: 113 CONDA_PY: 36 CONDA_INSTALL_LOCN: C:\\Miniconda36-x64 diff --git a/ci_support/run_docker_build.sh b/ci_support/run_docker_build.sh index 34cb09aa..ef556d8f 100755 --- a/ci_support/run_docker_build.sh +++ b/ci_support/run_docker_build.sh @@ -57,65 +57,20 @@ conda clean --lock conda install --yes --quiet conda-forge-build-setup source run_conda_forge_build_setup -# Embarking on 9 case(s). +# Embarking on 3 case(s). set -x - export CONDA_NPY=111 export CONDA_PY=27 set +x conda build /recipe_root --quiet || exit 1 upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1 set -x - export CONDA_NPY=112 - export CONDA_PY=27 - set +x - conda build /recipe_root --quiet || exit 1 - upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1 - - set -x - export CONDA_NPY=113 - export CONDA_PY=27 - set +x - conda build /recipe_root --quiet || exit 1 - upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1 - - set -x - export CONDA_NPY=111 - export CONDA_PY=35 - set +x - conda build /recipe_root --quiet || exit 1 - upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1 - - set -x - export CONDA_NPY=112 export CONDA_PY=35 set +x conda build /recipe_root --quiet || exit 1 upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1 set -x - export CONDA_NPY=113 - export CONDA_PY=35 - set +x - conda build /recipe_root --quiet || exit 1 - upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1 - - set -x - export CONDA_NPY=111 - export CONDA_PY=36 - set +x - conda build /recipe_root --quiet || exit 1 - upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1 - - set -x - export CONDA_NPY=112 - export CONDA_PY=36 - set +x - conda build /recipe_root --quiet || exit 1 - upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1 - - set -x - export CONDA_NPY=113 export CONDA_PY=36 set +x conda build /recipe_root --quiet || exit 1 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8ff73cd2..f5718aca 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -8,14 +8,13 @@ source: fn: gdal-{{ version }}.tar.gz url: http://download.osgeo.org/gdal/{{ version }}/gdal-{{ version }}.tar.gz sha256: 61837706abfa3e493f3550236efc2c14bd6b24650232f9107db50a944abf8b2f - # Workaround to allow CircleCI to complete. patches: - clang.patch # [osx] - prepend-dll.patch # [win] - install_scripts.patch build: - number: 0 + number: 1 features: - vc9 # [win and py27] - vc10 # [win and py34] @@ -26,14 +25,14 @@ requirements: - python - setuptools - cmake # [win] - - numpy x.x + - numpy 1.8.* - libgdal {{ version }} - vc 9 # [win and py27] - vc 10 # [win and py34] - vc 14 # [win and (py35 and py36)] run: - python - - numpy x.x + - numpy >=1.8 - libgdal {{ version }} - vc 9 # [win and py27] - vc 10 # [win and py34]