[Python-modules-commits] [sqlalchemy] 05/06: merge patched into master

[Piotr Ożarowski]

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

piotr pushed a commit to branch master
in repository sqlalchemy.

commit 50c3cac62a21b57035a04d74d8bd9536c7e7bfcb
Merge: cefb953 46da9df
Author: Piotr Ożarowski <piotr at debian.org>
Date:   Sat Nov 5 22:07:31 2016 +0100

    merge patched into master

 PKG-INFO                                           |   2 +-
 debian/.git-dpm                                    |   6 +-
 .../patches/0001-disable_intersphinx-module.patch  |   4 +-
 doc/build/changelog/changelog_11.rst               |  63 +++++++++++
 doc/build/changelog/migration_11.rst               | 122 +++++++++++++++++----
 doc/build/conf.py                                  |   4 +-
 lib/sqlalchemy/__init__.py                         |   2 +-
 lib/sqlalchemy/dialects/postgresql/base.py         |   3 +-
 lib/sqlalchemy/ext/hybrid.py                       |   4 +-
 lib/sqlalchemy/orm/persistence.py                  |   6 +
 lib/sqlalchemy/orm/query.py                        |   7 +-
 lib/sqlalchemy/orm/session.py                      |   9 +-
 lib/sqlalchemy/orm/unitofwork.py                   |   3 +
 lib/sqlalchemy/sql/base.py                         |   2 -
 lib/sqlalchemy/sql/sqltypes.py                     |  20 ++++
 lib/sqlalchemy/sql/type_api.py                     |  11 ++
 test/dialect/postgresql/test_reflection.py         |  16 +++
 test/orm/test_query.py                             |  30 +++++
 test/orm/test_session.py                           |  33 +++++-
 test/orm/test_unitofworkv2.py                      |  20 ++++
 test/sql/test_metadata.py                          |  67 +++++++++++
 test/sql/test_types.py                             |  19 ++++
 22 files changed, 411 insertions(+), 42 deletions(-)

diff --cc debian/.git-dpm
index 4b8b27b,0000000..9db4789
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
- 49df509851d43eae66825df3a5b30c5145c0308a
- 49df509851d43eae66825df3a5b30c5145c0308a
- c7782a7b2c28c48033ee9d6a1749dd48d10b6dc2
++46da9df299934d06aa967cce1d96e3fa0615c306
++46da9df299934d06aa967cce1d96e3fa0615c306
++ea616a8a0fe33469561d26ce6adb5086ca68ccb9
 +ea616a8a0fe33469561d26ce6adb5086ca68ccb9
 +sqlalchemy_1.1.3+ds1.orig.tar.gz
 +e995d76410f274276266281f44a021078cb178dc
 +2729474
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-disable_intersphinx-module.patch
index 9d32a27,0000000..56f1b72
mode 100644,000000..100644
--- a/debian/patches/0001-disable_intersphinx-module.patch
+++ b/debian/patches/0001-disable_intersphinx-module.patch
@@@ -1,22 -1,0 +1,22 @@@
- From 49df509851d43eae66825df3a5b30c5145c0308a Mon Sep 17 00:00:00 2001
++From 46da9df299934d06aa967cce1d96e3fa0615c306 Mon Sep 17 00:00:00 2001
 +From: =?UTF-8?q?Piotr=20O=C5=BCarowski?= <piotr at debian.org>
 +Date: Tue, 20 Sep 2016 23:28:44 +0200
 +Subject: disable_intersphinx module
 +
 +---
 + doc/build/conf.py | 2 +-
 + 1 file changed, 1 insertion(+), 1 deletion(-)
 +
 +diff --git a/doc/build/conf.py b/doc/build/conf.py
- index 9050b53..a34a8c7 100644
++index f5785a7..7a55b79 100644
 +--- a/doc/build/conf.py
 ++++ b/doc/build/conf.py
 +@@ -34,7 +34,7 @@ import sqlalchemy
 + 
 + extensions = [
 +             'sphinx.ext.autodoc',
 +-            'sphinx.ext.intersphinx',
 ++#            'sphinx.ext.intersphinx',
 +                 'zzzeeksphinx',
 +                 'changelog',
 +                 'sphinx_paramlinks',

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