[Python-modules-commits] [cf-python] 06/09: change version to 1.3.2+dfsg.1-1 new upstream release
Klaus Zimmermann
zklaus-guest at moszumanska.debian.org
Sat Oct 1 17:16:08 UTC 2016
This is an automated email from the git hooks/post-receive script.
zklaus-guest pushed a commit to branch master-helper
in repository cf-python.
commit 49361511d8def1a891cef27aa87af980fe5c8566
Merge: f39d6d9 0c95e47
Author: Klaus Zimmermann <klaus_zimmermann at gmx.de>
Date: Thu Sep 22 15:20:53 2016 +0200
change version to 1.3.2+dfsg.1-1
new upstream release
Changelog.md | 20 +-
PKG-INFO | 2 +-
README.md | 6 +-
cf/__init__.py | 4 +-
cf/ancillary_org.py | 61 -
cf/ancillaryvariables.py | 60 +
cf/data/array.py | 55 +-
cf/data/text_filearray.py | 102 -
cf/etc/STASH_to_CF.txt.ORG | 5858 --------------------
.../coordinate_reference/coordinate_criteria.txt | 18 -
.../coordinate_reference/name_type_coordinates.txt | 25 +
cf/etc/coordinate_reference/scalar_terms.txt | 17 +
.../coordinate_reference/term_canonical_units.txt | 22 +
.../coordinate_reference/term_default_values.txt | 33 +
cf/etc/coordinate_reference/xxx.txt | 25 +
cf/pp/filearray.py | 495 --
cf/pp/read.py | 2569 ---------
cf/pp/unwgdos.py | 212 -
cf/pp/unwgdos/compile | 7 -
cf/pp/unwgdos/crayio.h | 396 --
cf/pp/unwgdos/unwgdos.c | 589 --
cf/pp/unwgdos/unwgdos_crayio.c | 2112 -------
cf/pp/unwgdos/util.h | 251 -
cf/pp/unwgdos/vardef.h | 67 -
cf/um/umread/c-lib/Makefile | 3 +-
cf/um/umread/c-lib/type-dep/Makefile.org | 47 -
debian/.git-dpm | 6 +-
debian/changelog | 4 +-
.../0001-Remove-check-for-python-version.patch | 4 +-
...x-config-to-avoid-network-access-and-add-.patch | 2 +-
...ing.patch => 0003-Improve-umread-linking.patch} | 17 +-
.../0003-Remove-special-udunits2-database.patch | 114 -
debian/patches/0004-Test-fixes.patch | 132 -
debian/patches/series | 4 +-
docs/_themes/homepage/theme.conf | 5 +
docs/source/PPP_static/copybutton.js | 56 +
docs/source/PPP_static/default.css | 256 +
docs/source/PPP_static/doctools.js | 247 +
docs/source/PPP_static/file.png | Bin 0 -> 392 bytes
docs/source/PPP_static/jquery.js | 154 +
docs/source/PPP_static/minus.png | Bin 0 -> 199 bytes
docs/source/PPP_static/plus.png | Bin 0 -> 199 bytes
docs/source/PPP_static/pygments.css | 62 +
docs/source/PPP_static/searchtools.js | 518 ++
docs/source/PPP_static/sidebar.js | 148 +
docs/source/PPP_static/underscore.js | 16 +
.../__init__.py => docs/source/_themes/theme.conf | 0
docs/source/a_first_example.rst.NEW | 141 +
docs/source/classes/cf.AncillaryVariables.rst | 93 +
docs/source/classes/cf.CalendarMonths.rst | 22 +
docs/source/classes/cf.CalendarYears.rst | 23 +
docs/source/classes/cf.Comparison.rst | 22 +
docs/source/examples/first_example.html | 823 ---
docs/source/examples/regridc_example.html | 2336 --------
docs/source/examples/regrids_example.html | 3840 -------------
docs/source/examples/regrids_example_2.html | 1712 ------
docs/source/field_manipulation.rst | 44 +-
docs/source/field_structure.rst | 550 ++
docs/source/introduction.rst.NEW | 48 +
docs/source/post-processing.rst | 197 -
docs/source/pp_library_mappings.rst | 606 ++
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 0 -> 1329 bytes
.../themes/cloud/static/icon-note.png | Bin 0 -> 1204 bytes
.../themes/cloud/static/icon-seealso.png | Bin 0 -> 951 bytes
.../themes/cloud/static/icon-todo.png | Bin 0 -> 1324 bytes
.../themes/cloud/static/icon-warning.png | Bin 0 -> 887 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 0 -> 7973 bytes
.../themes/redcloud/static/overlay.xcf | Bin 0 -> 990868 bytes
.../themes/redcloud/static/redcloud.css_t | 24 +
.../ttt/cloud_sptheme/themes/redcloud/theme.conf | 38 +
scripts/man1/cfa.1 | 265 +
scripts/man1/cfdump.1 | 324 ++
test/Aggregate.py | 84 +
test/Collapse.py | 483 ++
test/Comparison.py | 164 +
test/Coordinate.py | 93 +
test/Data.py | 906 +++
test/Data2.py | 1092 ++++
test/Datetime.py | 98 +
test/Field.py | 138 +
test/Field2.py | 82 +
test/PP.py | 62 +
test/Transform.py | 46 +
test/Units.py | 147 +
test/create_field.py | 158 +
test/example3.py | 26 +
test/example4.py | 64 +
test/new_STASH_to_CF.txt | 2 +
test/oldtest.py | 37 +
test/test.py | 37 +
test/test1.py | 683 +++
111 files changed, 11636 insertions(+), 22002 deletions(-)
diff --cc debian/.git-dpm
index 20a8709,0000000..40c03ca
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
- 2df311662c4215485183da69902d6b3e352aa79a
- 2df311662c4215485183da69902d6b3e352aa79a
- 0a04259b30001c5b49f62c8f4902f376d9c97558
++0c95e47537f4a96c4ac8d445eb5f15f381e15fa8
++0c95e47537f4a96c4ac8d445eb5f15f381e15fa8
++76ee86db590d750a48893644cb9ef6f9d7e3bd46
+76ee86db590d750a48893644cb9ef6f9d7e3bd46
+cf-python_1.3.2+dfsg.1.orig.tar.gz
+7964f7897042f80ed96aa26aec9351e2a98ae918
+2126058
diff --cc debian/changelog
index d71e4e7,0000000..3b02360
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,0 +1,5 @@@
- cf-python (1.3.1+dfsg.1-1) UNRELEASED; urgency=medium
++cf-python (1.3.2+dfsg.1-1) UNRELEASED; urgency=medium
+
+ * Initial release (Closes: #777315)
+
- -- Klaus Zimmermann <klaus_zimmermann at gmx.de> Wed, 14 Sep 2016 13:26:52 +0200
++ -- Klaus Zimmermann <klaus_zimmermann at gmx.de> Thu, 22 Sep 2016 15:16:21 +0200
diff --cc debian/patches/0001-Remove-check-for-python-version.patch
index c7a0c18,0000000..fd7e765
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 72d661ce03c959443961def011f8a3382da2f004 Mon Sep 17 00:00:00 2001
++From c8212b7157f5f7c67fc0bc08ab75c630eafa78e0 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 46a8b5f..2201cea 100644
++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 a5d1fa9,0000000..91aef67
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 94359c41378ec35ed9ad95331104dd6f6c3a6ac7 Mon Sep 17 00:00:00 2001
++From 2cabe2ea253fd61b2197b3b634d31ade0c9cedbd 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-linking.patch
index 9f5698c,0000000..5035bd9
mode 100644,000000..100644
--- a/debian/patches/0003-Improve-umread-linking.patch
+++ b/debian/patches/0003-Improve-umread-linking.patch
@@@ -1,33 -1,0 +1,32 @@@
- From 2df311662c4215485183da69902d6b3e352aa79a Mon Sep 17 00:00:00 2001
++From 0c95e47537f4a96c4ac8d445eb5f15f381e15fa8 Mon Sep 17 00:00:00 2001
+From: Klaus Zimmermann <klaus_zimmermann at gmx.de>
- Date: Wed, 21 Sep 2016 17:01:37 +0200
- Subject: Improve umread building and handling.
++Date: Thu, 22 Sep 2016 15:15:39 +0200
++Subject: Improve umread linking.
+
+Signed-off-by: Klaus Zimmermann <klaus_zimmermann at gmx.de>
+---
- cf/um/umread/c-lib/Makefile | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
++ cf/um/umread/c-lib/Makefile | 4 ++--
++ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cf/um/umread/c-lib/Makefile b/cf/um/umread/c-lib/Makefile
- index bc6d336..0b69f96 100644
++index 98d0685..69e2984 100644
+--- a/cf/um/umread/c-lib/Makefile
++++ b/cf/um/umread/c-lib/Makefile
+@@ -5,7 +5,7 @@ LIBRARY=umfile.so
+ CC=gcc
+ CFLAGS=-Wall -fPIC -g
+ CPP=gcc -E -P
+-LD=ld
++LD=gcc
- LDFLAGS=-shared
++ LDFLAGS=-shared --build-id
+ OBJS = umfile.o error.o filetype.o \
+ malloc.o linklist.o new_structs.o swap.o
- @@ -28,7 +28,8 @@ type-dep:
++@@ -28,7 +28,7 @@ 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
- + strip --remove-section=.comment --remove-section=.note --enable-deterministic-archives $@
+
+ %.o: %.c $(HEADERS)
+ $(CC) $(CFLAGS) -c $<
diff --cc debian/patches/series
index bd383cb,0000000..bc8cd72
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,5 -1,0 +1,3 @@@
+0001-Remove-check-for-python-version.patch
+0002-Patch-sphinx-config-to-avoid-network-access-and-add-.patch
- 0003-Remove-special-udunits2-database.patch
- 0004-Test-fixes.patch
- 0005-Improve-umread-building-and-handling.patch
++0003-Improve-umread-linking.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