[Python-modules-commits] [cf-python] 09/11: merge patched into master
Klaus Zimmermann
zklaus-guest at moszumanska.debian.org
Thu Oct 6 19:51:57 UTC 2016
This is an automated email from the git hooks/post-receive script.
zklaus-guest pushed a commit to branch master
in repository cf-python.
commit f8b6dfcb7f8e71460be169a6ffd84025c0cea3fe
Merge: 3904a44 8954078
Author: Klaus Zimmermann <klaus_zimmermann at gmx.de>
Date: Thu Oct 6 21:48:34 2016 +0200
merge patched into master
cf/data/data.py | 10 +-
cf/field.py | 36 +-
cf/um/umread/c-lib/Makefile | 14 +-
cf/um/umread/c-lib/type-dep/Makefile | 6 +-
cf/variable.py | 4 +-
cf/write.py | 12 +-
debian/.git-dpm | 6 +-
.../0001-Remove-check-for-python-version.patch | 2 +-
...x-config-to-avoid-network-access-and-add-.patch | 2 +-
...0003-Improve-umread-building-and-handling.patch | 57 +-
debian/patches/0004-Sphinx-fixes.patch | 418 ++++++
debian/patches/series | 1 +
docs/_static/basic.css | 528 -------
docs/_static/basic.css_t | 528 -------
docs/_static/copybutton.js | 56 -
docs/_static/default.css | 256 ----
docs/_static/doctools.js | 247 ----
docs/_static/file.png | Bin 392 -> 0 bytes
docs/_static/minus.png | Bin 199 -> 0 bytes
docs/_static/org_default.css | 256 ----
docs/_static/plus.png | Bin 199 -> 0 bytes
docs/_static/pygments.css | 62 -
docs/_static/searchtools.js | 518 -------
docs/_static/sidebar.js | 148 --
docs/_themes/homepage/theme.conf | 5 -
docs/source/class.rst | 14 -
docs/source/classes/cf.Data.rst | 1 -
docs/source/classes/cf.FieldList.rst | 1 -
docs/source/classes/cf.List.rst | 48 -
docs/source/conf.py | 4 +-
docs/source/field.rst | 2 +-
docs/source/field_manipulation.rst | 2 +
docs/source/pp_library_mappings.rst | 20 +-
docs/source/ttt/cloud_sptheme/__init__.py | 106 --
docs/source/ttt/cloud_sptheme/ext/__init__.py | 7 -
.../ttt/cloud_sptheme/ext/autodoc_sections.py | 94 --
.../ttt/cloud_sptheme/ext/escaped_samp_literals.py | 79 --
docs/source/ttt/cloud_sptheme/ext/index_styling.py | 59 -
docs/source/ttt/cloud_sptheme/ext/issue_tracker.py | 120 --
docs/source/ttt/cloud_sptheme/ext/perpage.py | 79 --
docs/source/ttt/cloud_sptheme/ext/relbar_toc.py | 32 -
docs/source/ttt/cloud_sptheme/ext/table_styling.py | 251 ----
docs/source/ttt/cloud_sptheme/make_helper.py | 242 ----
.../ttt/cloud_sptheme/themes/cloud/globaltoc.html | 9 -
.../ttt/cloud_sptheme/themes/cloud/layout.html | 95 --
.../ttt/cloud_sptheme/themes/cloud/localtoc.html | 13 -
.../ttt/cloud_sptheme/themes/cloud/quicklinks.html | 27 -
.../ttt/cloud_sptheme/themes/cloud/relations.html | 20 -
.../cloud_sptheme/themes/cloud/static/cloud.css_t | 1460 --------------------
.../cloud_sptheme/themes/cloud/static/cloud.js_t | 427 ------
.../themes/cloud/static/icon-deprecated.png | Bin 1329 -> 0 bytes
.../themes/cloud/static/icon-note.png | Bin 1204 -> 0 bytes
.../themes/cloud/static/icon-seealso.png | Bin 951 -> 0 bytes
.../themes/cloud/static/icon-todo.png | Bin 1324 -> 0 bytes
.../themes/cloud/static/icon-warning.png | Bin 887 -> 0 bytes
.../themes/cloud/static/jquery.cookie.js | 41 -
.../ttt/cloud_sptheme/themes/cloud/theme.conf | 118 --
.../ttt/cloud_sptheme/themes/greencloud/theme.conf | 48 -
.../themes/redcloud/static/overlay.jpg | Bin 7973 -> 0 bytes
.../themes/redcloud/static/overlay.xcf | Bin 990868 -> 0 bytes
.../themes/redcloud/static/redcloud.css_t | 24 -
.../ttt/cloud_sptheme/themes/redcloud/theme.conf | 38 -
62 files changed, 524 insertions(+), 6129 deletions(-)
diff --cc debian/.git-dpm
index 5e43c72,0000000..b62d869
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
+# see git-dpm(1) from git-dpm package
- 87af0de50f3490799b4960f3a8d5204cf86ea530
- 87af0de50f3490799b4960f3a8d5204cf86ea530
- 5dc81c9ebcf7b6cd796f2c335c46671f60c88608
++895407890487de7cf45bdd4f2074db9d703b3e33
++895407890487de7cf45bdd4f2074db9d703b3e33
++d4e86cfcda573bdd7ecc73d6a1639ccb172685c5
+d4e86cfcda573bdd7ecc73d6a1639ccb172685c5
+cf-python_1.3.2+dfsg1.orig.tar.gz
+12caae9152d38445a4fd96aa4d35371dca91fbf7
+1714332
diff --cc debian/patches/0001-Remove-check-for-python-version.patch
index 2c013f9,0000000..dc82201
mode 100644,000000..100644
--- a/debian/patches/0001-Remove-check-for-python-version.patch
+++ b/debian/patches/0001-Remove-check-for-python-version.patch
@@@ -1,33 -1,0 +1,33 @@@
- From 8effa5d2467b1550f6e829df3c4039659d70209e Mon Sep 17 00:00:00 2001
++From 74a9b150030b1f01d77929931d6d2455d17f30d6 Mon Sep 17 00:00:00 2001
+From: Klaus Zimmermann <klaus_zimmermann at gmx.de>
+Date: Wed, 14 Sep 2016 12:10:45 +0200
+Subject: Remove check for python version.
+
+The python version in sid at the moment is 2.7.12+.
+The + breaks the check, which is superfluous in any case, since
+the python2 version is guaranteed to be 2.7 anyway.
+
+Signed-off-by: Klaus Zimmermann <klaus_zimmermann at gmx.de>
+---
+ cf/__init__.py | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/cf/__init__.py b/cf/__init__.py
+index 6e0a66d..66855f1 100644
+--- a/cf/__init__.py
++++ b/cf/__init__.py
+@@ -57,14 +57,6 @@ from distutils.version import StrictVersion
+ import imp
+ import platform
+
+-# Check the version of python
+-if not (StrictVersion('2.6.0')
+- <= StrictVersion(platform.python_version())
+- < StrictVersion('3.0.0')):
+- raise ValueError(
+- "Bad python version: cf requires 2.6 <= python < 3.0. Got %s" %
+- platform.python_version())
+-
+ ## Check the version of numpy
+ #import numpy
+ #if StrictVersion(numpy.__version__) < StrictVersion('1.7'):
diff --cc debian/patches/0002-Patch-sphinx-config-to-avoid-network-access-and-add-.patch
index c72e0a4,0000000..2ad12a6
mode 100644,000000..100644
--- a/debian/patches/0002-Patch-sphinx-config-to-avoid-network-access-and-add-.patch
+++ b/debian/patches/0002-Patch-sphinx-config-to-avoid-network-access-and-add-.patch
@@@ -1,56 -1,0 +1,56 @@@
- From f891fac38d8f7106331152729eb1eeee6e7479b3 Mon Sep 17 00:00:00 2001
++From e79da4d73415a3e232fdc16cf2a623bc58c571d5 Mon Sep 17 00:00:00 2001
+From: Klaus Zimmermann <klaus_zimmermann at gmx.de>
+Date: Wed, 14 Sep 2016 13:25:19 +0200
+Subject: Patch sphinx config to avoid network access and add local intersphinx
+ links.
+
+Signed-off-by: Klaus Zimmermann <klaus_zimmermann at gmx.de>
+---
+ docs/source/conf.py | 27 +++++++++++++++++++++++++--
+ 1 file changed, 25 insertions(+), 2 deletions(-)
+
+diff --git a/docs/source/conf.py b/docs/source/conf.py
+index 50084c5..7e24935 100755
+--- a/docs/source/conf.py
++++ b/docs/source/conf.py
+@@ -72,6 +72,30 @@ intersphinx_mapping = {
+ 'scipy': ('http://docs.scipy.org/doc/scipy/reference', None),
+ }
+
++def check_object_path(key, url, path):
++ if os.path.isfile(path):
++ return {key: (url, path)}
++ return {}
++
++intersphinx_mapping.update(check_object_path('sphinx',
++ 'http://sphinx.pocoo.org/',
++ '/usr/share/doc/sphinx-doc/html/objects.inv'))
++intersphinx_mapping.update(check_object_path('python',
++ 'http://docs.python.org/',
++ '/usr/share/doc/python'
++ + '.'.join([str(x) for x in sys.version_info[0:2]])
++ + '/html/objects.inv'))
++intersphinx_mapping.update(check_object_path('matplotlib',
++ 'http://matplotlib.sourceforge.net/',
++ '/usr/share/doc/python-matplotlib-doc/html/objects.inv'))
++intersphinx_mapping.update(check_object_path('numpy',
++ 'http://docs.scipy.org/doc/numpy/',
++ '/usr/share/doc/python-numpy-doc/html/objects.inv'))
++intersphinx_mapping.update(check_object_path('scipy',
++ 'http://docs.scipy.org/doc/scipy/',
++ '/usr/share/doc/python-scipy-doc/html/objects.inv'))
++
++
+ # The name of the default domain. Can also be None to disable a
+ # default domain. The default is 'py'.
+ #primary_domain = 'cf'
+@@ -324,8 +348,7 @@ def linkcode_resolve(domain, info):
+ #=================================================================
+
+
+- online_source_code = True
+-# online_source_code = False
++ online_source_code = False
+
+ if domain != 'py':
+ return None
diff --cc debian/patches/0003-Improve-umread-building-and-handling.patch
index 512bed6,0000000..9ff03d9
mode 100644,000000..100644
--- a/debian/patches/0003-Improve-umread-building-and-handling.patch
+++ b/debian/patches/0003-Improve-umread-building-and-handling.patch
@@@ -1,34 -1,0 +1,65 @@@
- From 87af0de50f3490799b4960f3a8d5204cf86ea530 Mon Sep 17 00:00:00 2001
++From fccd1318619b628ce06d6b3247408923a27e5edd Mon Sep 17 00:00:00 2001
+From: Klaus Zimmermann <klaus_zimmermann at gmx.de>
+Date: Thu, 22 Sep 2016 17:02:12 +0200
+Subject: Improve umread building and handling.
+
+Signed-off-by: Klaus Zimmermann <klaus_zimmermann at gmx.de>
+---
- cf/um/umread/c-lib/Makefile | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
++ cf/um/umread/c-lib/Makefile | 14 +++++++-------
++ cf/um/umread/c-lib/type-dep/Makefile | 6 ++++--
++ 2 files changed, 11 insertions(+), 9 deletions(-)
+
+diff --git a/cf/um/umread/c-lib/Makefile b/cf/um/umread/c-lib/Makefile
- index 98d0685..5ddbef1 100644
++index 98d0685..48c5744 100644
+--- a/cf/um/umread/c-lib/Makefile
++++ b/cf/um/umread/c-lib/Makefile
- @@ -5,8 +5,8 @@ LIBRARY=umfile.so
- CC=gcc
- CFLAGS=-Wall -fPIC -g
- CPP=gcc -E -P
++@@ -2,11 +2,11 @@ HEADERS=umfile.h umfileint.h bits/*.h
++
++ LIBRARY=umfile.so
++
++-CC=gcc
++-CFLAGS=-Wall -fPIC -g
++-CPP=gcc -E -P
+-LD=ld
+-LDFLAGS=-shared --build-id
- +LD=gcc
- +LDFLAGS=-shared
+++CC ?= gcc
+++CFLAGS += -Wall -fPIC -g
+++CPP ?= gcc -E -P
+++LD ?= gcc
+++LDFLAGS += -shared
+ OBJS = umfile.o error.o filetype.o \
+ malloc.o linklist.o new_structs.o swap.o
+
- @@ -28,7 +28,7 @@ type-dep:
++@@ -28,10 +28,10 @@ type-dep:
+ $(MAKE) -C $(TYPE_DEP_DIR)
+
+ $(LIBRARY): $(OBJS) type-dep
+- $(LD) $(LDFLAGS) -o $@ $(OBJS) --whole-archive $(TYPE_DEP_LIBRARY_PATH)
- + $(LD) $(LDFLAGS) -o $@ $(OBJS) -Wl,--whole-archive $(TYPE_DEP_LIBRARY_PATH) -Wl,--no-whole-archive
+++ $(LINK.c) $(OBJS) -Wl,--whole-archive $(TYPE_DEP_LIBRARY_PATH) -Wl,--no-whole-archive \
+++ $(LOADLIBES) $(LDLIBS) -o $@
+
+ %.o: %.c $(HEADERS)
- $(CC) $(CFLAGS) -c $<
++- $(CC) $(CFLAGS) -c $<
++
++ #bits/protos_sgl.h: bits/type_dep_protos.h
++ # $(CPP) -DBUILD_HDR -DSINGLE $< > $@
++diff --git a/cf/um/umread/c-lib/type-dep/Makefile b/cf/um/umread/c-lib/type-dep/Makefile
++index 381c4a8..66633a1 100644
++--- a/cf/um/umread/c-lib/type-dep/Makefile
+++++ b/cf/um/umread/c-lib/type-dep/Makefile
++@@ -24,11 +24,13 @@ all: $(LIB)
++ clean:
++ rm -f $(OBJS) $(TMP_OBJS) $(LIB) $(REDEFINES_SGL) $(REDEFINES_DBL)
++
+++%_dbl_tmp.o: CFLAGS += -DDOUBLE
++ %_dbl_tmp.o: %.c $(HEADERS)
++- $(CC) $(CFLAGS) -c -DDOUBLE -o $@ $<
+++ $(COMPILE.c) $(OUTPUT_OPTION) $<
++
+++%_sgl_tmp.o: CFLAGS += -DSINGLE
++ %_sgl_tmp.o: %.c $(HEADERS)
++- $(CC) $(CFLAGS) -c -DSINGLE -o $@ $<
+++ $(COMPILE.c) $(OUTPUT_OPTION) $<
++
++ %_sgl.o: %_sgl_tmp.o $(REDEFINES_SGL)
++ objcopy --redefine-syms=$(REDEFINES_SGL) $< $@
diff --cc debian/patches/0004-Sphinx-fixes.patch
index 0000000,0000000..4ba88a7
new file mode 100644
--- /dev/null
+++ b/debian/patches/0004-Sphinx-fixes.patch
@@@ -1,0 -1,0 +1,418 @@@
++From 895407890487de7cf45bdd4f2074db9d703b3e33 Mon Sep 17 00:00:00 2001
++From: Klaus Zimmermann <klaus_zimmermann at gmx.de>
++Date: Thu, 6 Oct 2016 21:45:32 +0200
++Subject: Sphinx fixes.
++
++Signed-off-by: Klaus Zimmermann <klaus_zimmermann at gmx.de>
++---
++ cf/data/data.py | 10 ++++----
++ cf/field.py | 36 ++++++++++++++-------------
++ cf/variable.py | 4 +--
++ cf/write.py | 12 +++------
++ docs/source/class.rst | 14 -----------
++ docs/source/classes/cf.Data.rst | 1 -
++ docs/source/classes/cf.FieldList.rst | 1 -
++ docs/source/classes/cf.List.rst | 48 ------------------------------------
++ docs/source/conf.py | 4 ++-
++ docs/source/field.rst | 2 +-
++ docs/source/field_manipulation.rst | 2 ++
++ docs/source/pp_library_mappings.rst | 20 +++++++--------
++ 12 files changed, 45 insertions(+), 109 deletions(-)
++ delete mode 100644 docs/source/classes/cf.List.rst
++
++diff --git a/cf/data/data.py b/cf/data/data.py
++index bb294c1..acb90ad 100644
++--- a/cf/data/data.py
+++++ b/cf/data/data.py
++@@ -6221,7 +6221,7 @@ omitted from the calculation.
++ The binary mask's data array comprises dimensionless 8-bit integers
++ and has 0 where the data array has missing data and 1 otherwise.
++
++-.. seealos:: `mask`
+++.. seealso:: `mask`
++
++ :Returns:
++
++@@ -7767,13 +7767,13 @@ The returned object is of the same type as is stored internally.
++ If *index* is ``0`` or ``-1`` then the first or last data
++ array element respecitively will be returned, even if the
++ data array is a scalar array.
+++
++ ..
++-
++ * Two or more integers. These arguments are interpreted as a
++ multidimensionsal index to the array. There must be the
++ same number of integers as data array dimensions.
+++
++ ..
++-
++ * A tuple of integers. This argument is interpreted as a
++ multidimensionsal index to the array. There must be the
++ same number of integers as data array dimensions.
++@@ -8410,8 +8410,8 @@ elements.
++
++ * ``None``. The appropriate elements of the data array are
++ unchanged.
++- ..
++
+++ ..
++ * Any object which is broadcastable to the data array's
++ shape. The appropriate elements of the data array are set
++ to the corresponding values from the object broadcast to
++@@ -8797,8 +8797,8 @@ selected with the keyword arguments.
++ *axes* argument may be one, or a sequence, of:
++
++ * An internal axis identifier. Selects this axis.
++- ..
++
+++ ..
++ * An integer. Selects the axis coresponding to the given
++ position in the list of axes of the data array.
++
++diff --git a/cf/field.py b/cf/field.py
++index dda902a..6edf315 100644
++--- a/cf/field.py
+++++ b/cf/field.py
++@@ -5653,7 +5653,7 @@ two fields are equivalent if:
++ the other field has a matching dimension whose identity inferred
++ is inferred from a 1-d coordinate with an equivalent data array.
++
++- * The rank, as given by their `~cf.Field.rank
+++ * The rank, as given by their `~cf.Field.rank`
++
++ [+1].. seealso:: `~cf.Field.equals`, `set_equals`
++ [+N].. seealso:: `~cf.FieldList.equals`, `set_equals`
++@@ -5937,8 +5937,7 @@ The coordinate value conditions may be given in any order.
++ =========== =================================================
++ *arg* Description
++ =========== =================================================
++-
++- ``'exact'`` -Keyword parameter names are not treated as
+++ ``'exact'`` Keyword parameter names are not treated as
++ abbreviations of item identities. By default,
++ keyword parameter names are allowed to be
++ abbreviations of item identities.
++@@ -6984,7 +6983,7 @@ arguments.
++ hectopascals (see `cf.eq`).
++
++ *Example:*
++- ``f.match({'standard_name': cf.eq('air_pressure'),
+++ ``f.match({'standard_name': cf.eq('air_pressure'),
++ 'units': 'hPa'})`` will match a field with a standard name
++ of exactly "air_pressure" but with units which equivalent
++ to hectopascals (see `cf.eq`).
++@@ -10080,21 +10079,22 @@ Set the time axis to be unlimited when written to a netCDF file:
++ the special case of *xxx* being `None`, then chunking is
++ set to the netCDF default.
++
++- *Example:*
++- To set time axes to be unlimited: ``{'T': True}``.
++-
++ Example:
+++ To set time axes to be unlimited: ``{'T': True}``.
++
++- To set the chunk size for the first and third data array
+++ Example:
+++ To set the chunk size for the first and third data array
++ axes to 100: {0: 100, 2: 100}, or equivalently {(0, 2): 100}.
+++
++ Example:
+++ To set the chunk size for the longitude axis to 100 and
+++ for the air temperature axis to 5: {'X': 100, 'air_temperature': 5}.
++
++- To set the chunk size for the longitude axis to 100 and
++- for the air temperature axis to 5: {'X': 100,
++- 'air_temperature': 5}. Example:
+++ Example:
+++ To set the chunk size for all axes to 10: {None: 10}. This
+++ works because f.axes(None) returns all field axes.
++
++- To set the chunk size for all axes to 10: {None: 10}. This
++- works because f.axes(None) returns all field axes. Example:
+++ Example:
++ To set the chunking to the netCDF default: None.
++
++ :Returns:
++@@ -10222,7 +10222,8 @@ Auxiliary coords:
++ axes_subset=None, axes_superset=None, exact=False,
++ inverse=False, match_and=True, ndim=None, key=False,
++ copy=False):
++- '''{+Fef,}Return an auxiliary coordinate object, or its domain identifier.
+++ '''
+++{+Fef,}Return an auxiliary coordinate object, or its domain identifier.
++
++ In this documentation, an auxiliary coordinate object is referred to
++ as an item.
++@@ -10569,6 +10570,7 @@ Note that ``f.{+name}(inverse=False, **kwargs)`` is equivalent to
++
++ .. seealso:: `aux`, `axes`, `measures` , `refs`, `coords`, `dims`,
++ `items`, `remove_items`
+++
++ :Examples 1:
++
++ To select all auxiliary coordinate objects:
++@@ -11959,7 +11961,7 @@ elements.
++
++ [+1].. seealso:: `cf.masked`, `hardmask`, `indices`, `mask`, `subspace`
++ [+N].. seealso:: `cf.masked`, `cf.Field.hardmask`, `cf.Field.indices`,
++-[+N] `mask`, ``subspace`
+++[+N] `mask`, `subspace`
++
++ :Examples 1:
++
++@@ -12013,8 +12015,8 @@ elements.
++
++ * `None`. The appropriate elements of the field's data
++ array are unchanged. This the default.
++- ..
++
+++ ..
++ * Any object which is broadcastable to the field's data
++ array using the metadata-aware `cf` broadcasting rules
++ (i.e. a suitable `cf.Field` object or any object, ``a``,
++@@ -12304,7 +12306,7 @@ Regrid field ``f`` conservatively onto a grid contained in field
++ Force the use of a periodic X axis for the destination grid,
++ without altering the original field.
++
++- method: `str`ing, optional
+++ method: `str`, optional
++ By default the regridding method is set to 'auto'. In this case
++ conservative regridding will be used unless one or both of the
++ fields does not have contiguous bounds, in which case bilinear
++diff --git a/cf/variable.py b/cf/variable.py
++index a88d2a9..179e90a 100644
++--- a/cf/variable.py
+++++ b/cf/variable.py
++@@ -4281,13 +4281,13 @@ array or has two or more dimensions.
++ array element respecitively will be returned, even if the
++ data array is a scalar array or has two or more
++ dimensions.
+++
++ ..
++-
++ * Two or more integers. These arguments are interpreted as a
++ multidimensionsal index to the array. There must be the
++ same number of integers as data array dimensions.
+++
++ ..
++-
++ * A tuple of integers. This argument is interpreted as a
++ multidimensionsal index to the array. There must be the
++ same number of integers as data array dimensions.
++diff --git a/cf/write.py b/cf/write.py
++index de023d6..2ca9de7 100644
++--- a/cf/write.py
+++++ b/cf/write.py
++@@ -251,18 +251,12 @@ and auxiliary coordinate roles for different data variables.
++ <CF Field: u_compnt_of_wind(19, 29, 24)>,
++ <CF Field: v_compnt_of_wind(19, 29, 24)>,
++ <CF Field: potential_temperature(19, 30, 24)>]
++->>> write(f
++-
++- , 'file')
+++>>> write(f, 'file')
++
++ >>> type(f)
++-<clas
++-
++- s 'cf.field.FieldList'>
+++<class 'cf.field.FieldList'>
++ >>> type(g)
++-<clas
++-
++- s 'cf.field.Field'>
+++<class 'cf.field.Field'>
++ >>> cf.write([f, g], 'file.nc', verbose=True)
++ [<CF Field: air_pressure(30, 24)>,
++ <CF Field: u_compnt_of_wind(19, 29, 24)>,
++diff --git a/docs/source/class.rst b/docs/source/class.rst
++index 1dd5db3..97c0458 100644
++--- a/docs/source/class.rst
+++++ b/docs/source/class.rst
++@@ -56,18 +56,6 @@ Base classes
++ cf.Dict
++ cf.Variable
++
++-.. comment
++- Data component classes
++- ----------------------
++-
++- .. autosummary::
++- :nosignatures:
++- :toctree: classes/
++-
++- cf.Partition
++- cf.PartitionMatrix
++-
++-
++ .. _inheritance_diagrams:
++
++ Inheritance diagrams
++@@ -109,5 +97,3 @@ The classes defined by the `cf` package inherit as follows:
++ .. inheritance-diagram:: cf.CellMethods
++ cf.CoordinateReference
++ :parts: 1
++-
++-----
++diff --git a/docs/source/classes/cf.Data.rst b/docs/source/classes/cf.Data.rst
++index 28f1896..81d350f 100644
++--- a/docs/source/classes/cf.Data.rst
+++++ b/docs/source/classes/cf.Data.rst
++@@ -62,7 +62,6 @@ Data methods
++ ~cf.Data.dump
++ ~cf.Data.dumpd
++ ~cf.Data.equals
++- ~cf.Data.equivalent
++ ~cf.Data.expand_dims
++ ~cf.Data.files
++ ~cf.Data.flat
++diff --git a/docs/source/classes/cf.FieldList.rst b/docs/source/classes/cf.FieldList.rst
++index 7279560..5eab7b0 100644
++--- a/docs/source/classes/cf.FieldList.rst
+++++ b/docs/source/classes/cf.FieldList.rst
++@@ -176,7 +176,6 @@ Miscellaneous
++ ~cf.FieldList.name
++ ~cf.FieldList.override_units
++ ~cf.FieldList.override_calendar
++- ~cf.FieldList.promote
++ ~cf.FieldList.remove_data
++ ~cf.FieldList.select
++ ~cf.FieldList.weights
++diff --git a/docs/source/classes/cf.List.rst b/docs/source/classes/cf.List.rst
++deleted file mode 100644
++index 6bd523a..0000000
++--- a/docs/source/classes/cf.List.rst
+++++ /dev/null
++@@ -1,48 +0,0 @@
++-.. currentmodule:: cf
++-.. default-role:: obj
++-
++-cf.List
++-=======
++-
++-.. autoclass:: cf.List
++- :no-members:
++- :no-inherited-members:
++-
++-List methods
++-------------
++-
++-.. autosummary::
++- :nosignatures:
++- :toctree: ../generated/
++- :template: method.rst
++-
++- ~cf.List.copy
++- ~cf.List.count
++- ~cf.List.delattr
++- ~cf.List.equals
++- ~cf.List.getattr
++- ~cf.List.index
++- ~cf.List.iter
++- ~cf.List.method
++- ~cf.List.setattr
++-
++-
++-List list-like methods
++-----------------------
++-
++-These methods provide functionality exactly as their counterparts in a
++-built-in :py:obj:`list`.
++-
++-.. autosummary::
++- :nosignatures:
++- :toctree: ../generated/
++- :template: method.rst
++-
++- ~cf.List.append
++- ~cf.List.extend
++- ~cf.List.insert
++- ~cf.List.pop
++- ~cf.List.remove
++- ~cf.List.reverse
++- ~cf.List.sort
++-
++diff --git a/docs/source/conf.py b/docs/source/conf.py
++index 7e24935..67144ae 100755
++--- a/docs/source/conf.py
+++++ b/docs/source/conf.py
++@@ -140,7 +140,9 @@ def _get_version():
++ # The full version, including alpha/beta/rc tags.
++ release = _get_version()
++ # The short X.Y version.
++-version = re.findall('^\d+\.\d+', release)
+++versions = re.findall('^\d+\.\d+', release)
+++assert(len(versions)==1)
+++version = versions[0]
++
++ # The language for content autogenerated by Sphinx. Refer to
++ # documentation for a list of supported languages.
++diff --git a/docs/source/field.rst b/docs/source/field.rst
++index 7417921..bf9c341 100644
++--- a/docs/source/field.rst
+++++ b/docs/source/field.rst
++@@ -1,7 +1,7 @@
++ .. currentmodule:: cf
++ .. default-role:: obj
++
++-.. _field_structure:
+++.. _field:
++
++ Introduction to the `cf.Field` object
++ =====================================
++diff --git a/docs/source/field_manipulation.rst b/docs/source/field_manipulation.rst
++index d6cfb0c..dd2e699 100644
++--- a/docs/source/field_manipulation.rst
+++++ b/docs/source/field_manipulation.rst
++@@ -1,4 +1,5 @@
++ .. set tocdepth in sidebar
+++
++ :tocdepth: 2
++
++ .. currentmodule:: cf
++@@ -570,6 +571,7 @@ It is possible to set the action to take when an arithmetic operation
++ produces one of the following floating-point errors:
++
++ .. tabularcolumns:: |l|l|
+++
++ ================= =================================
++ Error Description
++ ================= =================================
++diff --git a/docs/source/pp_library_mappings.rst b/docs/source/pp_library_mappings.rst
++index 076fd69..6cad088 100644
++--- a/docs/source/pp_library_mappings.rst
+++++ b/docs/source/pp_library_mappings.rst
++@@ -8,23 +8,23 @@
++ +------------------+----------------------------------------+----------------------------------------------------+
++ | Object | | Description |
++ +==================+========================================+====================================================+
++-|| `!ppa` | | `cf.read` |
++-|| `!ppasooc` | | |
++-|| `!ncassoc` | | |
+++| `!ppa` | | `cf.read` |
+++| `!ppasooc` | | |
+++| `!ncassoc` | | |
++ +------------------+----------------------------------------+----------------------------------------------------+
++-|| `!ppw` | | `cf.write` |
+++| `!ppw` | | `cf.write` |
++ +------------------+----------------------------------------+----------------------------------------------------+
++-|| `!pp_area_avg` | | `cf.Field.collapse` |
+++| `!pp_area_avg` | | `cf.Field.collapse` |
++ +------------------+----------------------------------------+----------------------------------------------------+
++-|| `!pats_area_avg`| | `cf.Field.collapse` |
+++| `!pats_area_avg` | | `cf.Field.collapse` |
++ +------------------+----------------------------------------+----------------------------------------------------+
++-|| `!pp_vol_avg` | | `cf.Field.collapse` |
+++| `!pp_vol_avg` | | `cf.Field.collapse` |
++ +------------------+----------------------------------------+----------------------------------------------------+
++-|| `!pp_extract` | | `cf.Field.subspace` |
+++| `!pp_extract` | | `cf.Field.subspace` |
++ +------------------+----------------------------------------+----------------------------------------------------+
++-|| `!pp_ff` | ``pp_ff('5.7*(a/AVG(b))', pp1, pp2)`` | |
+++| `!pp_ff` | ``pp_ff('5.7*(a/AVG(b))', pp1, pp2)`` | |
++ +------------------+----------------------------------------+----------------------------------------------------+
++-|| `!pp_regrid | | `cf.Field.regrid`
+++| `!pp_regrid` | | `cf.Field.regrid` |
++ +------------------+----------------------------------------+----------------------------------------------------+
++
++ =============================== =======================================================================
diff --cc debian/patches/series
index 6d6c5a9,0000000..348fd82
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,4 @@@
+0001-Remove-check-for-python-version.patch
+0002-Patch-sphinx-config-to-avoid-network-access-and-add-.patch
+0003-Improve-umread-building-and-handling.patch
++0004-Sphinx-fixes.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/cf-python.git
More information about the Python-modules-commits
mailing list