[Python-modules-commits] [sqlalchemy] 04/04: merge patched into master
Piotr Ożarowski
piotr at moszumanska.debian.org
Wed Oct 19 17:20:53 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 c20e4656d58d0be395ff703a2f52bc508c4d5746
Merge: c94b9fa 49df509
Author: Piotr Ożarowski <piotr at debian.org>
Date: Wed Oct 19 19:12:42 2016 +0200
merge patched into master
PKG-INFO | 2 +-
README.unittests.rst | 6 +-
debian/.git-dpm | 6 +-
.../patches/0001-disable_intersphinx-module.patch | 4 +-
doc/build/changelog/changelog_03.rst | 6 +-
doc/build/changelog/changelog_05.rst | 4 +-
doc/build/changelog/changelog_06.rst | 20 +--
doc/build/changelog/changelog_07.rst | 22 +--
doc/build/changelog/changelog_08.rst | 42 ++---
doc/build/changelog/changelog_09.rst | 36 ++---
doc/build/changelog/changelog_10.rst | 46 +++---
doc/build/changelog/changelog_11.rst | 63 +++++++-
doc/build/changelog/migration_06.rst | 22 +--
doc/build/changelog/migration_07.rst | 12 +-
doc/build/changelog/migration_08.rst | 16 +-
doc/build/changelog/migration_09.rst | 20 +--
doc/build/changelog/migration_10.rst | 32 ++--
doc/build/changelog/migration_11.rst | 2 +-
doc/build/conf.py | 4 +-
doc/build/core/constraints.rst | 6 +-
doc/build/core/custom_types.rst | 12 +-
doc/build/core/ddl.rst | 4 +-
doc/build/core/defaults.rst | 10 +-
doc/build/core/engines.rst | 6 +-
doc/build/core/reflection.rst | 2 +-
doc/build/core/sqlelement.rst | 15 +-
doc/build/core/tutorial.rst | 8 +-
doc/build/core/type_basics.rst | 2 +-
doc/build/dialects/index.rst | 4 +-
doc/build/faq/connections.rst | 2 +-
doc/build/glossary.rst | 6 +-
doc/build/orm/join_conditions.rst | 4 +-
doc/build/orm/session_transaction.rst | 2 +-
doc/build/orm/tutorial.rst | 6 +-
doc/build/orm/versioning.rst | 10 +-
examples/postgis/postgis.py | 4 +-
lib/sqlalchemy/__init__.py | 2 +-
lib/sqlalchemy/dialects/postgresql/array.py | 6 +-
lib/sqlalchemy/dialects/postgresql/base.py | 90 +++++------
lib/sqlalchemy/dialects/postgresql/dml.py | 2 +-
lib/sqlalchemy/dialects/postgresql/ext.py | 4 +-
lib/sqlalchemy/dialects/postgresql/hstore.py | 10 +-
lib/sqlalchemy/dialects/postgresql/json.py | 8 +-
lib/sqlalchemy/dialects/postgresql/psycopg2.py | 16 +-
lib/sqlalchemy/dialects/postgresql/ranges.py | 14 +-
.../dialects/type_migration_guidelines.txt | 4 +-
lib/sqlalchemy/engine/__init__.py | 4 +-
lib/sqlalchemy/engine/base.py | 6 +-
lib/sqlalchemy/engine/default.py | 2 +-
lib/sqlalchemy/engine/interfaces.py | 6 +-
lib/sqlalchemy/engine/reflection.py | 2 +-
lib/sqlalchemy/engine/result.py | 4 +-
lib/sqlalchemy/ext/baked.py | 16 +-
lib/sqlalchemy/ext/compiler.py | 2 +-
lib/sqlalchemy/ext/declarative/api.py | 3 -
lib/sqlalchemy/ext/indexable.py | 10 +-
lib/sqlalchemy/orm/loading.py | 42 +++--
lib/sqlalchemy/orm/query.py | 8 +-
lib/sqlalchemy/orm/strategies.py | 5 +-
lib/sqlalchemy/orm/strategy_options.py | 8 +
lib/sqlalchemy/pool.py | 2 +-
lib/sqlalchemy/sql/crud.py | 6 +-
lib/sqlalchemy/sql/ddl.py | 8 +-
lib/sqlalchemy/sql/dml.py | 4 +-
lib/sqlalchemy/sql/elements.py | 8 +-
lib/sqlalchemy/sql/functions.py | 2 +-
lib/sqlalchemy/sql/operators.py | 4 +-
lib/sqlalchemy/sql/schema.py | 18 ++-
lib/sqlalchemy/sql/selectable.py | 26 ++--
lib/sqlalchemy/sql/sqltypes.py | 25 +--
lib/sqlalchemy/sql/type_api.py | 4 +-
lib/sqlalchemy/testing/requirements.py | 4 +-
lib/sqlalchemy/testing/suite/test_results.py | 2 +-
lib/sqlalchemy/util/langhelpers.py | 3 +-
test/base/test_utils.py | 13 ++
test/dialect/postgresql/test_compiler.py | 22 +++
test/dialect/postgresql/test_on_conflict.py | 34 +++++
test/dialect/postgresql/test_types.py | 4 +-
test/engine/test_pool.py | 2 +-
test/ext/test_baked.py | 72 ++++++++-
test/orm/test_deferred.py | 48 ++++++
test/orm/test_eager_relations.py | 39 ++++-
test/orm/test_expire.py | 41 +++++
test/orm/test_lazy_relations.py | 2 +-
test/orm/test_merge.py | 2 +-
test/orm/test_subquery_relations.py | 2 +-
test/requirements.py | 2 +-
test/sql/test_generative.py | 4 +-
test/sql/test_insert.py | 170 ++++++++++-----------
test/sql/test_inspect.py | 2 +-
test/sql/test_metadata.py | 47 +++++-
test/sql/test_resultset.py | 2 +-
test/sql/test_returning.py | 2 +-
test/sql/test_update.py | 2 +-
94 files changed, 886 insertions(+), 484 deletions(-)
diff --cc debian/.git-dpm
index 3332336,0000000..9fdb24d
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
- fdeec3be2e2b208ea81d010c71b174b2084a0c81
- fdeec3be2e2b208ea81d010c71b174b2084a0c81
- b5e94cbae6483e20873aaa86dbb2bbe7f7ebecb5
++49df509851d43eae66825df3a5b30c5145c0308a
++49df509851d43eae66825df3a5b30c5145c0308a
++c7782a7b2c28c48033ee9d6a1749dd48d10b6dc2
+c7782a7b2c28c48033ee9d6a1749dd48d10b6dc2
+sqlalchemy_1.1.2+ds1.orig.tar.gz
+d977b117da81df05d821d89c4333c3ccf32f7818
+2725616
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-disable_intersphinx-module.patch
index 79a20c5,0000000..9d32a27
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 fdeec3be2e2b208ea81d010c71b174b2084a0c81 Mon Sep 17 00:00:00 2001
++From 49df509851d43eae66825df3a5b30c5145c0308a 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 d205856..d085e87 100644
++index 9050b53..a34a8c7 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