Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MNT: Re-rendered with conda-smithy 3.1.12 and pinning 2018.09.20 #63

Merged
merged 2 commits into from
Sep 22, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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.
Expand All @@ -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
8 changes: 7 additions & 1 deletion .ci_support/linux_python2.7.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
8 changes: 7 additions & 1 deletion .ci_support/linux_python3.5.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
8 changes: 7 additions & 1 deletion .ci_support/linux_python3.6.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
8 changes: 7 additions & 1 deletion .ci_support/linux_python3.7.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
6 changes: 5 additions & 1 deletion .ci_support/osx_python2.7.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 5 additions & 1 deletion .ci_support/osx_python3.5.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 5 additions & 1 deletion .ci_support/osx_python3.6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 5 additions & 1 deletion .ci_support/osx_python3.7.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 5 additions & 1 deletion .ci_support/win_c_compilervs2008python2.7.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
6 changes: 5 additions & 1 deletion .ci_support/win_c_compilervs2015python3.5.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
6 changes: 5 additions & 1 deletion .ci_support/win_c_compilervs2015python3.6.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
6 changes: 5 additions & 1 deletion .ci_support/win_c_compilervs2015python3.7.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
25 changes: 16 additions & 9 deletions .circleci/build_steps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 <<CONDARC

channels:
- conda-forge
- defaults

conda-build:
root-dir: /home/conda/feedstock_root/build_artifacts

show_channel_urls: true

CONDARC

conda install --yes --quiet conda-forge::conda-forge-ci-setup=2 conda-build

# set up the condarc
setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"

# A lock sometimes occurs with incomplete builds. The lock file is stored in build_artifacts.
conda clean --lock

conda install --yes --quiet conda-forge-ci-setup=1 conda-build
source run_conda_forge_build_setup

conda build /home/conda/recipe_root -m /home/conda/feedstock_root/.ci_support/${CONFIG}.yaml --quiet
upload_or_check_non_existence /home/conda/recipe_root conda-forge --channel=main -m /home/conda/feedstock_root/.ci_support/${CONFIG}.yaml
# make the build number clobber
make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"

conda build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \
--clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" --quiet

upload_package "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"

touch "/home/conda/feedstock_root/build_artifacts/conda-forge-build-done-${CONFIG}"
2 changes: 1 addition & 1 deletion .circleci/fast_finish_ci_pr_build.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash

curl https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/master/recipe/ff_ci_pr_build.py | \
curl https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/branch2.0/recipe/conda_forge_ci_setup/ff_ci_pr_build.py | \
python - -v --ci "circle" "${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}" "${CIRCLE_BUILD_NUM}" "${CIRCLE_PR_NUMBER}"
7 changes: 5 additions & 2 deletions .circleci/run_docker_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
set -xeuo pipefail

FEEDSTOCK_ROOT=$(cd "$(dirname "$0")/.."; pwd;)
RECIPE_ROOT=$FEEDSTOCK_ROOT/recipe
RECIPE_ROOT="${FEEDSTOCK_ROOT}/recipe"

docker info

Expand All @@ -29,6 +29,9 @@ if [ -z "$CONFIG" ]; then
exit 1
fi

pip install shyaml
DOCKER_IMAGE=$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 condaforge/linux-anvil )

mkdir -p "$ARTIFACTS"
DONE_CANARY="$ARTIFACTS/conda-forge-build-done-${CONFIG}"
rm -f "$DONE_CANARY"
Expand All @@ -39,7 +42,7 @@ docker run -it \
-e CONFIG \
-e BINSTAR_TOKEN \
-e HOST_USER_ID \
condaforge/linux-anvil \
$DOCKER_IMAGE \
bash \
/home/conda/feedstock_root/.circleci/build_steps.sh

