From 336b3c32aac569715fea63b0b67fda4e3b282682 Mon Sep 17 00:00:00 2001 From: Filipe Fernandes Date: Wed, 26 Jul 2017 15:01:44 -0300 Subject: [PATCH 1/2] update pinning --- recipe/meta.yaml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a0fad4d2..1c96b5a8 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -8,7 +8,6 @@ package: version: {{ version }} source: - fn: matplotlib-{{ version }}.tar.gz url: https://github.com/matplotlib/matplotlib/archive/v{{ version }}.tar.gz sha256: aebed23921562792b68b8ca355de5abc176af4424f1987e2fa95f65e5c5e7e89 patches: @@ -20,16 +19,18 @@ source: - osx-frame.patch # [osx] build: - number: 0 + number: 1 requirements: build: - python - setuptools - pkg-config # [not win] - - numpy x.x + - numpy 1.7.* # [py27] + - numpy 1.9.* # [py35] + - numpy 1.11.* # [py36] - python-dateutil - - freetype 2.7|2.7.* + - freetype 2.7 - msinttypes # [win] - cycler >=0.10 - nose @@ -37,7 +38,7 @@ requirements: - pytz #- py2cairo # [linux and py2k] - libpng >=1.6.28,<1.7 - - zlib 1.2.* # [win] + - zlib 1.2.8 # [win] - pyqt 5.6.* # [not osx] - tk 8.5.* # [linux] - functools32 # [py2k] @@ -46,10 +47,12 @@ requirements: run: - python - setuptools - - numpy x.x + - numpy >=1.7 # [py27] + - numpy >=1.9 # [py35] + - numpy >=1.11 # [py36] - cycler >=0.10 - python-dateutil - - freetype 2.7|2.7.* + - freetype 2.7 - pytz - pyparsing #- py2cairo # [linux and py2k] From 41a6abb97882f3c55eb5e75a82c90bb80318836e Mon Sep 17 00:00:00 2001 From: Filipe Fernandes Date: Wed, 26 Jul 2017 15:01:48 -0300 Subject: [PATCH 2/2] rerender with auto --- .travis.yml | 12 ++----- appveyor.yml | 66 ---------------------------------- ci_support/run_docker_build.sh | 47 +----------------------- 3 files changed, 4 insertions(+), 121 deletions(-) diff --git a/.travis.yml b/.travis.yml index aab610d1..f3412954 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: "Gxec2n1/iEz3PtkzKYmRC630hCK5hg6qnEtYjBJKkAF97119AlSZZa/8J1bMoVOVifIup2+Gj6NQt3X2Dv+akj874AHJ6oFeyhvgqz6F6fICNr8nLc7g2GYdCMg/j3qx3/eVPSFk9r9LTiOFoB/T0+9n9j5XgdNazLtgvRQOcWq09D6B+2mjl2w+qWEQYJH+DIdIAdQpuPyjhVTUV/F8oUi/KOMruLcUS2VAJ7mGvgF4G+Iu0paAgGa3hbez2wmAqi5BFE2F7UzGVdVaIHwsvUDkZVH1NF+9LgjZX2Vt9FzjdcZZhWi81t/5PyWNL5EL+QTiZA8YghseHUxM81uiT7WklUypHLlB4XjWWR5cCU23joLjQXPWI6YiNn++D5xGDMtNvLFkqGr11RTWvjWYVUudyjW3wcz1HAWOPMZC7AK+2UIaUL8rNBYUd5G7WImd3KatDZNmIcWSW95RCKNafnCtZinJ4/K9yamkMfzPjqn+gu2EIMJN8lp1r8fje6cXZ6w5QXfw1+awUtVFwu503/cSFzQ2Vus6S12Y9pQ9sgo7OW6hKWqnijGRE/UGBayTVXAJeIYV4Z3izHgvGRRKiuIdKmmemEB+HS0vobZE4K2GOhBiVYsAqrthdRFz9YOFSJbaiGAM8EjzTzYFkaT7dQ2PMf5Bwft/1E/fi6iReNc=" diff --git a/appveyor.yml b/appveyor.yml index 4de068d4..e1ed5997 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