[Python-modules-commits] [sqlalchemy] 04/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 b28142a9c1e3c59eff20e0aff777640233654a1e
Merge: 73ed418 8f10041
Author: Piotr Ożarowski <piotr at debian.org>
Date:   Thu Nov 17 20:20:21 2016 +0100

    merge patched into master

 PKG-INFO                                           |   2 +-
 debian/.git-dpm                                    |   6 +-
 .../patches/0001-disable_intersphinx-module.patch  |   4 +-
 doc/build/changelog/changelog_10.rst               |  40 ++++++
 doc/build/changelog/changelog_11.rst               |  85 ++++++++++++
 doc/build/conf.py                                  |   4 +-
 doc/build/orm/extensions/associationproxy.rst      |   2 +-
 doc/build/requirements.txt                         |   2 +-
 lib/sqlalchemy/__init__.py                         |   2 +-
 lib/sqlalchemy/connectors/pyodbc.py                |  11 ++
 lib/sqlalchemy/dialects/mssql/adodbapi.py          |   9 +-
 lib/sqlalchemy/dialects/mysql/base.py              |  22 +++
 lib/sqlalchemy/dialects/mysql/enumerated.py        |  10 ++
 lib/sqlalchemy/dialects/mysql/mysqldb.py           |  18 +++
 lib/sqlalchemy/dialects/mysql/pymysql.py           |  15 +-
 lib/sqlalchemy/dialects/postgresql/base.py         |   1 +
 lib/sqlalchemy/dialects/postgresql/psycopg2.py     |  48 ++-----
 lib/sqlalchemy/dialects/sqlite/pysqlcipher.py      |  20 ++-
 lib/sqlalchemy/engine/base.py                      |   5 +-
 lib/sqlalchemy/engine/default.py                   |  46 +++++-
 lib/sqlalchemy/orm/collections.py                  |   8 +-
 lib/sqlalchemy/orm/dynamic.py                      |   4 +-
 lib/sqlalchemy/orm/mapper.py                       |  14 +-
 lib/sqlalchemy/orm/persistence.py                  |   9 +-
 lib/sqlalchemy/orm/query.py                        |   4 +-
 lib/sqlalchemy/orm/strategies.py                   |  35 +++--
 lib/sqlalchemy/sql/crud.py                         |   2 +-
 lib/sqlalchemy/testing/requirements.py             |   8 ++
 lib/sqlalchemy/testing/suite/test_results.py       | 149 +++++++++++++++++++-
 test/dialect/mssql/test_engine.py                  |  45 +++++-
 test/dialect/mysql/test_types.py                   |  24 ++++
 test/dialect/postgresql/test_compiler.py           |  12 +-
 test/dialect/postgresql/test_on_conflict.py        |  44 ++++++
 test/dialect/postgresql/test_query.py              | 133 ------------------
 test/orm/test_bulk.py                              | 154 +++++++++++++++++++++
 test/orm/test_inspect.py                           |  28 ++++
 test/orm/test_pickled.py                           |  31 +++++
 test/orm/test_relationships.py                     |  50 ++++++-
 test/sql/test_insert.py                            |  17 +++
 39 files changed, 893 insertions(+), 230 deletions(-)

diff --cc debian/.git-dpm
index 1af2ab0,0000000..9fce563
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
- 46da9df299934d06aa967cce1d96e3fa0615c306
- 46da9df299934d06aa967cce1d96e3fa0615c306
- ea616a8a0fe33469561d26ce6adb5086ca68ccb9
++8f100411906899eac3305c38c93b0f1cb15fa8e0
++8f100411906899eac3305c38c93b0f1cb15fa8e0
++e8013818e291a6062dc274ccbcee67638e468280
 +e8013818e291a6062dc274ccbcee67638e468280
 +sqlalchemy_1.1.4+ds1.orig.tar.gz
 +10ecb1e5eef8e45804bd3e6cd1d8e8d2ab25be14
 +2732338
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-disable_intersphinx-module.patch
index 56f1b72,0000000..d24dfc0
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 46da9df299934d06aa967cce1d96e3fa0615c306 Mon Sep 17 00:00:00 2001
++From 8f100411906899eac3305c38c93b0f1cb15fa8e0 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 f5785a7..7a55b79 100644
++index 992657b..68de26b 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