[Python-modules-commits] [cf-python] 13/17: merge patched into master

[Klaus Zimmermann]

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 59e8a11dad470fcdd08ca473e5b494a0c6a06bc0
Merge: dd42202 46498e1
Author: Klaus Zimmermann <klaus_zimmermann at gmx.de>
Date:   Thu Aug 18 20:17:30 2016 +0200

    merge patched into master

 cf/__init__.py                                     | 12 +++----
 debian/.git-dpm                                    |  4 +--
 .../0002-Remove-check-for-python-version.patch     | 37 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 46 insertions(+), 8 deletions(-)

diff --cc debian/.git-dpm
index 40bcd30,0000000..938cc8d
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
- 3b6ab4e2111dfbd85728b2c2f34662b1c7368f40
- 3b6ab4e2111dfbd85728b2c2f34662b1c7368f40
++46498e1a77c26402df5e49b2b62e8f65d3794e8c
++46498e1a77c26402df5e49b2b62e8f65d3794e8c
 +53f5be07a493e00a0b38a62149f6b9b03fb415bc
 +53f5be07a493e00a0b38a62149f6b9b03fb415bc
 +cf-python_1.2.1.orig.tar.gz
 +3c56b1636a7799c5ec38a1480f604b161f201f96
 +3953039
diff --cc debian/patches/0002-Remove-check-for-python-version.patch
index 0000000,0000000..34c3003
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Remove-check-for-python-version.patch
@@@ -1,0 -1,0 +1,37 @@@
++From 46498e1a77c26402df5e49b2b62e8f65d3794e8c Mon Sep 17 00:00:00 2001
++From: Klaus Zimmermann <klaus_zimmermann at gmx.de>
++Date: Thu, 18 Aug 2016 20:17:22 +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 | 12 ++++++------
++ 1 file changed, 6 insertions(+), 6 deletions(-)
++
++diff --git a/cf/__init__.py b/cf/__init__.py
++index b370e3c..393a69c 100644
++--- a/cf/__init__.py
+++++ b/cf/__init__.py
++@@ -58,12 +58,12 @@ 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())
+++# 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
diff --cc debian/patches/series
index 81c45e5,0000000..ca3dc3e
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-Removed-bundled-versions-of-javascript-libraries.patch
++0002-Remove-check-for-python-version.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/cf-python.git