[netcdf4-python] 02/06: Merge tag 'upstream/1.2.5'

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository netcdf4-python.

commit e3efe70877bb3a419f32b996c612f7e291a5ad21
Merge: 2092d3a dcdd8a6
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Nov 29 19:12:29 2016 +0100

    Merge tag 'upstream/1.2.5'
    
    Upstream version 1.2.5

 Changelog                                     |    28 +
 MANIFEST.in                                   |     5 +-
 README.md                                     |     5 +-
 README.release                                |    23 +
 appveyor.yml                                  |    11 +-
 conda.recipe/meta.yaml                        |     7 +-
 docs/netCDF4/index.html                       |   644 +-
 netCDF4/_netCDF4.c                            | 39056 ++++++++++++++----------
 netCDF4/_netCDF4.pyx                          |   345 +-
 netcdftime/__init__.py                        |    13 +-
 netcdftime/_datetime.c                        |  6201 ----
 netcdftime/_datetime.pyx                      |   136 -
 netcdftime/_netcdftime.c                      | 35225 +++++++++++++++++++++
 netcdftime/{netcdftime.py => _netcdftime.pyx} |   669 +-
 setup.py                                      |    13 +-
 test/tst_atts.py                              |    10 +-
 test/tst_dap.py                               |    23 +-
 test/tst_masked4.py                           |   108 +
 test/tst_multifile.py                         |     1 +
 test/tst_netcdftime.py                        |   343 +-
 test/tst_vlen.py                              |    43 +
 21 files changed, 60384 insertions(+), 22525 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf4-python.git