Merge pull request #26 from ocefpaf/v4.5.0

V4.5.0

.circleci/config.yml

@@ -0,0 +1,24 @@
+version: 2
+
+jobs:
+  build:
+    working_directory: ~/test
+    machine: true
+    steps:
+      - checkout
+      - run:
+          name: Fast finish outdated PRs and merge PRs
+          command: |
+            ./ci_support/fast_finish_ci_pr_build.sh
+            ./ci_support/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: ./ci_support/run_docker_build.sh
+
+workflows:
+  version: 2
+  build_and_test:
+    jobs:
+      - build

.gitattributes

@@ -1,5 +1,7 @@
 * text=auto
 
+*.patch binary
+*.diff binary
 meta.yaml text eol=lf
 build.sh text eol=lf
 bld.bat text eol=crlf

README.md

@@ -66,6 +66,7 @@ To manage the continuous integration and simplify feedstock maintenance
 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``.
 
+For more information please check the [conda-forge documentation](https://conda-forge.org/docs/).
 
 Terminology
 ===========
@@ -100,4 +101,4 @@ In order to produce a uniquely identifiable distribution:
    the [``build/number``](http://conda.pydata.org/docs/building/meta-yaml.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.
+   back to 0.

appveyor.yml

@@ -9,22 +9,6 @@ environment:
     secure: ipv/06DzgA7pzz2CIAtbPxZSsphDtF+JFyoWRnXkn3O8j7oRe3rzqj3LOoq2DZp4
 
   matrix:
-    - TARGET_ARCH: x86
-      CONDA_PY: 27
-      CONDA_INSTALL_LOCN: C:\\Miniconda
-
-    - TARGET_ARCH: x64
-      CONDA_PY: 27
-      CONDA_INSTALL_LOCN: C:\\Miniconda-x64
-
-    - TARGET_ARCH: x86
-      CONDA_PY: 34
-      CONDA_INSTALL_LOCN: C:\\Miniconda35
-
-    - TARGET_ARCH: x64
-      CONDA_PY: 34
-      CONDA_INSTALL_LOCN: C:\\Miniconda35-x64
-
     - TARGET_ARCH: x86
       CONDA_PY: 35
       CONDA_INSTALL_LOCN: C:\\Miniconda35

ci_support/run_docker_build.sh

@@ -57,9 +57,9 @@ conda clean --lock
 conda install --yes --quiet conda-forge-build-setup
 source run_conda_forge_build_setup
 
-# Embarking on 1 case(s).
-    conda build /recipe_root --quiet || exit 1
-    upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1
+conda build /recipe_root --quiet || exit 1
+upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1
+
 touch /feedstock_root/build_artefacts/conda-forge-build-done
 EOF
 

recipe/back_port_512.patch

@@ -0,0 +1,22 @@
+--- netcdf-c-4.5.0.orig/libdap2/dapcvt.c	2017-10-20 14:20:52.000000000 -0300
++++ netcdf-c-4.5.0/libdap2/dapcvt.c	2017-10-24 11:06:14.777836188 -0300
+@@ -217,7 +217,8 @@
+ #ifdef _MSC_VER
+ 	    _ASSERTE(_CrtCheckMemory());
+ #endif
+-	    if(ival < 0 || ival > NC_MAX_UBYTE) ok = 0;
++	    /* For back compatibility, we allow any value, but force conversion */
++	    ival = (ival & 0xFF);
+ 	    *p = (char)ival;
+ 	    } break;
+ 	case NC_CHAR: {
+@@ -246,7 +247,8 @@
+ 	    unsigned int uval;
+ 	    ok = sscanf(s,"%u%n",&uval,&nread);
+ 	    _ASSERTE(_CrtCheckMemory());
+-	    if(uval > NC_MAX_UBYTE) ok = 0;
++	    /* For back compatibility, we allow any value, but force conversion */
++	    uval = (uval & 0xFF);
+ 	    *p = (unsigned char)uval;
+ #else
+ 	    ok = sscanf(s,"%hhu%n",p,&nread);

recipe/meta.yaml

@@ -1,4 +1,4 @@
-{% set version = "4.4.1.1" %}
+{% set version = "4.5.0" %}
 
 package:
   name: libnetcdf
@@ -7,20 +7,16 @@ package:
 source:
   fn: v{{ version }}.tar.gz
   url: https://github.com/Unidata/netcdf-c/archive/v{{ version }}.tar.gz
-  sha256: 7f040a0542ed3f6d27f3002b074e509614e18d6c515b2005d1537fec01b24909
+  sha256: f7d1cb2a82100b9bf9a1130a50bc5c7baf0de5b5022860ac3e09a0a32f83cf4a
   patches:
-    - dfile.c.patch  # [win]
-    - dim.c.patch  # [win]
-    - semantics.c.patch  # [win]
-    - dap.path  # [win]
+    # https://github.com/Unidata/netcdf-c/pull/512/files
+    - back_port_512.patch
     - CMakeLists.patch  # [win]
 
 build:
-  number: 7
-  skip: True  # [win and py36]
+  number: 0
+  skip: True  # [win and py36 or py27]
   features:
-    - vc9  # [win and py27]
-    - vc10  # [win and py34]
     - vc14  # [win and (py35 or py36)]
 
 requirements:
@@ -29,20 +25,16 @@ requirements:
     - cmake
     - pkg-config  # [not win]
     - msinttypes  # [win]
-    - curl
+    - curl >=7.44.0,<8
     - zlib 1.2.8
     - hdf4
     - hdf5 1.8.18|1.8.18.*
-    - vc 9  # [win and py27]
-    - vc 10  # [win and py34]
     - vc 14  # [win and (py35 or py36)]
   run:
-    - curl
+    - curl >=7.44.0,<8
     - zlib 1.2.8
     - hdf4
     - hdf5 1.8.18|1.8.18.*
-    - vc 9  # [win and py27]
-    - vc 10  # [win and py34]
     - vc 14  # [win and (py35 or py36)]
 
 test: