[Python-modules-commits] [sqlalchemy] 04/05: merge patched into master
Piotr Ożarowski
piotr at moszumanska.debian.org
Fri Mar 17 18:10:15 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 77e363ff650f4295b9359ab0932172fa0d47fd64
Merge: 37c386d 142585f
Author: Piotr Ożarowski <piotr at debian.org>
Date: Fri Mar 17 00:24:15 2017 +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 | 125 +-
doc/build/changelog/migration_11.rst | 8 +-
doc/build/conf.py | 4 +-
doc/build/core/defaults.rst | 70 +-
doc/build/core/event.rst | 2 +-
doc/build/core/selectable.rst | 1 +
doc/build/dialects/index.rst | 2 +
lib/sqlalchemy/__init__.py | 2 +-
lib/sqlalchemy/dialects/mssql/base.py | 4 +
lib/sqlalchemy/dialects/mysql/base.py | 3 +
lib/sqlalchemy/dialects/postgresql/base.py | 9 +
lib/sqlalchemy/dialects/postgresql/ext.py | 58 +-
lib/sqlalchemy/engine/reflection.py | 34 +-
lib/sqlalchemy/events.py | 24 +-
lib/sqlalchemy/ext/automap.py | 6 +-
lib/sqlalchemy/ext/baked.py | 36 +-
lib/sqlalchemy/ext/declarative/base.py | 8 +-
lib/sqlalchemy/ext/indexable.py | 6 +-
lib/sqlalchemy/orm/events.py | 2 +-
lib/sqlalchemy/orm/interfaces.py | 17 +-
lib/sqlalchemy/orm/mapper.py | 16 +
lib/sqlalchemy/orm/path_registry.py | 34 +-
lib/sqlalchemy/orm/persistence.py | 23 +-
lib/sqlalchemy/orm/query.py | 46 +-
lib/sqlalchemy/orm/strategies.py | 45 +-
lib/sqlalchemy/orm/util.py | 13 +-
lib/sqlalchemy/sql/sqltypes.py | 32 +-
test/aaa_profiling/test_memusage.py | 4 +-
test/aaa_profiling/test_orm.py | 163 +-
test/aaa_profiling/test_zoomark.py | 13 +-
test/aaa_profiling/test_zoomark_orm.py | 52 +-
test/base/test_dependency.py | 28 +-
test/base/test_events.py | 2 +-
test/base/test_except.py | 1 +
test/base/test_inspect.py | 4 +-
test/base/test_utils.py | 212 +--
test/conftest.py | 1 -
test/dialect/mssql/test_compiler.py | 1 +
test/dialect/mssql/test_engine.py | 18 +-
test/dialect/mssql/test_query.py | 2 +-
test/dialect/mssql/test_reflection.py | 64 +-
test/dialect/mssql/test_types.py | 20 +-
test/dialect/mysql/test_compiler.py | 9 +-
test/dialect/mysql/test_dialect.py | 28 +-
test/dialect/mysql/test_query.py | 24 +-
test/dialect/mysql/test_reflection.py | 15 +-
test/dialect/mysql/test_types.py | 212 ++-
test/dialect/postgresql/test_compiler.py | 59 +-
test/dialect/postgresql/test_dialect.py | 15 +-
test/dialect/postgresql/test_on_conflict.py | 1 -
test/dialect/postgresql/test_reflection.py | 4 +-
test/dialect/postgresql/test_types.py | 32 +-
test/dialect/test_firebird.py | 98 +-
test/dialect/test_mxodbc.py | 30 +-
test/dialect/test_oracle.py | 576 +++----
test/dialect/test_pyodbc.py | 3 +-
test/dialect/test_sqlite.py | 19 +-
test/dialect/test_suite.py | 2 -
test/dialect/test_sybase.py | 2 -
test/engine/test_bind.py | 24 +-
test/engine/test_ddlevents.py | 65 +-
test/engine/test_execute.py | 73 +-
test/engine/test_logging.py | 7 +-
test/engine/test_parseconnect.py | 5 +-
test/engine/test_processors.py | 23 +-
test/engine/test_reflection.py | 563 +++----
test/engine/test_transaction.py | 175 +-
test/ext/declarative/test_basic.py | 1 +
test/ext/declarative/test_inheritance.py | 43 +-
test/ext/declarative/test_reflection.py | 1 +
test/ext/test_associationproxy.py | 341 ++--
test/ext/test_automap.py | 3 +-
test/ext/test_baked.py | 84 +-
test/ext/test_compiler.py | 53 +-
test/ext/test_extendedattr.py | 12 +-
test/ext/test_horizontal_shard.py | 51 +-
test/ext/test_hybrid.py | 12 +-
test/ext/test_indexable.py | 17 +-
test/ext/test_mutable.py | 4 +-
test/ext/test_orderinglist.py | 63 +-
test/ext/test_serializer.py | 69 +-
test/orm/_fixtures.py | 266 ++--
test/orm/inheritance/_poly_fixtures.py | 143 +-
test/orm/inheritance/test_abc_inheritance.py | 119 +-
test/orm/inheritance/test_abc_polymorphic.py | 57 +-
test/orm/inheritance/test_assorted_poly.py | 1204 +++++++-------
test/orm/inheritance/test_basic.py | 1147 +++++++-------
test/orm/inheritance/test_concrete.py | 373 ++---
test/orm/inheritance/test_magazine.py | 267 ++--
test/orm/inheritance/test_manytomany.py | 145 +-
test/orm/inheritance/test_poly_linked_list.py | 169 +-
test/orm/inheritance/test_poly_persistence.py | 241 +--
test/orm/inheritance/test_polymorphic_rel.py | 156 +-
test/orm/inheritance/test_productspec.py | 247 +--
test/orm/inheritance/test_relationship.py | 775 ++++-----
test/orm/inheritance/test_selects.py | 48 +-
test/orm/inheritance/test_single.py | 542 ++++---
test/orm/inheritance/test_with_poly.py | 70 +-
test/orm/test_association.py | 98 +-
test/orm/test_assorted_eager.py | 477 +++---
test/orm/test_attributes.py | 781 +++++----
test/orm/test_backref_mutations.py | 159 +-
test/orm/test_bind.py | 2 -
test/orm/test_bulk.py | 3 +-
test/orm/test_bundle.py | 87 +-
test/orm/test_cascade.py | 1208 +++++++-------
test/orm/test_collection.py | 284 +++-
test/orm/test_compile.py | 145 +-
test/orm/test_composites.py | 318 ++--
test/orm/test_cycles.py | 618 ++++----
test/orm/test_default_strategies.py | 28 +-
test/orm/test_defaults.py | 53 +-
test/orm/test_deferred.py | 260 +--
test/orm/test_deprecations.py | 65 +-
test/orm/test_descriptor.py | 15 +-
test/orm/test_dynamic.py | 118 +-
test/orm/test_eager_relations.py | 86 +-
test/orm/test_evaluator.py | 13 +-
test/orm/test_events.py | 11 +-
test/orm/test_expire.py | 406 ++---
test/orm/test_froms.py | 253 +--
test/orm/test_generative.py | 92 +-
test/orm/test_hasparent.py | 25 +-
test/orm/test_immediate_load.py | 34 +-
test/orm/test_inspect.py | 32 +-
test/orm/test_instrumentation.py | 22 +-
test/orm/test_joins.py | 1663 +++++++++++---------
test/orm/test_lazy_relations.py | 26 +-
test/orm/test_load_on_fks.py | 55 +-
test/orm/test_loading.py | 14 +-
test/orm/test_lockmode.py | 67 +-
test/orm/test_manytomany.py | 227 ++-
test/orm/test_mapper.py | 132 +-
test/orm/test_merge.py | 434 +++--
test/orm/test_naturalpks.py | 111 +-
test/orm/test_of_type.py | 269 ++--
test/orm/test_onetoone.py | 30 +-
test/orm/test_options.py | 217 +--
test/orm/test_pickled.py | 233 ++-
test/orm/test_query.py | 182 +--
test/orm/test_rel_fn.py | 586 +++----
test/orm/test_relationships.py | 26 +-
test/orm/test_scoping.py | 19 +-
test/orm/test_selectable.py | 17 +-
test/orm/test_session.py | 141 +-
test/orm/test_subquery_relations.py | 1222 +++++++-------
test/orm/test_sync.py | 55 +-
test/orm/test_transaction.py | 5 +-
test/orm/test_unitofwork.py | 950 ++++++-----
test/orm/test_unitofworkv2.py | 48 +-
test/orm/test_utils.py | 45 +-
test/orm/test_validators.py | 86 +-
test/perf/invalidate_stresstest.py | 12 +-
test/perf/orm2010.py | 36 +-
test/requirements.py | 231 ++-
test/sql/test_compiler.py | 3 +-
test/sql/test_constraints.py | 26 +-
test/sql/test_cte.py | 5 +-
test/sql/test_defaults.py | 38 +-
test/sql/test_functions.py | 8 +-
test/sql/test_generative.py | 62 +-
test/sql/test_insert.py | 5 +-
test/sql/test_inspect.py | 1 -
test/sql/test_labels.py | 22 +-
test/sql/test_lateral.py | 3 -
test/sql/test_metadata.py | 3 +-
test/sql/test_operators.py | 28 +-
test/sql/test_query.py | 7 +-
test/sql/test_quote.py | 4 +-
test/sql/test_resultset.py | 22 +-
test/sql/test_returning.py | 1 -
test/sql/test_rowcount.py | 11 +-
test/sql/test_selectable.py | 61 +-
test/sql/test_tablesample.py | 1 -
test/sql/test_type_expressions.py | 9 +-
test/sql/test_types.py | 44 +-
test/sql/test_update.py | 13 +-
test/sql/test_utils.py | 5 +-
181 files changed, 12716 insertions(+), 10512 deletions(-)
diff --cc debian/.git-dpm
index e9c0ed6,0000000..681cc4e
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
- 721fd624ff2f3952fefc8b89c52063a5966d491c
- 721fd624ff2f3952fefc8b89c52063a5966d491c
- 961e6451915821774fc13e8fb28c642ce2681836
++142585f2e57736521a52ca9ad98d65d14404e581
++142585f2e57736521a52ca9ad98d65d14404e581
++d752d182f1776db526015e59711fd858fbd36088
+d752d182f1776db526015e59711fd858fbd36088
+sqlalchemy_1.1.6+ds1.orig.tar.gz
+e96271d3d6d52457b3c013670e3dddd3884d7208
+2748810
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-disable_intersphinx-module.patch
index 89aafd3,0000000..86b50ed
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 721fd624ff2f3952fefc8b89c52063a5966d491c Mon Sep 17 00:00:00 2001
++From 142585f2e57736521a52ca9ad98d65d14404e581 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 e4477e4f..8278a3b2 100644
++index bf2f7255..be94d264 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