[Python-modules-commits] [python-vertica] 03/10: merge patched into master

[Jean Baptiste Favre]

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

jbfavre-guest pushed a commit to branch master
in repository python-vertica.

commit 3e49e4420ffd23ccda37cad18a039ae46c92174c
Merge: 9fed421 8267539
Author: Jean Baptiste Favre <debian at jbfavre.org>
Date:   Sun May 22 13:49:04 2016 +0200

    merge patched into master

 README.md                                          |   14 +-
 debian/.git-dpm                                    |    6 +-
 .../0001-Update-python-3-compatibility-patch.patch | 1215 --------------------
 debian/patches/series                              |    1 -
 requirements.txt                                   |    3 -
 requirements_test.txt                              |    1 -
 setup.py                                           |    9 +-
 tox.ini                                            |    9 +
 vertica_python/__init__.py                         |    2 +-
 vertica_python/errors.py                           |   12 +-
 vertica_python/tests/error_tests.py                |   62 +
 vertica_python/tests/unicode_tests.py              |    7 +-
 vertica_python/vertica/connection.py               |    6 +-
 vertica_python/vertica/cursor.py                   |    4 +
 14 files changed, 113 insertions(+), 1238 deletions(-)

diff --cc debian/.git-dpm
index 17af3f5,0000000..94469bf
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 461d63a1ef4b558d51228f1cd42c9a39e24d6fac
- 461d63a1ef4b558d51228f1cd42c9a39e24d6fac
- f023f12a95089c1178b78e28da29d6842bfc3865
++8267539dc3f1bd9bac19348ddb9c8f6fac443af9
++8267539dc3f1bd9bac19348ddb9c8f6fac443af9
++8267539dc3f1bd9bac19348ddb9c8f6fac443af9
 +8267539dc3f1bd9bac19348ddb9c8f6fac443af9
 +python-vertica_0.6.2.orig.tar.gz
 +7d25b614e8e26aaf6f08841cfff6a2877c2665a6
 +23572
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"

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