Expand Down
22 changes: 13 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ env:
before_install:
# Fast finish the PR.
- |
(curl https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/master/recipe/ff_ci_pr_build.py | \
(curl https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/branch2.0/recipe/conda_forge_ci_setup/ff_ci_pr_build.py | \
python - -v --ci "travis" "${TRAVIS_REPO_SLUG}" "${TRAVIS_BUILD_NUMBER}" "${TRAVIS_PULL_REQUEST}") || exit 1

# Remove homebrew.
Expand Down Expand Up @@ -49,14 +49,18 @@ install:
echo ""
echo "Configuring conda."
source /Users/travis/miniconda3/bin/activate root
conda config --remove channels defaults
conda config --add channels defaults
conda config --add channels conda-forge
conda config --set show_channel_urls true
conda install --yes --quiet conda-forge-ci-setup=1

conda install --yes --quiet conda-forge::conda-forge-ci-setup=2
setup_conda_rc ./ ./recipe ./.ci_support/${CONFIG}.yaml

source run_conda_forge_build_setup

script:
- conda build ./recipe -m ./.ci_support/${CONFIG}.yaml
# compiler cleanup
- |
mangle_compiler ./ ./recipe ./.ci_support/${CONFIG}.yaml

- upload_or_check_non_existence ./recipe conda-forge --channel=main -m ./.ci_support/${CONFIG}.yaml
script:
# generate the build number clobber
- make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml
- conda build ./recipe -m ./.ci_support/${CONFIG}.yaml --clobber-file ./.ci_support/clobber_${CONFIG}.yaml
- upload_package ./ ./recipe ./.ci_support/${CONFIG}.yaml
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,13 @@ for each of the installable packages. Such a repository is known as a *feedstock
A feedstock is made up of a conda recipe (the instructions on what and how to build
the package) and the necessary configurations for automatic building using freely
available continuous integration services. Thanks to the awesome service provided by
[CircleCI](https://circleci.com/), [AppVeyor](http://www.appveyor.com/)
[CircleCI](https://circleci.com/), [AppVeyor](https://www.appveyor.com/)
and [TravisCI](https://travis-ci.org/) it is possible to build and upload installable
packages to the [conda-forge](https://anaconda.org/conda-forge)
[Anaconda-Cloud](http://docs.anaconda.org/) channel for Linux, Windows and OSX respectively.
[Anaconda-Cloud](https://anaconda.org/) channel for Linux, Windows and OSX respectively.

To manage the continuous integration and simplify feedstock maintenance
[conda-smithy](http://github.com/conda-forge/conda-smithy) has been developed.
[conda-smithy](https://github.com/conda-forge/conda-smithy) has been developed.
Using the ``conda-forge.yml`` within this repository, it is possible to re-render all of
this feedstock's supporting files (e.g. the CI configuration files) with ``conda smithy rerender``.

Expand Down Expand Up @@ -100,7 +100,7 @@ build distinct package versions.

In order to produce a uniquely identifiable distribution:
* If the version of a package **is not** being increased, please add or increase
the [``build/number``](http://conda.pydata.org/docs/building/meta-yaml.html#build-number-and-string).
the [``build/number``](https://conda.io/docs/user-guide/tasks/build-packages/define-metadata.html#build-number-and-string).
* If the version of a package **is** being increased, please remember to return
the [``build/number``](http://conda.pydata.org/docs/building/meta-yaml.html#build-number-and-string)
back to 0.
the [``build/number``](https://conda.io/docs/user-guide/tasks/build-packages/define-metadata.html#build-number-and-string)
back to 0.
1 change: 1 addition & 0 deletions conda-forge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ travis:
appveyor:
secure:
BINSTAR_TOKEN: tumuXLL8PU75WMnRDemRy02ruEq2RpNxeK3dz0MjFssnosPm2v4EFjfNB4PTotA1
max_py_ver: '37'
4 changes: 2 additions & 2 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ package:
version: {{ version }}

source:
url: https://github.com/Unidata/netcdf4-python/archive/v{{ version }}rel.tar.gz
sha256: f6f2fc2dd80f72b5750290e8c09789bfa598cc4d1eed24c43009950624ead0b2
url: https://pypi.io/packages/source/n/netCDF4/netCDF4-{{version}}.tar.gz
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The main reason for using github instead of PyPI is b/c now upstream is waiting for the wheels to build before publish the source dist on PyPI, that delays the conda-forge package quite a bit sometimes.

sha256: d4fc65b98e348c39d082ab6b4b7f6d636b1b4e63bec016e5bca189fee5d46403

build:
number: 0
Expand Down