diff --git a/.travis.yml b/.travis.yml index 6434647d..2e00ef7f 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: "azJjQJJ3AwRWcueVlo7EyYPB5ls04Vx8IkYVIfLoRc84NJ1aePU2B15gBaHROPx9jrDHcVzfWLKaq+qj19C1kMUViIgxeMJ/+2kst8d2TrPoVy9fiHRWUnim/MNluUhBfnXxyeLxnWbJX4pBJBOpAiU1wi+WO/d88EWxfx2aPhQfiEXuD+j66mGYmOVrZ2mwPDVKFOp+8r9bmT9OE162HKJEepVcWiNi+wR58rp91wV3rA18Ouwzw1AmuQb88l3bdKjN8h2pAbIKOopDTv4pU89hLd3HqPkyAuTF67dSQzliMhZBjpl9C0468GH+rs7/EUUqoZIVMNRpZ4j6clqwDf/GB49bUnUZlbLavkqkbyK4NdLIX2zu9iWWQkpXVj0VZDCyFBsRqjOcElM6nO7NhRfBMVrdUgzVFLID24G58u/qMKORpX6d17t5e9baNRBDhe/3cRokB1et681g8iFKRmVdhJ+wCvbMx6KjEVP6csAV46713PoNGv9GUx4utJyLx/ttlxrGLMFcix6mpZV3kBRfk2prySzuZ3DvVqIRpujiPK+3XvIUPXIfxmsFmf9nxPJ05GQ4FcLBC81wKmbd+icCrPVwGZyUaHqGfNaBM06av/6FcAa+8muMiz8CnLJb3d7rknJKrexXTAYdCPH7mHLHDFUqE6+gfSY222jP1zs=" 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 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e05a6993..31bce696 100755 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -11,7 +11,7 @@ source: sha256: a777e07633d83d546c55706420179551c8e01075b53c497dcf8ae4036766bc66 build: - number: 0 + number: 1 script: python setup.py install --single-version-externally-managed --record=record.txt requirements: @@ -19,10 +19,14 @@ requirements: - python - setuptools - cython - - numpy x.x + - numpy 1.7.* # [py27] + - numpy 1.9.* # [py35] + - numpy 1.11.* # [py36] run: - python - - numpy x.x + - numpy >=1.7 # [py27] + - numpy >=1.9 # [py35] + - numpy >=1.11 # [py36] - python-dateutil - pytz