diff --git a/.appveyor.yml b/.appveyor.yml index 395b559..5e00e4e 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -30,7 +30,7 @@ platform: install: # If there is a newer build queued for the same PR, cancel this one. - cmd: | - powershell -Command "(New-Object Net.WebClient).DownloadFile('https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/master/recipe/ff_ci_pr_build.py', 'ff_ci_pr_build.py')" + powershell -Command "(New-Object Net.WebClient).DownloadFile('https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/branch2.0/recipe/conda_forge_ci_setup/ff_ci_pr_build.py', 'ff_ci_pr_build.py')" ff_ci_pr_build -v --ci "appveyor" "%APPVEYOR_ACCOUNT_NAME%/%APPVEYOR_PROJECT_SLUG%" "%APPVEYOR_BUILD_NUMBER%" "%APPVEYOR_PULL_REQUEST_NUMBER%" del ff_ci_pr_build.py @@ -49,10 +49,8 @@ install: - cmd: conda.exe config --add channels defaults - cmd: conda.exe config --add channels conda-forge - - cmd: conda.exe config --set channel_alias https://conda-static.anaconda.org - # Configure the VM. - - cmd: conda.exe install -n root --quiet --yes conda-forge-ci-setup=1 + - cmd: conda.exe install -n root --quiet --yes conda-forge-ci-setup=2 - cmd: run_conda_forge_build_setup # Skip .NET project specific build phase. @@ -61,4 +59,4 @@ build: off test_script: - conda.exe build recipe -m .ci_support\%CONFIG%.yaml --quiet deploy_script: - - cmd: upload_or_check_non_existence .\recipe conda-forge --channel=main -m .ci_support\%CONFIG%.yaml + - cmd: upload_package .\ .\recipe .ci_support\%CONFIG%.yaml \ No newline at end of file diff --git a/.ci_support/linux_python2.7.yaml b/.ci_support/linux_python2.7.yaml index 45b0739..edd9f26 100644 --- a/.ci_support/linux_python2.7.yaml +++ b/.ci_support/linux_python2.7.yaml @@ -1,7 +1,13 @@ c_compiler: - toolchain_c +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +docker_image: +- condaforge/linux-anvil hdf5: -- 1.10.2 +- 1.10.3 libnetcdf: - '4.6' numpy: diff --git a/.ci_support/linux_python3.5.yaml b/.ci_support/linux_python3.5.yaml index 016e63c..4d7309a 100644 --- a/.ci_support/linux_python3.5.yaml +++ b/.ci_support/linux_python3.5.yaml @@ -1,7 +1,13 @@ c_compiler: - toolchain_c +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +docker_image: +- condaforge/linux-anvil hdf5: -- 1.10.2 +- 1.10.3 libnetcdf: - '4.6' numpy: diff --git a/.ci_support/linux_python3.6.yaml b/.ci_support/linux_python3.6.yaml index 04002b8..cbe6936 100644 --- a/.ci_support/linux_python3.6.yaml +++ b/.ci_support/linux_python3.6.yaml @@ -1,7 +1,13 @@ c_compiler: - toolchain_c +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +docker_image: +- condaforge/linux-anvil hdf5: -- 1.10.2 +- 1.10.3 libnetcdf: - '4.6' numpy: diff --git a/.ci_support/linux_python3.7.yaml b/.ci_support/linux_python3.7.yaml index f597a6b..efa448d 100644 --- a/.ci_support/linux_python3.7.yaml +++ b/.ci_support/linux_python3.7.yaml @@ -1,7 +1,13 @@ c_compiler: - toolchain_c +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +docker_image: +- condaforge/linux-anvil hdf5: -- 1.10.2 +- 1.10.3 libnetcdf: - '4.6' numpy: diff --git a/.ci_support/osx_python2.7.yaml b/.ci_support/osx_python2.7.yaml index ad6597a..7d81c76 100644 --- a/.ci_support/osx_python2.7.yaml +++ b/.ci_support/osx_python2.7.yaml @@ -2,8 +2,12 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' c_compiler: - toolchain_c +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main hdf5: -- 1.10.2 +- 1.10.3 libnetcdf: - '4.6' macos_machine: diff --git a/.ci_support/osx_python3.5.yaml b/.ci_support/osx_python3.5.yaml index 26d46aa..3e92cda 100644 --- a/.ci_support/osx_python3.5.yaml +++ b/.ci_support/osx_python3.5.yaml @@ -2,8 +2,12 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' c_compiler: - toolchain_c +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main hdf5: -- 1.10.2 +- 1.10.3 libnetcdf: - '4.6' macos_machine: diff --git a/.ci_support/osx_python3.6.yaml b/.ci_support/osx_python3.6.yaml index 699794c..3bd3a57 100644 --- a/.ci_support/osx_python3.6.yaml +++ b/.ci_support/osx_python3.6.yaml @@ -2,8 +2,12 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' c_compiler: - toolchain_c +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main hdf5: -- 1.10.2 +- 1.10.3 libnetcdf: - '4.6' macos_machine: diff --git a/.ci_support/osx_python3.7.yaml b/.ci_support/osx_python3.7.yaml index 32f5181..7005cbd 100644 --- a/.ci_support/osx_python3.7.yaml +++ b/.ci_support/osx_python3.7.yaml @@ -2,8 +2,12 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' c_compiler: - toolchain_c +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main hdf5: -- 1.10.2 +- 1.10.3 libnetcdf: - '4.6' macos_machine: diff --git a/.ci_support/win_c_compilervs2008python2.7.yaml b/.ci_support/win_c_compilervs2008python2.7.yaml index 3ab5a67..4b04d7d 100644 --- a/.ci_support/win_c_compilervs2008python2.7.yaml +++ b/.ci_support/win_c_compilervs2008python2.7.yaml @@ -1,7 +1,11 @@ c_compiler: - vs2008 +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main hdf5: -- 1.10.2 +- 1.10.3 libnetcdf: - '4.6' numpy: diff --git a/.ci_support/win_c_compilervs2015python3.5.yaml b/.ci_support/win_c_compilervs2015python3.5.yaml index 7b2678d..a7fe39c 100644 --- a/.ci_support/win_c_compilervs2015python3.5.yaml +++ b/.ci_support/win_c_compilervs2015python3.5.yaml @@ -1,7 +1,11 @@ c_compiler: - vs2015 +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main hdf5: -- 1.10.2 +- 1.10.3 libnetcdf: - '4.6' numpy: diff --git a/.ci_support/win_c_compilervs2015python3.6.yaml b/.ci_support/win_c_compilervs2015python3.6.yaml index 8f086c6..4a1293c 100644 --- a/.ci_support/win_c_compilervs2015python3.6.yaml +++ b/.ci_support/win_c_compilervs2015python3.6.yaml @@ -1,7 +1,11 @@ c_compiler: - vs2015 +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main hdf5: -- 1.10.2 +- 1.10.3 libnetcdf: - '4.6' numpy: diff --git a/.ci_support/win_c_compilervs2015python3.7.yaml b/.ci_support/win_c_compilervs2015python3.7.yaml index 48135c5..9c67253 100644 --- a/.ci_support/win_c_compilervs2015python3.7.yaml +++ b/.ci_support/win_c_compilervs2015python3.7.yaml @@ -1,7 +1,11 @@ c_compiler: - vs2015 +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main hdf5: -- 1.10.2 +- 1.10.3 libnetcdf: - '4.6' numpy: diff --git a/.circleci/build_steps.sh b/.circleci/build_steps.sh index 1becc90..258a085 100755 --- a/.circleci/build_steps.sh +++ b/.circleci/build_steps.sh @@ -7,27 +7,34 @@ set -xeuo pipefail export PYTHONUNBUFFERED=1 +export FEEDSTOCK_ROOT=/home/conda/feedstock_root +export RECIPE_ROOT=/home/conda/recipe_root +export CI_SUPPORT=/home/conda/feedstock_root/.ci_support +export CONFIG_FILE="${CI_SUPPORT}/${CONFIG}.yaml" cat >~/.condarc <