Skip to content

Commit

Permalink
Merge pull request #55 from ocefpaf/update_recipe
Browse files Browse the repository at this point in the history
Update recipe
  • Loading branch information
ocefpaf authored Aug 10, 2018
2 parents 6a0d464 + 10238ab commit f488537
Show file tree
Hide file tree
Showing 17 changed files with 100 additions and 19 deletions.
5 changes: 5 additions & 0 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ environment:
- CONFIG: win_c_compilervs2015python3.6
CONDA_INSTALL_LOCN: C:\Miniconda36-x64

- CONFIG: win_c_compilervs2015python3.7
CONDA_INSTALL_LOCN: C:\Miniconda36-x64


# We always use a 64-bit machine, but can build x86 distributions
# with the TARGET_ARCH variable.
Expand Down Expand Up @@ -46,6 +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: run_conda_forge_build_setup
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_python2.7.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ pin_run_as_build:
libnetcdf:
max_pin: x.x
python:
max_pin: x.x
min_pin: x.x
max_pin: x.x
python:
- '2.7'
2 changes: 1 addition & 1 deletion .ci_support/linux_python3.5.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ pin_run_as_build:
libnetcdf:
max_pin: x.x
python:
max_pin: x.x
min_pin: x.x
max_pin: x.x
python:
- '3.5'
2 changes: 1 addition & 1 deletion .ci_support/linux_python3.6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ pin_run_as_build:
libnetcdf:
max_pin: x.x
python:
max_pin: x.x
min_pin: x.x
max_pin: x.x
python:
- '3.6'
18 changes: 18 additions & 0 deletions .ci_support/linux_python3.7.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
c_compiler:
- toolchain_c
hdf5:
- 1.10.2
libnetcdf:
- '4.6'
numpy:
- '1.9'
pin_run_as_build:
hdf5:
max_pin: x.x.x
libnetcdf:
max_pin: x.x
python:
min_pin: x.x
max_pin: x.x
python:
- '3.7'
2 changes: 1 addition & 1 deletion .ci_support/osx_python2.7.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ pin_run_as_build:
libnetcdf:
max_pin: x.x
python:
max_pin: x.x
min_pin: x.x
max_pin: x.x
python:
- '2.7'
2 changes: 1 addition & 1 deletion .ci_support/osx_python3.5.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ pin_run_as_build:
libnetcdf:
max_pin: x.x
python:
max_pin: x.x
min_pin: x.x
max_pin: x.x
python:
- '3.5'
2 changes: 1 addition & 1 deletion .ci_support/osx_python3.6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ pin_run_as_build:
libnetcdf:
max_pin: x.x
python:
max_pin: x.x
min_pin: x.x
max_pin: x.x
python:
- '3.6'
24 changes: 24 additions & 0 deletions .ci_support/osx_python3.7.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
c_compiler:
- toolchain_c
hdf5:
- 1.10.2
libnetcdf:
- '4.6'
macos_machine:
- x86_64-apple-darwin13.4.0
macos_min_version:
- '10.9'
numpy:
- '1.9'
pin_run_as_build:
hdf5:
max_pin: x.x.x
libnetcdf:
max_pin: x.x
python:
min_pin: x.x
max_pin: x.x
python:
- '3.7'
2 changes: 1 addition & 1 deletion .ci_support/win_c_compilervs2008python2.7.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ pin_run_as_build:
libnetcdf:
max_pin: x.x
python:
max_pin: x.x
min_pin: x.x
max_pin: x.x
python:
- '2.7'
zip_keys:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_c_compilervs2015python3.5.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ pin_run_as_build:
libnetcdf:
max_pin: x.x
python:
max_pin: x.x
min_pin: x.x
max_pin: x.x
python:
- '3.5'
zip_keys:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_c_compilervs2015python3.6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ pin_run_as_build:
libnetcdf:
max_pin: x.x
python:
max_pin: x.x
min_pin: x.x
max_pin: x.x
python:
- '3.6'
zip_keys:
Expand Down
21 changes: 21 additions & 0 deletions .ci_support/win_c_compilervs2015python3.7.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
c_compiler:
- vs2015
hdf5:
- 1.10.2
libnetcdf:
- '4.6'
numpy:
- '1.11'
pin_run_as_build:
hdf5:
max_pin: x.x.x
libnetcdf:
max_pin: x.x
python:
min_pin: x.x
max_pin: x.x
python:
- '3.7'
zip_keys:
- - python
- c_compiler
18 changes: 18 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,23 @@ jobs:
- run:
# Run, test and (if we have a BINSTAR_TOKEN) upload the distributions.
command: ./.circleci/run_docker_build.sh
build_linux_python3.7:
working_directory: ~/test
machine: true
environment:
- CONFIG: "linux_python3.7"
steps:
- checkout
- run:
name: Fast finish outdated PRs and merge PRs
command: |
./.circleci/fast_finish_ci_pr_build.sh
./.circleci/checkout_merge_commit.sh
- run:
command: docker pull condaforge/linux-anvil
- run:
# Run, test and (if we have a BINSTAR_TOKEN) upload the distributions.
command: ./.circleci/run_docker_build.sh

workflows:
version: 2
Expand All @@ -60,3 +77,4 @@ workflows:
- build_linux_python2.7
- build_linux_python3.5
- build_linux_python3.6
- build_linux_python3.7
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Checklist
* [ ] Used a fork of the feedstock to propose changes
* [ ] Bumped the build number (if the version is unchanged)
* [ ] Reset the build number to `0` (if the version changed)
* [ ] [Re-rendered]( https://conda-forge.org/docs/conda_smithy.html#how-to-re-render ) with the latest `conda-smithy`
* [ ] [Re-rendered]( https://conda-forge.org/docs/conda_smithy.html#how-to-re-render ) with the latest `conda-smithy` (Use the phrase <code>@<space/>conda-forge-admin, please rerender</code> in a comment in this PR for automated rerendering)
* [ ] Ensured the license file is being packaged.

<!--
Expand Down
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ env:
- CONFIG=osx_python2.7
- CONFIG=osx_python3.5
- CONFIG=osx_python3.6
- CONFIG=osx_python3.7

global:
# The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml.
Expand Down
12 changes: 3 additions & 9 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ source:
sha256: cbb6d58a7182821d6dd52a52042de772c2d342731800b4704323d12233f3ff1a

build:
number: 1
number: 2
entry_points:
- ncinfo = netCDF4.utils:ncinfo
- nc4tonc3 = netCDF4.utils:nc4tonc3
Expand All @@ -25,18 +25,14 @@ requirements:
- cython >=0.19
- cftime
- hdf5
# libnetcdf 4.4.* is the last one to work with Python 2.7 on Windows.
- libnetcdf 4.4.* # [win and py2k]
- libnetcdf # [not (win and py2k)]
- libnetcdf
run:
- python
- setuptools
- {{ pin_compatible('numpy') }}
- cftime
- hdf5
# libnetcdf 4.4.* is the last one to work with Python 2.7 on Windows.
- libnetcdf 4.4.* # [win and py2k]
- libnetcdf # [not (win and py2k)]
- libnetcdf

test:
imports:
Expand All @@ -46,8 +42,6 @@ test:
- ncinfo -h
- nc4tonc3 -h
- nc3tonc4 -h
- conda inspect linkages -p $PREFIX $PKG_NAME # [not win]
- conda inspect objects -p $PREFIX $PKG_NAME # [osx]

about:
home: http://github.com/Unidata/netcdf4-python
Expand Down

0 comments on commit f488537

Please sign in to comment.