[Python-modules-commits] [sqlalchemy] 04/06: merge patched into master
Piotr Ożarowski
piotr at moszumanska.debian.org
Tue Jun 20 18:44:31 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 2620e9d981e5c005f87a8fc4d5ac82c2458c0a73
Merge: 0da1dff e2f81d2
Author: Piotr Ożarowski <piotr at debian.org>
Date: Tue Jun 20 20:28:28 2017 +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 | 4 +-
doc/build/changelog/changelog_02.rst | 4 +-
doc/build/changelog/changelog_03.rst | 4 +-
doc/build/changelog/changelog_04.rst | 4 +-
doc/build/changelog/changelog_05.rst | 4 +-
doc/build/changelog/changelog_06.rst | 4 +-
doc/build/changelog/changelog_07.rst | 4 +-
doc/build/changelog/changelog_08.rst | 4 +-
doc/build/changelog/changelog_09.rst | 4 +-
doc/build/changelog/changelog_10.rst | 19 +-
doc/build/changelog/changelog_11.rst | 321 ++++-
doc/build/changelog/index.rst | 2 +-
doc/build/changelog/migration_06.rst | 4 +-
doc/build/changelog/migration_07.rst | 4 +-
doc/build/changelog/migration_08.rst | 18 +-
doc/build/changelog/migration_10.rst | 42 +-
doc/build/changelog/migration_11.rst | 69 +-
doc/build/conf.py | 4 +-
doc/build/core/api_basics.rst | 4 +-
doc/build/core/connections.rst | 8 +-
doc/build/core/constraints.rst | 15 +-
doc/build/core/custom_types.rst | 2 +-
doc/build/core/ddl.rst | 2 +-
doc/build/core/defaults.rst | 224 ++--
doc/build/core/engines.rst | 6 +-
doc/build/core/event.rst | 4 +-
doc/build/core/events.rst | 8 +-
doc/build/core/interfaces.rst | 2 +-
doc/build/core/metadata.rst | 2 +-
doc/build/core/pooling.rst | 10 +-
doc/build/core/reflection.rst | 4 +-
doc/build/core/tutorial.rst | 30 +-
doc/build/core/type_api.rst | 2 +-
doc/build/core/type_basics.rst | 4 +-
doc/build/dialects/index.rst | 2 +-
doc/build/dialects/mssql.rst | 43 +-
doc/build/dialects/mysql.rst | 16 +-
doc/build/dialects/oracle.rst | 6 +-
doc/build/dialects/postgresql.rst | 4 +-
doc/build/dialects/sqlite.rst | 2 +-
doc/build/dialects/sybase.rst | 6 +-
doc/build/faq/connections.rst | 8 +-
doc/build/faq/index.rst | 4 +-
doc/build/faq/metadata_schema.rst | 10 +-
doc/build/faq/ormconfiguration.rst | 10 +-
doc/build/faq/performance.rst | 52 +-
doc/build/faq/sessions.rst | 8 +-
doc/build/faq/sqlexpressions.rst | 2 +-
doc/build/orm/backref.rst | 4 +-
doc/build/orm/basic_relationships.rst | 10 +-
doc/build/orm/collections.rst | 18 +-
doc/build/orm/composites.rst | 2 +-
doc/build/orm/constructors.rst | 2 +-
doc/build/orm/contextual.rst | 4 +-
doc/build/orm/deprecated.rst | 8 +-
doc/build/orm/events.rst | 6 +-
doc/build/orm/examples.rst | 28 +-
doc/build/orm/extending.rst | 10 +-
doc/build/orm/extensions/associationproxy.rst | 4 +-
doc/build/orm/extensions/declarative/api.rst | 2 +-
doc/build/orm/extensions/declarative/basic_use.rst | 2 +-
doc/build/orm/extensions/declarative/mixins.rst | 8 +-
.../orm/extensions/declarative/table_config.rst | 2 +-
doc/build/orm/extensions/indexable.rst | 2 +-
doc/build/orm/extensions/instrumentation.rst | 2 +-
doc/build/orm/extensions/mutable.rst | 14 +-
doc/build/orm/index.rst | 2 +-
doc/build/orm/inheritance.rst | 1303 +++++++++-----------
doc/build/orm/inheritance_loading.rst | 660 ++++++++++
doc/build/orm/join_conditions.rst | 12 +-
doc/build/orm/loading_columns.rst | 8 +-
doc/build/orm/loading_objects.rst | 5 +-
doc/build/orm/loading_relationships.rst | 886 +++++++++----
doc/build/orm/mapped_attributes.rst | 2 +-
doc/build/orm/mapped_sql_expr.rst | 4 +-
doc/build/orm/mapping_columns.rst | 2 +-
doc/build/orm/nonstandard_mappings.rst | 2 +-
doc/build/orm/persistence_techniques.rst | 4 +-
doc/build/orm/query.rst | 6 +-
doc/build/orm/relationship_persistence.rst | 2 +-
doc/build/orm/self_referential.rst | 6 +-
doc/build/orm/session_api.rst | 10 +-
doc/build/orm/session_basics.rst | 20 +-
doc/build/orm/session_events.rst | 12 +-
doc/build/orm/session_state_management.rst | 2 +-
doc/build/orm/session_transaction.rst | 17 +-
doc/build/orm/tutorial.rst | 10 +-
doc/build/orm/versioning.rst | 10 +-
doc/build/requirements.txt | 2 +-
examples/adjacency_list/__init__.py | 1 -
examples/adjacency_list/adjacency_list.py | 59 +-
examples/association/__init__.py | 2 +-
examples/association/basic_association.py | 16 +-
examples/association/dict_of_sets_with_default.py | 13 +-
examples/association/proxied_association.py | 22 +-
examples/inheritance/__init__.py | 4 +-
examples/inheritance/concrete.py | 193 ++-
examples/inheritance/joined.py | 111 +-
examples/inheritance/single.py | 199 +--
lib/sqlalchemy/__init__.py | 2 +-
lib/sqlalchemy/dialects/mssql/base.py | 63 +-
lib/sqlalchemy/dialects/mysql/base.py | 93 +-
lib/sqlalchemy/dialects/oracle/base.py | 2 +-
lib/sqlalchemy/dialects/oracle/cx_oracle.py | 111 +-
lib/sqlalchemy/dialects/postgresql/base.py | 51 +-
lib/sqlalchemy/dialects/sqlite/base.py | 14 +-
lib/sqlalchemy/engine/base.py | 19 +-
lib/sqlalchemy/engine/default.py | 8 +-
lib/sqlalchemy/engine/result.py | 7 +-
lib/sqlalchemy/ext/automap.py | 4 +-
lib/sqlalchemy/ext/baked.py | 2 +-
lib/sqlalchemy/ext/declarative/base.py | 8 +-
lib/sqlalchemy/ext/mutable.py | 21 +-
lib/sqlalchemy/orm/exc.py | 2 +-
lib/sqlalchemy/orm/mapper.py | 14 +-
lib/sqlalchemy/orm/query.py | 118 +-
lib/sqlalchemy/orm/relationships.py | 15 +-
lib/sqlalchemy/orm/session.py | 60 +-
lib/sqlalchemy/orm/strategies.py | 27 +-
lib/sqlalchemy/orm/strategy_options.py | 157 ++-
lib/sqlalchemy/orm/util.py | 10 +-
lib/sqlalchemy/sql/annotation.py | 7 +
lib/sqlalchemy/sql/compiler.py | 8 +-
lib/sqlalchemy/sql/elements.py | 10 +-
lib/sqlalchemy/sql/schema.py | 121 +-
lib/sqlalchemy/sql/selectable.py | 38 +-
lib/sqlalchemy/sql/sqltypes.py | 87 +-
lib/sqlalchemy/sql/type_api.py | 28 +-
lib/sqlalchemy/testing/assertions.py | 9 +-
lib/sqlalchemy/testing/engines.py | 3 +
lib/sqlalchemy/testing/provision.py | 6 +
lib/sqlalchemy/util/langhelpers.py | 18 +-
setup.cfg | 3 +-
test/aaa_profiling/test_memusage.py | 50 +-
test/dialect/mssql/test_reflection.py | 34 +-
test/dialect/mysql/test_compiler.py | 44 +-
test/dialect/mysql/test_dialect.py | 101 +-
test/dialect/postgresql/test_compiler.py | 26 +
test/dialect/postgresql/test_dialect.py | 16 +-
test/dialect/postgresql/test_on_conflict.py | 29 +
test/dialect/postgresql/test_types.py | 116 +-
test/dialect/test_oracle.py | 50 +-
test/engine/test_execute.py | 22 +-
test/engine/test_reconnect.py | 61 +-
test/ext/test_baked.py | 28 +
test/ext/test_mutable.py | 49 +-
test/orm/inheritance/_poly_fixtures.py | 4 +
test/orm/test_cascade.py | 139 +++
test/orm/test_froms.py | 25 +
test/orm/test_options.py | 51 +-
test/orm/test_subquery_relations.py | 91 +-
test/orm/test_unitofwork.py | 45 +-
test/requirements.py | 12 +
test/sql/test_compiler.py | 46 +-
test/sql/test_generative.py | 10 +
test/sql/test_insert_exec.py | 2 +-
test/sql/test_metadata.py | 69 +-
test/sql/test_resultset.py | 44 +
test/sql/test_types.py | 136 +-
tox.ini | 6 +-
163 files changed, 5154 insertions(+), 2064 deletions(-)
diff --cc debian/.git-dpm
index 6483acb,0000000..243279a
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
- 142585f2e57736521a52ca9ad98d65d14404e581
- 142585f2e57736521a52ca9ad98d65d14404e581
- d752d182f1776db526015e59711fd858fbd36088
++e2f81d2baa03f68f0086b0d2f44f972aaa833d6d
++e2f81d2baa03f68f0086b0d2f44f972aaa833d6d
++c9210bf88490b3cf31e71557e8812f426006e6df
+c9210bf88490b3cf31e71557e8812f426006e6df
+sqlalchemy_1.1.11+ds1.orig.tar.gz
+409848030e980e4108a9ae17591b37d0c0333145
+2770315
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-disable_intersphinx-module.patch
index 86b50ed,0000000..522230c
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 142585f2e57736521a52ca9ad98d65d14404e581 Mon Sep 17 00:00:00 2001
++From e2f81d2baa03f68f0086b0d2f44f972aaa833d6d 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 bf2f7255..be94d264 100644
++index 50615476..08d44f82 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