[Python-modules-commits] [sqlalchemy] 04/05: merge patched into master
Piotr Ożarowski
piotr at moszumanska.debian.org
Sun Jan 22 14:55:11 UTC 2017
This is an automated email from the git hooks/post-receive script.
piotr pushed a commit to branch master
in repository sqlalchemy.
commit 72d87d3968af96c97f92eb15d498761e082a3a16
Merge: 89b15a3 721fd62
Author: Piotr Ożarowski <piotr at debian.org>
Date: Sun Jan 22 15:50:19 2017 +0100
merge patched into master
LICENSE | 2 +-
PKG-INFO | 2 +-
debian/.git-dpm | 6 +-
.../patches/0001-disable_intersphinx-module.patch | 4 +-
doc/build/changelog/changelog_10.rst | 22 ++
doc/build/changelog/changelog_11.rst | 191 +++++++++++++++++
doc/build/conf.py | 6 +-
doc/build/copyright.rst | 2 +-
doc/build/orm/session_basics.rst | 2 +-
doc/build/orm/tutorial.rst | 15 +-
doc/build/orm/versioning.rst | 4 +-
examples/versioned_history/history_meta.py | 5 +
examples/versioned_history/test_versioning.py | 46 ++++-
lib/sqlalchemy/__init__.py | 4 +-
lib/sqlalchemy/cextension/processors.c | 2 +-
lib/sqlalchemy/cextension/resultproxy.c | 2 +-
lib/sqlalchemy/cextension/utils.c | 2 +-
lib/sqlalchemy/connectors/__init__.py | 2 +-
lib/sqlalchemy/connectors/mxodbc.py | 4 +-
lib/sqlalchemy/connectors/pyodbc.py | 4 +-
lib/sqlalchemy/connectors/zxJDBC.py | 2 +-
lib/sqlalchemy/databases/__init__.py | 2 +-
lib/sqlalchemy/dialects/__init__.py | 2 +-
lib/sqlalchemy/dialects/firebird/__init__.py | 2 +-
lib/sqlalchemy/dialects/firebird/base.py | 13 +-
lib/sqlalchemy/dialects/firebird/fdb.py | 2 +-
lib/sqlalchemy/dialects/firebird/kinterbasdb.py | 4 +-
lib/sqlalchemy/dialects/mssql/__init__.py | 2 +-
lib/sqlalchemy/dialects/mssql/adodbapi.py | 2 +-
lib/sqlalchemy/dialects/mssql/base.py | 5 +-
.../dialects/mssql/information_schema.py | 2 +-
lib/sqlalchemy/dialects/mssql/mxodbc.py | 2 +-
lib/sqlalchemy/dialects/mssql/pymssql.py | 2 +-
lib/sqlalchemy/dialects/mssql/pyodbc.py | 6 +-
lib/sqlalchemy/dialects/mssql/zxjdbc.py | 2 +-
lib/sqlalchemy/dialects/mysql/__init__.py | 2 +-
lib/sqlalchemy/dialects/mysql/base.py | 29 ++-
lib/sqlalchemy/dialects/mysql/cymysql.py | 4 +-
lib/sqlalchemy/dialects/mysql/enumerated.py | 2 +-
lib/sqlalchemy/dialects/mysql/gaerdbms.py | 2 +-
lib/sqlalchemy/dialects/mysql/json.py | 2 +-
lib/sqlalchemy/dialects/mysql/mysqlconnector.py | 2 +-
lib/sqlalchemy/dialects/mysql/mysqldb.py | 4 +-
lib/sqlalchemy/dialects/mysql/oursql.py | 4 +-
lib/sqlalchemy/dialects/mysql/pymysql.py | 2 +-
lib/sqlalchemy/dialects/mysql/pyodbc.py | 2 +-
lib/sqlalchemy/dialects/mysql/reflection.py | 3 +-
lib/sqlalchemy/dialects/mysql/types.py | 2 +-
lib/sqlalchemy/dialects/mysql/zxjdbc.py | 4 +-
lib/sqlalchemy/dialects/oracle/__init__.py | 2 +-
lib/sqlalchemy/dialects/oracle/base.py | 4 +-
lib/sqlalchemy/dialects/oracle/cx_oracle.py | 2 +-
lib/sqlalchemy/dialects/oracle/zxjdbc.py | 2 +-
lib/sqlalchemy/dialects/postgresql/__init__.py | 2 +-
lib/sqlalchemy/dialects/postgresql/array.py | 2 +-
lib/sqlalchemy/dialects/postgresql/base.py | 128 +++++++++---
lib/sqlalchemy/dialects/postgresql/dml.py | 6 +-
lib/sqlalchemy/dialects/postgresql/ext.py | 4 +-
lib/sqlalchemy/dialects/postgresql/hstore.py | 2 +-
lib/sqlalchemy/dialects/postgresql/json.py | 2 +-
lib/sqlalchemy/dialects/postgresql/pg8000.py | 2 +-
lib/sqlalchemy/dialects/postgresql/psycopg2.py | 2 +-
lib/sqlalchemy/dialects/postgresql/psycopg2cffi.py | 2 +-
lib/sqlalchemy/dialects/postgresql/pygresql.py | 2 +-
lib/sqlalchemy/dialects/postgresql/pypostgresql.py | 2 +-
lib/sqlalchemy/dialects/postgresql/ranges.py | 2 +-
lib/sqlalchemy/dialects/postgresql/zxjdbc.py | 2 +-
lib/sqlalchemy/dialects/sqlite/__init__.py | 2 +-
lib/sqlalchemy/dialects/sqlite/base.py | 34 ++--
lib/sqlalchemy/dialects/sqlite/pysqlcipher.py | 2 +-
lib/sqlalchemy/dialects/sqlite/pysqlite.py | 6 +-
lib/sqlalchemy/dialects/sybase/__init__.py | 2 +-
lib/sqlalchemy/dialects/sybase/base.py | 2 +-
lib/sqlalchemy/dialects/sybase/mxodbc.py | 2 +-
lib/sqlalchemy/dialects/sybase/pyodbc.py | 2 +-
lib/sqlalchemy/dialects/sybase/pysybase.py | 2 +-
lib/sqlalchemy/engine/__init__.py | 2 +-
lib/sqlalchemy/engine/base.py | 18 +-
lib/sqlalchemy/engine/default.py | 7 +-
lib/sqlalchemy/engine/interfaces.py | 6 +-
lib/sqlalchemy/engine/reflection.py | 18 +-
lib/sqlalchemy/engine/result.py | 2 +-
lib/sqlalchemy/engine/strategies.py | 2 +-
lib/sqlalchemy/engine/threadlocal.py | 4 +-
lib/sqlalchemy/engine/url.py | 4 +-
lib/sqlalchemy/engine/util.py | 2 +-
lib/sqlalchemy/event/__init__.py | 2 +-
lib/sqlalchemy/event/api.py | 2 +-
lib/sqlalchemy/event/attr.py | 2 +-
lib/sqlalchemy/event/base.py | 2 +-
lib/sqlalchemy/event/legacy.py | 2 +-
lib/sqlalchemy/event/registry.py | 2 +-
lib/sqlalchemy/events.py | 16 +-
lib/sqlalchemy/exc.py | 2 +-
lib/sqlalchemy/ext/__init__.py | 2 +-
lib/sqlalchemy/ext/associationproxy.py | 4 +-
lib/sqlalchemy/ext/automap.py | 10 +-
lib/sqlalchemy/ext/baked.py | 2 +-
lib/sqlalchemy/ext/compiler.py | 8 +-
lib/sqlalchemy/ext/declarative/__init__.py | 2 +-
lib/sqlalchemy/ext/declarative/api.py | 4 +-
lib/sqlalchemy/ext/declarative/base.py | 2 +-
lib/sqlalchemy/ext/declarative/clsregistry.py | 2 +-
lib/sqlalchemy/ext/horizontal_shard.py | 2 +-
lib/sqlalchemy/ext/hybrid.py | 22 +-
lib/sqlalchemy/ext/indexable.py | 2 +-
lib/sqlalchemy/ext/mutable.py | 8 +-
lib/sqlalchemy/ext/orderinglist.py | 2 +-
lib/sqlalchemy/ext/serializer.py | 2 +-
lib/sqlalchemy/inspection.py | 2 +-
lib/sqlalchemy/interfaces.py | 2 +-
lib/sqlalchemy/log.py | 2 +-
lib/sqlalchemy/orm/__init__.py | 6 +-
lib/sqlalchemy/orm/attributes.py | 4 +-
lib/sqlalchemy/orm/base.py | 2 +-
lib/sqlalchemy/orm/collections.py | 2 +-
lib/sqlalchemy/orm/dependency.py | 2 +-
lib/sqlalchemy/orm/deprecated_interfaces.py | 2 +-
lib/sqlalchemy/orm/descriptor_props.py | 4 +-
lib/sqlalchemy/orm/dynamic.py | 2 +-
lib/sqlalchemy/orm/evaluator.py | 2 +-
lib/sqlalchemy/orm/events.py | 6 +-
lib/sqlalchemy/orm/exc.py | 2 +-
lib/sqlalchemy/orm/identity.py | 2 +-
lib/sqlalchemy/orm/instrumentation.py | 2 +-
lib/sqlalchemy/orm/interfaces.py | 18 +-
lib/sqlalchemy/orm/loading.py | 2 +-
lib/sqlalchemy/orm/mapper.py | 8 +-
lib/sqlalchemy/orm/path_registry.py | 2 +-
lib/sqlalchemy/orm/persistence.py | 2 +-
lib/sqlalchemy/orm/properties.py | 4 +-
lib/sqlalchemy/orm/query.py | 225 ++++++++++-----------
lib/sqlalchemy/orm/relationships.py | 2 +-
lib/sqlalchemy/orm/scoping.py | 4 +-
lib/sqlalchemy/orm/session.py | 19 +-
lib/sqlalchemy/orm/state.py | 2 +-
lib/sqlalchemy/orm/strategies.py | 25 ++-
lib/sqlalchemy/orm/strategy_options.py | 16 +-
lib/sqlalchemy/orm/sync.py | 2 +-
lib/sqlalchemy/orm/unitofwork.py | 2 +-
lib/sqlalchemy/orm/util.py | 20 +-
lib/sqlalchemy/pool.py | 8 +-
lib/sqlalchemy/processors.py | 8 +-
lib/sqlalchemy/schema.py | 2 +-
lib/sqlalchemy/sql/__init__.py | 2 +-
lib/sqlalchemy/sql/annotation.py | 2 +-
lib/sqlalchemy/sql/base.py | 2 +-
lib/sqlalchemy/sql/compiler.py | 16 +-
lib/sqlalchemy/sql/crud.py | 6 +-
lib/sqlalchemy/sql/ddl.py | 4 +-
lib/sqlalchemy/sql/default_comparator.py | 2 +-
lib/sqlalchemy/sql/dml.py | 28 +--
lib/sqlalchemy/sql/elements.py | 52 ++---
lib/sqlalchemy/sql/expression.py | 4 +-
lib/sqlalchemy/sql/functions.py | 10 +-
lib/sqlalchemy/sql/naming.py | 2 +-
lib/sqlalchemy/sql/operators.py | 26 ++-
lib/sqlalchemy/sql/schema.py | 48 +++--
lib/sqlalchemy/sql/selectable.py | 71 +++----
lib/sqlalchemy/sql/sqltypes.py | 56 ++++-
lib/sqlalchemy/sql/type_api.py | 5 +-
lib/sqlalchemy/sql/util.py | 4 +-
lib/sqlalchemy/sql/visitors.py | 2 +-
lib/sqlalchemy/testing/__init__.py | 2 +-
lib/sqlalchemy/testing/assertions.py | 2 +-
lib/sqlalchemy/testing/assertsql.py | 2 +-
lib/sqlalchemy/testing/config.py | 2 +-
lib/sqlalchemy/testing/engines.py | 2 +-
lib/sqlalchemy/testing/entities.py | 2 +-
lib/sqlalchemy/testing/exclusions.py | 2 +-
lib/sqlalchemy/testing/fixtures.py | 2 +-
lib/sqlalchemy/testing/mock.py | 2 +-
lib/sqlalchemy/testing/pickleable.py | 2 +-
lib/sqlalchemy/testing/plugin/noseplugin.py | 2 +-
lib/sqlalchemy/testing/plugin/plugin_base.py | 2 +-
lib/sqlalchemy/testing/profiling.py | 2 +-
lib/sqlalchemy/testing/requirements.py | 2 +-
lib/sqlalchemy/testing/runner.py | 2 +-
lib/sqlalchemy/testing/schema.py | 2 +-
lib/sqlalchemy/testing/suite/test_insert.py | 50 +++++
lib/sqlalchemy/testing/suite/test_reflection.py | 40 +++-
lib/sqlalchemy/testing/suite/test_types.py | 59 +++++-
lib/sqlalchemy/testing/util.py | 2 +-
lib/sqlalchemy/testing/warnings.py | 9 +-
lib/sqlalchemy/types.py | 2 +-
lib/sqlalchemy/util/__init__.py | 2 +-
lib/sqlalchemy/util/_collections.py | 2 +-
lib/sqlalchemy/util/compat.py | 68 ++++---
lib/sqlalchemy/util/deprecations.py | 2 +-
lib/sqlalchemy/util/langhelpers.py | 6 +-
lib/sqlalchemy/util/queue.py | 2 +-
lib/sqlalchemy/util/topological.py | 2 +-
setup.cfg | 2 +-
setup.py | 4 +-
test/dialect/mysql/test_compiler.py | 8 +
test/dialect/mysql/test_reflection.py | 12 ++
test/dialect/postgresql/test_compiler.py | 47 ++++-
test/dialect/postgresql/test_on_conflict.py | 41 +++-
test/dialect/postgresql/test_types.py | 6 +-
test/dialect/test_oracle.py | 23 ---
test/dialect/test_sqlite.py | 6 +-
test/engine/test_execute.py | 6 +-
test/engine/test_logging.py | 20 +-
test/engine/test_reflection.py | 48 ++++-
test/engine/test_transaction.py | 4 +-
test/ext/declarative/test_clsregistry.py | 4 +-
test/ext/test_associationproxy.py | 4 +-
test/orm/inheritance/test_basic.py | 59 ------
test/orm/inheritance/test_relationship.py | 72 ++++++-
test/orm/inheritance/test_single.py | 170 ++++++++++++++--
test/orm/test_composites.py | 4 +-
test/orm/test_events.py | 12 +-
test/orm/test_instrumentation.py | 8 +-
test/orm/test_joins.py | 8 +-
test/orm/test_query.py | 6 +-
test/orm/test_relationships.py | 8 +-
test/orm/test_session.py | 19 +-
test/orm/test_subquery_relations.py | 121 ++++++++++-
test/orm/test_transaction.py | 14 +-
test/orm/test_unitofworkv2.py | 30 +--
test/requirements.py | 4 +
test/sql/test_compiler.py | 54 ++++-
test/sql/test_insert.py | 33 ++-
test/sql/test_metadata.py | 6 +-
test/sql/test_query.py | 2 +-
test/sql/test_resultset.py | 2 +-
test/sql/test_returning.py | 2 +-
test/sql/test_text.py | 14 +-
test/sql/test_types.py | 22 +-
test/sql/test_update.py | 4 +-
tox.ini | 3 +-
231 files changed, 1960 insertions(+), 821 deletions(-)
diff --cc debian/.git-dpm
index e5e8c82,0000000..da18648
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
- 8f100411906899eac3305c38c93b0f1cb15fa8e0
- 8f100411906899eac3305c38c93b0f1cb15fa8e0
- e8013818e291a6062dc274ccbcee67638e468280
++721fd624ff2f3952fefc8b89c52063a5966d491c
++721fd624ff2f3952fefc8b89c52063a5966d491c
++961e6451915821774fc13e8fb28c642ce2681836
+961e6451915821774fc13e8fb28c642ce2681836
+sqlalchemy_1.1.5+ds1.orig.tar.gz
+5dbe3dc2b2883733b3e9849c65920a48500f60b0
+2743348
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-disable_intersphinx-module.patch
index d24dfc0,0000000..89aafd3
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 8f100411906899eac3305c38c93b0f1cb15fa8e0 Mon Sep 17 00:00:00 2001
++From 721fd624ff2f3952fefc8b89c52063a5966d491c 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 992657b..68de26b 100644
++index e4477e4f..8278a3b2 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
More information about the Python-modules-commits
mailing list