[Python-modules-commits] [sqlalchemy] 10/14: merge patched into master
Piotr Ożarowski
piotr at moszumanska.debian.org
Tue Oct 11 15:02:45 UTC 2016
This is an automated email from the git hooks/post-receive script.
piotr pushed a commit to branch master
in repository sqlalchemy.
commit c823dae77dc51faf7e821ec9fc751103ee138028
Merge: 17ed9bc fdeec3b
Author: Piotr Ożarowski <piotr at debian.org>
Date: Tue Oct 11 16:38:11 2016 +0200
merge patched into master
PKG-INFO | 2 +-
debian/.git-dpm | 6 +-
.../patches/0001-disable_intersphinx-module.patch | 4 +-
doc/build/changelog/changelog_01.rst | 2 +-
doc/build/changelog/changelog_06.rst | 2 +-
doc/build/changelog/changelog_09.rst | 4 +-
doc/build/changelog/changelog_10.rst | 72 +-
doc/build/changelog/changelog_11.rst | 1499 +++++++++++
doc/build/changelog/index.rst | 4 +-
doc/build/changelog/migration_09.rst | 2 +-
doc/build/changelog/migration_10.rst | 20 +-
doc/build/changelog/migration_11.rst | 2833 ++++++++++++++++++++
doc/build/conf.py | 6 +-
doc/build/core/connections.rst | 66 +
doc/build/core/defaults.rst | 5 -
doc/build/core/selectable.rst | 16 +
doc/build/core/sqlelement.rst | 12 +
doc/build/core/tutorial.rst | 266 +-
doc/build/core/type_api.rst | 4 +-
doc/build/core/type_basics.rst | 21 +-
doc/build/dialects/mysql.rst | 2 +
doc/build/dialects/postgresql.rst | 38 +-
doc/build/glossary.rst | 25 +-
doc/build/index.rst | 5 +-
doc/build/intro.rst | 67 +-
doc/build/orm/collections.rst | 36 +-
doc/build/orm/extensions/baked.rst | 11 +-
doc/build/orm/extensions/declarative/mixins.rst | 11 +-
doc/build/orm/extensions/index.rst | 1 +
doc/build/orm/extensions/indexable.rst | 13 +
doc/build/orm/extensions/mutable.rst | 7 +
doc/build/orm/loading_relationships.rst | 10 +-
doc/build/orm/persistence_techniques.rst | 106 +
doc/build/orm/relationship_persistence.rst | 7 +
doc/build/orm/session_events.rst | 237 +-
doc/build/orm/session_state_management.rst | 117 +-
doc/build/orm/tutorial.rst | 61 +-
examples/custom_attributes/__init__.py | 2 +-
.../custom_attributes/active_column_defaults.py | 108 +
lib/sqlalchemy/__init__.py | 9 +-
lib/sqlalchemy/cextension/processors.c | 14 +-
lib/sqlalchemy/cextension/resultproxy.c | 19 +-
lib/sqlalchemy/connectors/pyodbc.py | 4 +-
lib/sqlalchemy/dialects/__init__.py | 11 +
lib/sqlalchemy/dialects/firebird/base.py | 2 +-
lib/sqlalchemy/dialects/mssql/base.py | 277 +-
lib/sqlalchemy/dialects/mssql/mxodbc.py | 27 +
lib/sqlalchemy/dialects/mssql/pymssql.py | 1 +
lib/sqlalchemy/dialects/mssql/pyodbc.py | 22 +-
lib/sqlalchemy/dialects/mysql/__init__.py | 6 +-
lib/sqlalchemy/dialects/mysql/base.py | 1602 +----------
lib/sqlalchemy/dialects/mysql/enumerated.py | 301 +++
lib/sqlalchemy/dialects/mysql/json.py | 79 +
lib/sqlalchemy/dialects/mysql/mysqlconnector.py | 13 +
lib/sqlalchemy/dialects/mysql/mysqldb.py | 12 +
lib/sqlalchemy/dialects/mysql/reflection.py | 449 ++++
lib/sqlalchemy/dialects/mysql/types.py | 766 ++++++
lib/sqlalchemy/dialects/oracle/base.py | 67 +-
lib/sqlalchemy/dialects/oracle/cx_oracle.py | 16 +
lib/sqlalchemy/dialects/postgres.py | 18 -
lib/sqlalchemy/dialects/postgresql/__init__.py | 21 +-
lib/sqlalchemy/dialects/postgresql/array.py | 314 +++
lib/sqlalchemy/dialects/postgresql/base.py | 1021 ++++---
lib/sqlalchemy/dialects/postgresql/dml.py | 211 ++
.../dialects/postgresql/{constraints.py => ext.py} | 76 +-
lib/sqlalchemy/dialects/postgresql/hstore.py | 286 +-
lib/sqlalchemy/dialects/postgresql/json.py | 383 ++-
lib/sqlalchemy/dialects/postgresql/pg8000.py | 3 +-
lib/sqlalchemy/dialects/postgresql/psycopg2.py | 3 +-
lib/sqlalchemy/dialects/postgresql/pygresql.py | 243 ++
lib/sqlalchemy/dialects/sqlite/base.py | 137 +-
lib/sqlalchemy/dialects/sybase/base.py | 8 +-
lib/sqlalchemy/engine/__init__.py | 3 +-
lib/sqlalchemy/engine/base.py | 127 +-
lib/sqlalchemy/engine/default.py | 112 +-
lib/sqlalchemy/engine/interfaces.py | 136 +-
lib/sqlalchemy/engine/reflection.py | 46 +-
lib/sqlalchemy/engine/result.py | 450 +++-
lib/sqlalchemy/engine/strategies.py | 25 +-
lib/sqlalchemy/engine/url.py | 10 +-
lib/sqlalchemy/events.py | 50 +
lib/sqlalchemy/exc.py | 14 +
lib/sqlalchemy/ext/automap.py | 10 +
lib/sqlalchemy/ext/baked.py | 15 +-
lib/sqlalchemy/ext/compiler.py | 17 +-
lib/sqlalchemy/ext/declarative/api.py | 28 +-
lib/sqlalchemy/ext/hybrid.py | 43 +-
lib/sqlalchemy/ext/indexable.py | 347 +++
lib/sqlalchemy/ext/mutable.py | 184 ++
lib/sqlalchemy/orm/__init__.py | 1 +
lib/sqlalchemy/orm/attributes.py | 85 +-
lib/sqlalchemy/orm/collections.py | 72 +-
lib/sqlalchemy/orm/descriptor_props.py | 2 +-
lib/sqlalchemy/orm/dynamic.py | 7 +-
lib/sqlalchemy/orm/events.py | 390 ++-
lib/sqlalchemy/orm/identity.py | 39 +-
lib/sqlalchemy/orm/interfaces.py | 16 +-
lib/sqlalchemy/orm/loading.py | 24 +-
lib/sqlalchemy/orm/mapper.py | 104 +-
lib/sqlalchemy/orm/persistence.py | 188 +-
lib/sqlalchemy/orm/properties.py | 9 +-
lib/sqlalchemy/orm/query.py | 259 +-
lib/sqlalchemy/orm/relationships.py | 78 +-
lib/sqlalchemy/orm/session.py | 456 ++--
lib/sqlalchemy/orm/state.py | 134 +-
lib/sqlalchemy/orm/strategies.py | 95 +-
lib/sqlalchemy/orm/strategy_options.py | 104 +-
lib/sqlalchemy/orm/unitofwork.py | 13 +
lib/sqlalchemy/orm/util.py | 35 +-
lib/sqlalchemy/pool.py | 144 +-
lib/sqlalchemy/processors.py | 4 +-
lib/sqlalchemy/sql/__init__.py | 6 +
lib/sqlalchemy/sql/compiler.py | 528 ++--
lib/sqlalchemy/sql/crud.py | 173 +-
lib/sqlalchemy/sql/ddl.py | 21 +-
lib/sqlalchemy/sql/default_comparator.py | 34 +-
lib/sqlalchemy/sql/dml.py | 11 +-
lib/sqlalchemy/sql/elements.py | 635 ++++-
lib/sqlalchemy/sql/expression.py | 27 +-
lib/sqlalchemy/sql/functions.py | 215 +-
lib/sqlalchemy/sql/operators.py | 109 +-
lib/sqlalchemy/sql/schema.py | 273 +-
lib/sqlalchemy/sql/selectable.py | 544 +++-
lib/sqlalchemy/sql/sqltypes.py | 812 +++++-
lib/sqlalchemy/sql/type_api.py | 95 +-
lib/sqlalchemy/sql/util.py | 164 +-
lib/sqlalchemy/testing/__init__.py | 2 +-
lib/sqlalchemy/testing/assertions.py | 34 +-
lib/sqlalchemy/testing/assertsql.py | 9 +-
lib/sqlalchemy/testing/config.py | 7 +-
lib/sqlalchemy/testing/distutils_run.py | 11 -
lib/sqlalchemy/testing/exclusions.py | 22 +-
lib/sqlalchemy/testing/plugin/plugin_base.py | 8 +
lib/sqlalchemy/testing/plugin/pytestplugin.py | 5 +
lib/sqlalchemy/testing/provision.py | 2 +-
lib/sqlalchemy/testing/requirements.py | 83 +
lib/sqlalchemy/testing/schema.py | 5 +-
lib/sqlalchemy/testing/suite/test_reflection.py | 52 +
lib/sqlalchemy/testing/suite/test_select.py | 124 +-
lib/sqlalchemy/testing/suite/test_types.py | 261 +-
lib/sqlalchemy/types.py | 7 +-
lib/sqlalchemy/util/__init__.py | 2 +-
lib/sqlalchemy/util/langhelpers.py | 26 +-
setup.cfg | 7 +-
setup.py | 185 +-
test/aaa_profiling/test_compiler.py | 4 +-
test/aaa_profiling/test_memusage.py | 8 +-
test/base/test_tutorials.py | 3 +-
test/base/test_utils.py | 69 +
test/conftest.py | 6 +
test/dialect/mssql/test_compiler.py | 43 +-
test/dialect/mssql/test_query.py | 20 +-
test/dialect/mssql/test_reflection.py | 40 +-
test/dialect/mssql/test_types.py | 52 +-
test/dialect/mysql/test_compiler.py | 70 +-
test/dialect/mysql/test_dialect.py | 25 +
test/dialect/mysql/test_query.py | 54 +
test/dialect/mysql/test_reflection.py | 37 +-
test/dialect/mysql/test_types.py | 68 +-
test/dialect/postgresql/test_compiler.py | 483 +++-
test/dialect/postgresql/test_dialect.py | 10 +
test/dialect/postgresql/test_on_conflict.py | 397 +++
test/dialect/postgresql/test_query.py | 118 +-
test/dialect/postgresql/test_reflection.py | 58 +-
test/dialect/postgresql/test_types.py | 723 ++++-
test/dialect/test_oracle.py | 58 +-
test/dialect/test_sqlite.py | 236 +-
test/dialect/test_sybase.py | 14 +-
test/engine/test_execute.py | 214 +-
test/engine/test_logging.py | 130 +-
test/engine/test_parseconnect.py | 46 +-
test/engine/test_pool.py | 135 +
test/engine/test_processors.py | 79 +
test/engine/test_reconnect.py | 95 +-
test/engine/test_reflection.py | 60 +-
test/engine/test_transaction.py | 7 +
test/ext/declarative/test_basic.py | 19 +-
test/ext/declarative/test_inheritance.py | 52 +-
test/ext/declarative/test_mixin.py | 2 +-
test/ext/declarative/test_reflection.py | 4 +-
test/ext/test_automap.py | 37 +-
test/ext/test_baked.py | 8 +-
test/ext/test_compiler.py | 51 +-
test/ext/test_hybrid.py | 328 ++-
test/ext/test_indexable.py | 374 +++
test/ext/test_mutable.py | 413 ++-
test/orm/inheritance/_poly_fixtures.py | 1 -
test/orm/inheritance/test_basic.py | 319 ++-
test/orm/inheritance/test_concrete.py | 39 +
test/orm/inheritance/test_poly_linked_list.py | 12 +-
test/orm/inheritance/test_poly_persistence.py | 2 +-
test/orm/inheritance/test_polymorphic_rel.py | 134 +-
test/orm/inheritance/test_relationship.py | 88 +-
test/orm/inheritance/test_single.py | 15 +
test/orm/test_association.py | 11 +-
test/orm/test_bind.py | 18 +
test/orm/test_bulk.py | 32 +-
test/orm/test_cascade.py | 82 +-
test/orm/test_composites.py | 3 +-
test/orm/test_deferred.py | 27 +-
test/orm/test_dynamic.py | 30 +-
test/orm/test_eager_relations.py | 203 +-
test/orm/test_events.py | 565 +++-
test/orm/test_expire.py | 4 +-
test/orm/test_froms.py | 12 +-
test/orm/test_hasparent.py | 4 +-
test/orm/test_joins.py | 25 +-
test/orm/test_lazy_relations.py | 175 +-
test/orm/test_load_on_fks.py | 41 +-
test/orm/test_lockmode.py | 45 +-
test/orm/test_mapper.py | 204 +-
test/orm/test_merge.py | 199 +-
test/orm/test_naturalpks.py | 37 +
test/orm/test_onetoone.py | 1 -
test/orm/test_options.py | 128 +-
test/orm/test_query.py | 445 ++-
test/orm/test_relationships.py | 22 +-
test/orm/test_session.py | 105 +-
test/orm/test_subquery_relations.py | 5 +-
test/orm/test_transaction.py | 76 +-
test/orm/test_unitofwork.py | 97 +-
test/orm/test_unitofworkv2.py | 220 +-
test/orm/test_utils.py | 24 +-
test/orm/test_validators.py | 39 +-
test/orm/test_versioning.py | 32 +
test/requirements.py | 123 +-
test/sql/test_compiler.py | 455 +++-
test/sql/test_constraints.py | 342 ---
test/sql/test_cte.py | 193 +-
test/sql/test_defaults.py | 147 +-
test/sql/test_functions.py | 129 +-
test/sql/test_insert.py | 126 +-
test/sql/test_inspect.py | 10 +
test/sql/test_join_rewriting.py | 5 +
test/sql/test_lateral.py | 134 +
test/sql/test_metadata.py | 567 +++-
test/sql/test_operators.py | 616 ++++-
test/sql/test_resultset.py | 262 +-
test/sql/test_selectable.py | 74 +-
test/sql/test_tablesample.py | 54 +
test/sql/test_type_expressions.py | 7 +-
test/sql/test_types.py | 639 ++++-
test/sql/test_utils.py | 107 +
tox.ini | 87 +-
244 files changed, 27162 insertions(+), 5592 deletions(-)
diff --cc debian/.git-dpm
index 24b6fda,0000000..27ae0af
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
- f0e70f3d01ac674a2c35b8fe1407fc23d1391d29
- f0e70f3d01ac674a2c35b8fe1407fc23d1391d29
- 366de0ad86cd6332f7f59cad39250aac58275290
++fdeec3be2e2b208ea81d010c71b174b2084a0c81
++fdeec3be2e2b208ea81d010c71b174b2084a0c81
++b5e94cbae6483e20873aaa86dbb2bbe7f7ebecb5
+b5e94cbae6483e20873aaa86dbb2bbe7f7ebecb5
+sqlalchemy_1.1.1+ds1.orig.tar.gz
+1a7959d1a634a8151957c6bb7026fed27f678f52
+2724443
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-disable_intersphinx-module.patch
index 3b13e2b,0000000..79a20c5
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 f0e70f3d01ac674a2c35b8fe1407fc23d1391d29 Mon Sep 17 00:00:00 2001
++From fdeec3be2e2b208ea81d010c71b174b2084a0c81 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 5d9cf94..068a2e8 100644
++index d205856..d085e87 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