[gsw] 02/02: Include 3.0.3-2
Alastair McKinstry
mckinstry at moszumanska.debian.org
Thu Jul 9 13:21:26 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository gsw.
commit 3c3c066cd95941a17fbe562b2c8c83af932f673a
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Thu Jul 9 14:14:04 2015 +0100
Include 3.0.3-2
---
debian/changelog | 63 +++++++
debian/compat | 1 +
debian/control | 40 +++++
debian/copyright | 27 +++
debian/gsw.docs | 1 +
debian/patches/python3.patch | 311 +++++++++++++++++++++++++++++++++
debian/patches/remove-setuptools.patch | 27 +++
debian/patches/series | 2 +
debian/python-gsw.preinst | 11 ++
debian/rules | 23 +++
debian/source/format | 1 +
debian/source/options | 1 +
debian/watch | 3 +
gsw.egg-info/PKG-INFO | 154 ----------------
gsw.egg-info/SOURCES.txt | 47 -----
gsw.egg-info/dependency_links.txt | 1 -
gsw.egg-info/requires.txt | 2 -
gsw.egg-info/top_level.txt | 4 -
18 files changed, 511 insertions(+), 208 deletions(-)
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..1f5a087
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,63 @@
+gsw (3.0.3-2) unstable; urgency=medium
+
+ * Move to Standards-VersioN: 3.9.6
+ * Add new redirect-based watch file.
+ * Add Vcs-Git: debian-science to debian/control
+ * Add dh-python to build-depends
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sun, 21 Jun 2015 14:56:37 +0100
+
+gsw (3.0.3-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Move to Standards-Version: 3.9.5
+ * Use 'xz' compression.
+ * Update python3.patch.
+ * Now need python3-setuptools.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Wed, 30 Apr 2014 21:49:49 +0100
+
+gsw (3.0.2-2) unstable; urgency=low
+
+ * Need to B-D on python-numpy, python3-numpy. Closes: #718136.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sun, 28 Jul 2013 18:05:08 +0100
+
+gsw (3.0.2-1) unstable; urgency=low
+
+ * New upstream release.
+ * Move to DH 9.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 18 Jul 2013 07:26:49 +0100
+
+gsw (3.0.1-3) unstable; urgency=low
+
+ * Setuptools/distuils causes dpkg to break on upgrade;
+ - patch to remove setuptools from setup.py
+ - Delete a symlink in python-gsw.preinst to allow upgrades.
+ Closes: #709959.
+ * Add X-Python-Version, X-Python3-Version to debian/control.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Wed, 29 May 2013 13:39:32 +0100
+
+
+gsw (3.0.1-2) unstable; urgency=low
+
+ [ Scott Kitterman ]
+ * Add python3-gsw package and adjust debian/rules to actually build for
+ both python and python3 as intended. Closes: #709381.
+ * Change from arch any to arch all since there is no arch specific content
+ * Drop unneeded python:Provides
+ * Add missing depends on python-numpy
+ * Update dh_auto_clean override so gsw will build twice in a row
+
+ [ Alastair McKinstry ]
+ * Add watch file from Bart Martens.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Thu, 23 May 2013 08:07:51 -0400
+
+gsw (3.0.1-1) unstable; urgency=low
+
+ * Initial release. (Closes: #696238)
+
+ -- Alastair McKinstry <mckinstry at debian.org> Mon, 17 Dec 2012 19:12:21 +0000
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..45932e5
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,40 @@
+Source: gsw
+Section: python
+Priority: extra
+Maintainer: Alastair McKinstry <mckinstry at debian.org>
+Build-Depends: debhelper (>= 9), dh-python,
+ python-all, python3-all, python-numpy, python3-numpy, python-setuptools, python3-setuptools
+Standards-Version: 3.9.6
+X-Python-Version: >= 2.7
+X-Python3-Version: >= 3.3
+Homepage: http://pypi.python.org/pypi/gsw/
+Vcs-Git: git://git.debian.org/git/debian-science/packages/gsw.git
+
+Package: python-gsw
+Architecture: all
+Depends: ${misc:Depends}, ${python:Depends}, python-numpy
+Description: Python implementation of the Thermodynamic Equation of Seawater
+ This package implements the TEOS-10 Equation of State for seawater.
+ TEOS-10 is based on a Gibbs function formulation from which all
+ thermodynamic properties of seawater (density, enthalpy, entropy sound speed,
+ etc.) can be derived in a thermodynamically consistent manner.
+ TEOS-10 was adopted by the Intergovernmental Oceanographic Commission at its
+ 25th Assembly in June 2009 to replace EOS-80 as the official description of
+ seawater and ice properties in marine science.
+ .
+ For further information, see http://www.teos-10.org/
+
+Package: python3-gsw
+Architecture: all
+Depends: ${misc:Depends}, ${python3:Depends}, python3-numpy
+Description: Python 3 implementation of the Thermodynamic Equation of Seawater
+ This package implements the TEOS-10 Equation of State for seawater.
+ TEOS-10 is based on a Gibbs function formulation from which all
+ thermodynamic properties of seawater (density, enthalpy, entropy sound speed,
+ etc.) can be derived in a thermodynamically consistent manner.
+ TEOS-10 was adopted by the Intergovernmental Oceanographic Commission at its
+ 25th Assembly in June 2009 to replace EOS-80 as the official description of
+ seawater and ice properties in marine science.
+ .
+ For further information, see http://www.teos-10.org/
+
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..58e9266
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,27 @@
+Copyright 2012 Filipe Fernandez <ocefpaf at gmail.com>
+
+AUTHORS:
+Filipe Fernandes
+Eric Firing
+Ådlandsvik Bjørn
+
+
+Copyright Notice and Statement for the gsw project:
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/debian/gsw.docs b/debian/gsw.docs
new file mode 100644
index 0000000..a1320b1
--- /dev/null
+++ b/debian/gsw.docs
@@ -0,0 +1 @@
+README.rst
diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
new file mode 100644
index 0000000..f5a0f25
--- /dev/null
+++ b/debian/patches/python3.patch
@@ -0,0 +1,311 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Python3 support. Code is python2,3 neutral.
+Last-Updated: 2014-04-30
+Forwarded: no
+
+Index: gsw-3.0.3/gsw/gibbs/library.py
+===================================================================
+--- gsw-3.0.3.orig/gsw/gibbs/library.py 2014-04-16 16:44:47.716967955 +0100
++++ gsw-3.0.3/gsw/gibbs/library.py 2014-04-25 14:15:48.702418882 +0100
+@@ -143,7 +143,7 @@
+ p, lon, lat = np.broadcast_arrays(p, lon, lat)
+ if p.ndim > 1:
+ shape_in = p.shape
+- p, lon, lat = map(np.ravel, (p, lon, lat))
++ p, lon, lat = list(map(np.ravel, (p, lon, lat)))
+ reshaped = True
+ else:
+ reshaped = False
+@@ -432,7 +432,7 @@
+ input_mask = input_mask | lon.mask
+ if np.ma.is_masked(lat):
+ input_mask = input_mask | lat.mask
+- SP, lon, lat = map(np.atleast_1d, (SP, lon, lat))
++ SP, lon, lat = list(map(np.atleast_1d, (SP, lon, lat)))
+ SP, lon, lat = np.broadcast_arrays(SP, lon, lat)
+ inds_baltic = in_Baltic(lon, lat)
+ #SA_baltic = np.ma.masked_all(SP.shape, dtype=np.float)
+@@ -488,7 +488,7 @@
+ Modifications:
+ 2010-07-23. David Jackett, Trevor McDougall & Paul Barker
+ """
+- SA, lon, lat = map(np.ma.masked_invalid, (SA, lon, lat))
++ SA, lon, lat = list(map(np.ma.masked_invalid, (SA, lon, lat)))
+ lon, lat, SA = np.broadcast_arrays(lon, lat, SA)
+ inds_baltic = in_Baltic(lon, lat)
+ if not inds_baltic.sum():
+@@ -543,7 +543,7 @@
+ Modifications:
+ 2010-07-23. David Jackett, Trevor McDougall & Paul Barker
+ """
+- SA, lon, lat = map(np.ma.masked_invalid, (SA, lon, lat))
++ SA, lon, lat = list(map(np.ma.masked_invalid, (SA, lon, lat)))
+ lon, lat, SA = np.broadcast_arrays(lon, lat, SA)
+ xb1, xb2, xb3 = 12.6, 7., 26.
+ xb1a, xb3a = 45., 26.
+Index: gsw-3.0.3/gsw/gibbs/practical_salinity.py
+===================================================================
+--- gsw-3.0.3.orig/gsw/gibbs/practical_salinity.py 2014-04-16 16:44:47.716967955 +0100
++++ gsw-3.0.3/gsw/gibbs/practical_salinity.py 2014-04-30 21:33:54.525516302 +0100
+@@ -51,7 +51,7 @@
+ 6.797409608973845e-7, 3.345074990451475e-10, 8.285687652694768e-13)
+ k = 0.0162
+
+-a, b, c, d, e, P, q, r, u, k = map(np.asarray, (a, b, c, d, e, P, q, r, u, k))
++a, b, c, d, e, P, q, r, u, k = list(map(np.asarray, (a, b, c, d, e, P, q, r, u, k)))
+
+
+ def C_from_SP(SP, t, p):
+Index: gsw-3.0.3/gsw/gibbs/conversions.py
+===================================================================
+--- gsw-3.0.3.orig/gsw/gibbs/conversions.py 2014-04-16 16:44:47.716967955 +0100
++++ gsw-3.0.3/gsw/gibbs/conversions.py 2014-04-25 14:14:23.523891133 +0100
+@@ -74,11 +74,11 @@
+ # needed, it should not just be for the "from_SP" functions.
+ if False:
+ if ((p < -1.5) | (p > 12000)).any():
+- raise(Exception, 'Sstar_from_SP: pressure is out of range')
++ raise Exception('Sstar_from_SP: pressure is out of range')
+ if ((lon < 0) | (lon > 360)).any():
+- raise(Exception, 'Sstar_from_SP: longitude is out of range')
++ raise Exception('Sstar_from_SP: longitude is out of range')
+ if (np.abs(lat) > 90).any():
+- raise(Exception, 'Sstar_from_SP: latitude is out of range')
++ raise Exception('Sstar_from_SP: latitude is out of range')
+
+ SP = np.maximum(SP, 0) # Works on masked array also.
+
+Index: gsw-3.0.3/gsw/test/check_functions.py
+===================================================================
+--- gsw-3.0.3.orig/gsw/test/check_functions.py 2014-04-16 16:44:27.000000000 +0100
++++ gsw-3.0.3/gsw/test/check_functions.py 2014-04-25 14:23:33.914081079 +0100
+@@ -1,3 +1,6 @@
++# -*- coding: utf-8 -*-
++
++from __future__ import division
+ import os
+ import sys
+ import logging
+@@ -161,17 +164,17 @@
+ isinstance(f.exception, exc)]
+ ex_dict[exc] = elist
+
+-print "\n%s tests were translated from gsw_check_functions.m" % len(checks)
+-print "\n%s tests ran with no error and with correct output" % len(passes)
+-print "\n%s tests had an output mismatch:" % len(failures)
+-print " ", "\n ".join(failures)
++print("\n%s tests were translated from gsw_check_functions.m" % len(checks))
++print("\n%s tests ran with no error and with correct output" % len(passes))
++print("\n%s tests had an output mismatch:" % len(failures))
++print(" ", "\n ".join(failures))
+
+-print "\n%s exceptions were raised as follows:" % len(run_problems)
++print("\n%s exceptions were raised as follows:" % len(run_problems))
+ for exc in etypes:
+- print " ", exc.__name__
++ print(" ", exc.__name__)
+ strings = [" %s : %s" % e for e in ex_dict[exc]]
+- print "\n".join(strings)
+- print ""
++ print("\n".join(strings))
++ print("")
+
+ checkbunch = Bunch([(c.name, c) for c in checks])
+
+Index: gsw-3.0.3/gsw/test/signatures.py
+===================================================================
+--- gsw-3.0.3.orig/gsw/test/signatures.py 2014-04-16 16:44:27.000000000 +0100
++++ gsw-3.0.3/gsw/test/signatures.py 2014-04-25 14:25:16.433941753 +0100
+@@ -161,8 +161,8 @@
+
+ def help_chunk(helptuple, sect):
+ lines, secdict = helptuple
+- sections = secdict.keys()
+- ind = secdict.values()
++ sections = list(secdict.keys())
++ ind = list(secdict.values())
+ try:
+ i0 = sections.index(sect)
+ except ValueError:
+Index: gsw-3.0.3/gsw/test/test_octave.py
+===================================================================
+--- gsw-3.0.3.orig/gsw/test/test_octave.py 2014-04-16 16:44:27.000000000 +0100
++++ gsw-3.0.3/gsw/test/test_octave.py 2014-04-25 14:28:18.259883380 +0100
+@@ -188,12 +188,18 @@
+ # absolute_salinity_sstar_ct.py
+ 'SA_from_SP': (gsw.SA_from_SP, ('SP', 'p', 'lon', 'lat'))})
+
++def iteritems(d):
++ 'Factor-out Py2-to-3 differences in dictionary item iterator methods'
++ try:
++ return d.iteritems()
++ except AttributeError:
++ return d.items()
+
+ if __name__ == '__main__':
+ outcomes = ['passed', 'no_octave', 'no_python', 'failed', 'no_comparison']
+ results = dict([(k, list()) for k in outcomes])
+
+- for name, (function, args) in library.iteritems():
++ for name, (function, args) in iteritems(library):
+ ret = compare_results(name=name, function=function, args=args)
+ results[ret].append(name)
+
+Index: gsw-3.0.3/gsw/test/test_tuples.py
+===================================================================
+--- gsw-3.0.3.orig/gsw/test/test_tuples.py 2014-04-16 16:44:27.000000000 +0100
++++ gsw-3.0.3/gsw/test/test_tuples.py 2014-04-30 21:38:30.534673085 +0100
+@@ -2,6 +2,8 @@
+
+ """Unit check for standard profiles for the Gibbs Sea Water python package."""
+
++from __future__ import division
++
+ import os
+ import sys
+ import unittest
+@@ -58,7 +60,7 @@
+ maxdiff = np.nanmax(abs(out - getattr(cv, func)))
+ try:
+ self.assertTrue(maxdiff < getattr(cv, func + '_ca'))
+- except AssertionError, e:
++ except AssertionError as e:
+ raise AssertionError("Error in %s %s" % (func, e.args))
+
+
+@@ -95,5 +97,5 @@
+ (gsw_cv.CT_pt - gsw_cf.CT_pt) >=
+ gsw_cv.CT_pt_ca)
+ if gsw_cf.ICT_first_deriv:
+- print(2, 'gsw_CT_first_derivatives: Failed\n')
++ print((2, 'gsw_CT_first_derivatives: Failed\n'))
+ gsw_cf.gsw_chks = 0
+Index: gsw-3.0.3/gsw/utilities/list_npz.py
+===================================================================
+--- gsw-3.0.3.orig/gsw/utilities/list_npz.py 2014-04-16 16:44:27.000000000 +0100
++++ gsw-3.0.3/gsw/utilities/list_npz.py 2014-04-30 21:39:25.946920917 +0100
+@@ -4,14 +4,14 @@
+
+ The filename is the sole command-line argument.
+ """
+-
++from __future__ import division
+ import sys
+ import numpy as np
+
+ fname = sys.argv[1]
+
+ dat = np.load(fname)
+-keys = dat.keys()
++keys = list(dat.keys())
+ keys.sort()
+ klens = [len(str(k)) for k in keys]
+ klen = max(klens)
+@@ -21,6 +21,6 @@
+ slist = [str_fmt.format(k, dat[k].dtype, dat[k].shape, klen=klen)
+ for k in keys]
+
+-print ''.join(slist)
++print (''.join(slist))
+
+
+Index: gsw-3.0.3/gsw/utilities/mat2npz.py
+===================================================================
+--- gsw-3.0.3.orig/gsw/utilities/mat2npz.py 2014-04-16 16:44:27.000000000 +0100
++++ gsw-3.0.3/gsw/utilities/mat2npz.py 2014-04-30 21:41:56.606470519 +0100
+@@ -12,7 +12,7 @@
+ #
+ # obs:
+ #
+-
++from __future__ import division
+ import numpy as np
+
+ from gsw.utilities import loadmatbunch
+Index: gsw-3.0.3/gsw/utilities/utilities.py
+===================================================================
+--- gsw-3.0.3.orig/gsw/utilities/utilities.py 2014-04-16 16:44:27.000000000 +0100
++++ gsw-3.0.3/gsw/utilities/utilities.py 2014-04-30 21:49:14.660050352 +0100
+@@ -69,11 +69,11 @@
+ """
+ if fmt is None:
+ fmt = self.str_fmt
+- klens = [len(str(k)) for k in self.keys()]
+- vlens = [len(str(v)) for v in self.values()]
++ klens = [len(str(k)) for k in list(self.keys())]
++ vlens = [len(str(v)) for v in list(self.values())]
+ klen = min(20, max(klens))
+ vlen = min(40, max(vlens))
+- items = self.items()
++ items = list(self.items())
+ items.sort()
+ slist = [fmt.format(k, v, klen=klen, vlen=vlen) for k, v in items]
+ return ''.join(slist)
+@@ -94,7 +94,7 @@
+ newkw.update(d)
+ newkw.update(kw)
+ self._check_strict(strict, newkw)
+- dsub = dict([(k, v) for (k, v) in newkw.items() if k in self])
++ dsub = dict([(k, v) for (k, v) in list(newkw.items()) if k in self])
+ self.update(dsub)
+
+ def update_None(self, *args, **kw):
+@@ -108,7 +108,7 @@
+ newkw.update(d)
+ newkw.update(kw)
+ self._check_strict(strict, newkw)
+- dsub = dict([(k, v) for (k, v) in newkw.items() if k in self and
++ dsub = dict([(k, v) for (k, v) in list(newkw.items()) if k in self and
+ self[k] is None])
+ self.update(dsub)
+
+@@ -118,7 +118,7 @@
+ if bad:
+ bk = list(bad)
+ bk.sort()
+- ek = self.keys()
++ ek = list(self.keys())
+ ek.sort()
+ raise KeyError(
+ "Update keys %s don't match existing keys %s" % (bk, ek))
+@@ -145,6 +145,13 @@
+ _npz_cache = Cache_npz()
+
+
++def iteritems(d):
++ 'Factor-out Py2-to-3 differences in dictionary item iterator methods'
++ try:
++ return d.iteritems()
++ except AttributeError:
++ return d.items()
++
+ def repair_npzfile_with_objects(infile, outfile):
+ """
+ Read an npz file written based on scipy.io.loadmat,
+@@ -158,7 +165,7 @@
+ """
+ dat = np.load(infile)
+ out = dict()
+- for k, v in dat.iteritems():
++ for k, v in iteritems(dat):
+ if v.dtype.kind == 'O':
+ v = v.item()
+ out[k] = v
+@@ -276,6 +283,8 @@
+ except UnicodeEncodeError:
+ dt = arr.dtype.newbyteorder('S')
+ return unicode(arr.view(dt))
++ except NameError:
++ return str(arr)
+
+
+ def crunch(arr, masked=True):
+@@ -326,7 +335,7 @@
+ out = Bunch()
+ fobj = open(fname, 'rb')
+ xx = loadmat(fobj)
+- keys = [k for k in xx.keys() if not k.startswith("__")]
++ keys = [k for k in list(xx.keys()) if not k.startswith("__")]
+ for k in keys:
+ out[k] = structured_to_bunch(xx[k], masked=masked)
+ fobj.close()
diff --git a/debian/patches/remove-setuptools.patch b/debian/patches/remove-setuptools.patch
new file mode 100644
index 0000000..39ad967
--- /dev/null
+++ b/debian/patches/remove-setuptools.patch
@@ -0,0 +1,27 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Bug-Origin: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=709959
+Description: Ensure setuptools are not used, only distutils.
+Forwarded: not-needed
+Last-Updated: 2013-05-29
+
+Index: gsw-3.0.1/setup.py
+===================================================================
+--- gsw-3.0.1.orig/setup.py 2013-05-23 13:18:18.000000000 +0100
++++ gsw-3.0.1/setup.py 2013-05-29 13:39:15.000000000 +0100
+@@ -4,14 +4,9 @@
+ import os
+ import codecs
+
+-try:
+- from setuptools import setup
+- from setuptools.command.sdist import sdist
+-except ImportError:
+- from distutils.core import setup
+- from distutils.command.sdist import sdist
++from distutils.core import setup
++from distutils.command.sdist import sdist
+
+-# TODO: find setuptools equivalent.
+ try: # Python 3
+ from distutils.command.build_py import build_py_2to3 as build_py
+ except ImportError: # Python 2
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d071b99
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+# remove-setuptools.patch
+python3.patch
diff --git a/debian/python-gsw.preinst b/debian/python-gsw.preinst
new file mode 100644
index 0000000..415049e
--- /dev/null
+++ b/debian/python-gsw.preinst
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+# See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=709959
+[ -h /usr/lib/python2.7/dist-packages/gsw-3.0.1.egg-info ] && rm /usr/lib/python2.7/dist-packages/gsw-3.0.1.egg-info
+
+#DEBHELPER#
+
+exit 0
+
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..ba83f4c
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,23 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+# export DH_VERBOSE=1
+
+# magic debhelper rule
+%:
+ dh $@ --with python2,python3
+
+override_dh_auto_install:
+ set -e && for pyvers in $(shell pyversions -sv); do \
+ python$$pyvers setup.py install --install-layout=deb \
+ --root $(CURDIR)/debian/python-gsw; \
+ done
+ set -e && for py3vers in $(shell py3versions -sv); do \
+ python$$py3vers setup.py install --install-layout=deb \
+ --root $(CURDIR)/debian/python3-gsw; \
+ done
+
+override_dh_auto_clean:
+ dh_auto_clean
+ rm -fr gsw.egg-info
+ rm -fr build
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/source/options b/debian/source/options
new file mode 100644
index 0000000..b7bc1f2
--- /dev/null
+++ b/debian/source/options
@@ -0,0 +1 @@
+compression = "xz"
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..fd7e726
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=3
+opts=uversionmangle=s/(rc|a|b|c)/~$1/ \
+http://pypi.debian.net/gsw/gsw-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
diff --git a/gsw.egg-info/PKG-INFO b/gsw.egg-info/PKG-INFO
deleted file mode 100644
index f2e2952..0000000
--- a/gsw.egg-info/PKG-INFO
+++ /dev/null
@@ -1,154 +0,0 @@
-Metadata-Version: 1.1
-Name: gsw
-Version: 3.0.3
-Summary: Gibbs SeaWater Oceanographic Package of TEOS-10
-Home-page: http://pypi.python.org/pypi/seawater/
-Author: Filipe Fernandes
-Author-email: ocefpaf at gmail.com
-License: Copyright Notice and Statement for the gsw project:
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-Download-URL: https://pypi.python.org/pypi/gsw/
-Description: This python module is incomplete and should be used with caution.
- =================================================================
-
- python gsw
- ==========
-
- | |Build|
- | |Build|
- | |Downloads|
-
- Python implementation of the Thermodynamic Equation Of Seawater - 2010 (TEOS-10)[http://www.teos-10.org/\ ]
- -----------------------------------------------------------------------------------------------------------
-
- gsw vs. csiro
- -------------
-
- This table shows some function names in the gibbs library and the
- corresponding function names in the csiro library.
-
- +-----------------------------------------------------------+----------------------------------------------------+--------------------------------------------------------------+
- | **Variable** | **SeaWater (EOS 80)** | **Gibbs SeaWater (GSW TEOS 10)** |
- +===========================================================+====================================================+==============================================================+
- | Absolute Salinity | NA | gsw.SA\_from\_SP(SP,p,long,lat) |
- +-----------------------------------------------------------+----------------------------------------------------+--------------------------------------------------------------+
- | Conservative Temperature | NA | gsw.CT\_from\_t(SA,t,p) |
- +-----------------------------------------------------------+----------------------------------------------------+--------------------------------------------------------------+
- | density (i.e. in situ density) | sw.dens(SP,t,p) | gsw.rho\_CT(SA,CT,p), or gsw.rho(SA,t,p) |
- +-----------------------------------------------------------+----------------------------------------------------+--------------------------------------------------------------+
- | potential density | sw.pden(SP,t,p,pr) | gsw.rho\_CT(SA,CT,pr) |
- +-----------------------------------------------------------+----------------------------------------------------+--------------------------------------------------------------+
- | potential temperature | sw.ptmp(SP,t,p,pr) | gsw.pt\_from\_t(SA,t,p,pr) |
- +-----------------------------------------------------------+----------------------------------------------------+--------------------------------------------------------------+
- | $\\sigma\_0$, using $\\theta\_o$ = sw.ptmp(SP,t,p,0) | sw.dens(SP, $\\theta\_o$, 0) -1000 kg m$^{-3}$ | gsw.sigma0\_CT(SA,CT) |
- +-----------------------------------------------------------+----------------------------------------------------+--------------------------------------------------------------+
- | $\\sigma\_2$, using $\\theta\_2$ = sw.ptmp(SP,t,p,2000) | sw.dens(SP,$\\theta\_2$, 2000) -1000 kg m$^{-3}$ | gsw.sigma2\_CT(SA,CT) |
- +-----------------------------------------------------------+----------------------------------------------------+--------------------------------------------------------------+
- | $\\sigma\_4$, using $\\theta\_4$ = sw.ptmp(SP,t,p,2000) | sw.dens(SP,$\\theta\_4$, 4000) -1000 kg m$^{-3}$ | gsw.sigma2\_CT(SA,CT) |
- +-----------------------------------------------------------+----------------------------------------------------+--------------------------------------------------------------+
- | specific volume anomaly | sw.svan(SP,t,p) | gsw.specvol\_anom\_CT(SA,CT,p) |
- +-----------------------------------------------------------+----------------------------------------------------+--------------------------------------------------------------+
- | dynamic height anomaly | -sw.gpan(SP,t,p) | gsw.geo\_strf\_dyn\_height(SA,CT,p,delta\_p,interp\_style) |
- +-----------------------------------------------------------+----------------------------------------------------+--------------------------------------------------------------+
- | geostrophic velocity | sw.gvel(ga,lat,long) | gsw.geostrophic\_velocity(geo\_str,long,lat,p) |
- +-----------------------------------------------------------+----------------------------------------------------+--------------------------------------------------------------+
- | N$^2$ | sw.bfrq(SP,t,p,lat) | gsw.Nsquared(SA,CT,p,lat) |
- +-----------------------------------------------------------+----------------------------------------------------+--------------------------------------------------------------+
- | pressure from height (SW uses depth, not height) | sw.pres(-z,lat) | gsw.p\_from\_z(z,lat) |
- +-----------------------------------------------------------+----------------------------------------------------+--------------------------------------------------------------+
- | height from pressure (SW outputs depth, not height) | z = -sw.dpth(p,lat) | gsw.z\_from\_p(p,lat) |
- +-----------------------------------------------------------+----------------------------------------------------+--------------------------------------------------------------+
- | in situ temperature from pt | sw.temp(SP,pt,p,pr) | gsw.pt\_from\_t(SA,pt,pr,p) |
- +-----------------------------------------------------------+----------------------------------------------------+--------------------------------------------------------------+
- | sound speed | sw.svel(SP,t,p) | gsw.sound\_speed(SA,t,p) |
- +-----------------------------------------------------------+----------------------------------------------------+--------------------------------------------------------------+
- | isobaric heat capacity | sw.cp(SP,t,p) | gsw.cp(SA,t,p) |
- +-----------------------------------------------------------+----------------------------------------------------+--------------------------------------------------------------+
- | adiabatic lapse rate\* | sw.adtg(SP,t,p) | gsw.adiabatic\_lapse\_rate(SA,t,p) |
- +-----------------------------------------------------------+----------------------------------------------------+--------------------------------------------------------------+
- | SP from cndr, (PSS 78) | sw.salt(cndr,t,p) | gsw.SP\_from\_cndr(cndr,t,p) |
- +-----------------------------------------------------------+----------------------------------------------------+--------------------------------------------------------------+
- | cndr from SP, (PSS 78) | sw.cndr(SP,t,p) | gsw.cndr\_from\_SP(SP,t,p) |
- +-----------------------------------------------------------+----------------------------------------------------+--------------------------------------------------------------+
- | distance | sw.dist(lat,long,units) | gsw.distance(long,lat,p) |
- +-----------------------------------------------------------+----------------------------------------------------+--------------------------------------------------------------+
- | gravitational acceleration | sw.g(lat,z) | gsw.grav(lat,p) |
- +-----------------------------------------------------------+----------------------------------------------------+--------------------------------------------------------------+
- | Coriolis parameter | sw.f(lat) | gsw.f(lat) |
- +-----------------------------------------------------------+----------------------------------------------------+--------------------------------------------------------------+
-
- | Note that the SW and GSW functions output the adiabatic lapse rate in
- different units, being K (dbar)$^{-1}$ and K Pa$^{-1}$
- | respectively.
-
- Authors
- -------
-
- - Bjørn Ådlandsvik
- - Eric Firing
- - Filipe Fernandes
-
- Thanks
- ------
-
- - Bjørn Ådlandsvik - Testing unit and several bug fixes.
- - Eric Firing - Support for masked arrays, re-write of *delta*\ SA.
- - Trevor J. McDougall (and all of SCOR/IAPSO WG127) for making
- available the Matlab version of this software.
-
- Acknowledgments
- ---------------
-
- - SCOR/IAPSO WG127.
-
- Caveats
- -------
-
- - This python module is incomplete and should be used with caution.
- - The database used in ``_delta_SA`` comes from the MatlabTM gsw
- version.
-
- .. |Build| image:: https://badge.fury.io/py/gsw.png
- :target: http://badge.fury.io/py/gsw
- .. |Build| image:: https://api.travis-ci.org/ocefpaf/python-gsw.png?branch=master
- :target: https://travis-ci.org/ocefpaf/python-gsw
- .. |Downloads| image:: https://pypip.in/d/gsw/badge.png
- :target: https://crate.io/packages/gsw/
-
- version 3.0.3
- =============
-
- version 3.0
- ===========
- * New repository with TEOS10 code (version 3 only).
-
-Keywords: oceanography,seawater,TEOS-10,gibbs
-Platform: any
-Classifier: Development Status :: 4 - Beta
-Classifier: Environment :: Console
-Classifier: Intended Audience :: Science/Research
-Classifier: Intended Audience :: Developers
-Classifier: Intended Audience :: Education
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Topic :: Education
-Classifier: Topic :: Scientific/Engineering
diff --git a/gsw.egg-info/SOURCES.txt b/gsw.egg-info/SOURCES.txt
deleted file mode 100644
index c5f117c..0000000
--- a/gsw.egg-info/SOURCES.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-CHANGES.txt
-LICENSE.txt
-MANIFEST.in
-README.txt
-setup.py
-docs/Makefile
-docs/conf.py
-docs/index.rst
-gsw/__init__.py
-gsw.egg-info/PKG-INFO
-gsw.egg-info/SOURCES.txt
-gsw.egg-info/dependency_links.txt
-gsw.egg-info/requires.txt
-gsw.egg-info/top_level.txt
-gsw/gibbs/__init__.py
-gsw/gibbs/constants.py
-gsw/gibbs/conversions.py
-gsw/gibbs/density_enthalpy_48.py
-gsw/gibbs/density_enthalpy_48_ct.py
-gsw/gibbs/density_enthalpy_ct_exact.py
-gsw/gibbs/derivatives.py
-gsw/gibbs/earth.py
-gsw/gibbs/freezing.py
-gsw/gibbs/geostrophic.py
-gsw/gibbs/geostrophic_48.py
-gsw/gibbs/isobaric.py
-gsw/gibbs/library.py
-gsw/gibbs/neutral_nonlinear_48.py
-gsw/gibbs/practical_salinity.py
-gsw/gibbs/steric.py
-gsw/gibbs/thermodynamics_from_t.py
-gsw/gibbs/water_column_48.py
-gsw/test/__init__.py
-gsw/test/check_functions.py
-gsw/test/signatures.py
-gsw/test/test_check_values.py
-gsw/test/test_octave.py
-gsw/test/test_profiles.py
-gsw/test/test_tuples.py
-gsw/utilities/__init__.py
-gsw/utilities/list_npz.py
-gsw/utilities/mat2npz.py
-gsw/utilities/utilities.py
-gsw/utilities/data/gsw_cf.npz
-gsw/utilities/data/gsw_cv_v3_0.npz
-gsw/utilities/data/gsw_data_v3_0.npz
-gsw/utilities/data/gsw_demo_data_v3_0.npz
\ No newline at end of file
diff --git a/gsw.egg-info/dependency_links.txt b/gsw.egg-info/dependency_links.txt
deleted file mode 100644
index 8b13789..0000000
--- a/gsw.egg-info/dependency_links.txt
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/gsw.egg-info/requires.txt b/gsw.egg-info/requires.txt
deleted file mode 100644
index 9b65aaf..0000000
--- a/gsw.egg-info/requires.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-numpy
-nose
\ No newline at end of file
diff --git a/gsw.egg-info/top_level.txt b/gsw.egg-info/top_level.txt
deleted file mode 100644
index d9a3fb5..0000000
--- a/gsw.egg-info/top_level.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-gsw/utilities
-gsw/gibbs
-gsw/test
-gsw
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gsw.git
More information about the debian-science-commits
mailing list