[gsw] 02/08: Merge tag 'upstream/3.1.1' into debian/master

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository gsw.

commit 3f607803b9f479c2a91a6856b1c791d5a49a6216
Merge: 98e094c f459856
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue May 2 16:53:34 2017 +0100

    Merge tag 'upstream/3.1.1' into debian/master

 CHANGES.txt                               |     10 -
 LICENSE.txt => LICENSE                    |     12 +-
 MANIFEST.in                               |      7 +-
 PKG-INFO                                  |    201 +-
 README.rst                                |    157 +-
 gsw/__init__.py                           |     54 +-
 gsw/_utilities.py                         |    252 +
 gsw/_wrapped_ufuncs.py                    |   4330 +
 gsw/conversions.py                        |     89 +
 gsw/density.py                            |     27 +
 gsw/energy.py                             |     10 +
 gsw/freezing.py                           |     22 +
 gsw/geostrophy.py                         |    269 +
 gsw/gibbs/__init__.py                     |     20 -
 gsw/gibbs/constants.py                    |    171 -
 gsw/gibbs/conversions.py                  |   1545 -
 gsw/gibbs/density_enthalpy_48.py          |   1341 -
 gsw/gibbs/density_enthalpy_48_ct.py       |    107 -
 gsw/gibbs/density_enthalpy_75.py          |    447 -
 gsw/gibbs/density_enthalpy_ct_exact.py    |    758 -
 gsw/gibbs/derivatives.py                  |    608 -
 gsw/gibbs/earth.py                        |    198 -
 gsw/gibbs/freezing.py                     |    525 -
 gsw/gibbs/geostrophic.py                  |     17 -
 gsw/gibbs/geostrophic_48.py               |     42 -
 gsw/gibbs/isobaric.py                     |     57 -
 gsw/gibbs/library.py                      |   1780 -
 gsw/gibbs/neutral_nonlinear_48.py         |     36 -
 gsw/gibbs/practical_salinity.py           |    695 -
 gsw/gibbs/steric.py                       |    125 -
 gsw/gibbs/thermodynamics_from_t.py        |   1709 -
 gsw/gibbs/water_column_48.py              |    326 -
 gsw/ice.py                                |     39 +
 gsw/stability.py                          |    202 +
 gsw/test/__init__.py                      |      1 -
 gsw/test/check_functions.py               |    308 -
 gsw/test/signatures.py                    |    178 -
 gsw/test/test_octave.py                   |    245 -
 gsw/test/test_profiles.py                 |    344 -
 gsw/utilities/__init__.py                 |      3 -
 gsw/utilities/data/gsw_cf.npz             |    Bin 266964 -> 0 bytes
 gsw/utilities/data/gsw_cv_v3_0.npz        |    Bin 285644 -> 0 bytes
 gsw/utilities/data/gsw_data_v3_0.npz      |    Bin 4492826 -> 0 bytes
 gsw/utilities/data/gsw_demo_data_v3_0.npz |    Bin 4456 -> 0 bytes
 gsw/utilities/list_npz.py                 |     27 -
 gsw/utilities/mat2npz.py                  |     51 -
 gsw/utilities/utilities.py                |    405 -
 requirements-dev.txt                      |      6 -
 setup.cfg                                 |      1 -
 setup.py                                  |    141 +-
 src/_ufuncs.c                             |   2751 +
 src/c_gsw/LICENSE                         |     34 +
 src/c_gsw/gsw_internal_const.h            |    499 +
 src/c_gsw/gsw_oceanographic_toolbox.c     |  10704 +++
 src/c_gsw/gsw_saar.c                      |    272 +
 src/c_gsw/gsw_saar_data.c                 | 122859 +++++++++++++++++++++++++++
 src/c_gsw/gswteos-10.h                    |    294 +
 src/method_bodies.c                       |     69 +
 src/method_def_entries.c                  |      3 +
 src2/_ufuncs.c                            |   2751 +
 src2/c_gsw/LICENSE                        |     34 +
 src2/c_gsw/gsw_internal_const.h           |    500 +
 src2/c_gsw/gsw_oceanographic_toolbox.cpp  |  10704 +++
 src2/c_gsw/gsw_saar.cpp                   |    267 +
 src2/c_gsw/gsw_saar_data.c                | 122859 +++++++++++++++++++++++++++
 src2/c_gsw/gswteos-10.h                   |    294 +
 src2/c_gsw/gswteos-10_cpp.h               |    294 +
 src2/method_bodies.c                      |     69 +
 src2/method_def_entries.c                 |      3 +
 69 files changed, 280767 insertions(+), 12391 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gsw.git