[Python-modules-commits] [python-social-auth] 06/07: merge patched into master
Wolfgang Borgert
debacle at moszumanska.debian.org
Tue Jan 10 00:41:33 UTC 2017
This is an automated email from the git hooks/post-receive script.
debacle pushed a commit to branch master
in repository python-social-auth.
commit d6eb36a3c1354ba3fc2930ee846bed2e0585b75b
Merge: 91cc6fb 0bd0b98
Author: W. Martin Borgert <debacle at debian.org>
Date: Mon Jan 9 23:43:13 2017 +0000
merge patched into master
CHANGELOG.md | 94 +++++++++-
README.rst | 9 +-
debian/.git-dpm | 6 +-
...0001-use-local-docs-for-intersphinx-links.patch | 2 +-
docs/backends/battlenet.rst | 10 +-
docs/backends/edmodo.rst | 22 +++
docs/backends/facebook.rst | 2 +-
docs/backends/index.rst | 5 +
docs/backends/line.rst | 7 +
docs/backends/sketchfab.rst | 17 ++
docs/backends/twitter.rst | 5 +
docs/backends/untappd.rst | 28 +++
docs/backends/upwork.rst | 28 +++
docs/backends/vk.rst | 2 +-
docs/backends/yammer.rst | 3 +-
docs/intro.rst | 2 +
docs/pipeline.rst | 59 +++---
docs/thanks.rst | 2 +
docs/use_cases.rst | 5 -
.../cherrypy_example/local_settings.py.template | 1 +
examples/django_example/example/settings.py | 2 +
examples/django_me_example/example/settings.py | 2 +
examples/flask_example/__init__.py | 7 +-
examples/flask_example/models/user.py | 2 +-
examples/flask_example/routes/main.py | 2 +-
examples/flask_example/settings.py | 1 +
examples/flask_me_example/__init__.py | 6 +-
examples/flask_me_example/models/user.py | 2 +-
examples/flask_me_example/routes/main.py | 2 +-
examples/flask_me_example/settings.py | 1 +
.../__init__.py | 32 ++--
examples/flask_peewee_example/manage.py | 26 +++
examples/flask_peewee_example/models/__init__.py | 4 +
examples/flask_peewee_example/models/user.py | 24 +++
examples/flask_peewee_example/requirements.txt | 7 +
examples/flask_peewee_example/routes/__init__.py | 2 +
.../routes/main.py | 0
.../settings.py | 2 +-
examples/flask_peewee_example/templates/base.html | 14 ++
examples/flask_peewee_example/templates/done.html | 24 +++
examples/flask_peewee_example/templates/home.html | 85 +++++++++
examples/pyramid_example/example/settings.py | 1 +
examples/tornado_example/settings.py | 1 +
examples/webpy_example/app.py | 1 +
site/css/site.css | 4 +
site/docs | 1 +
site/img/glyphicons-halflings-white.png | Bin 0 -> 8777 bytes
site/img/glyphicons-halflings.png | Bin 0 -> 12799 bytes
site/index.html | 104 +++++++++++
social/__init__.py | 2 +-
social/actions.py | 17 +-
social/apps/django_app/default/admin.py | 16 +-
social/apps/django_app/default/config.py | 1 +
social/apps/django_app/default/fields.py | 9 +-
.../django_app/default/migrations/0001_initial.py | 2 +
.../default/migrations/0002_add_related_name.py | 11 +-
.../migrations/0003_alter_email_max_length.py | 4 +-
.../default/migrations/0004_auto_20160423_0400.py | 3 +-
.../default/migrations/0005_auto_20160727_2333.py | 19 ++
social/apps/django_app/default/models.py | 3 +
social/apps/django_app/tests.py | 1 +
social/apps/flask_app/peewee/__init__.py | 0
social/apps/flask_app/peewee/models.py | 48 +++++
social/apps/flask_app/routes.py | 2 +-
social/apps/pyramid_app/models.py | 2 +
social/apps/pyramid_app/views.py | 2 +-
social/backends/battlenet.py | 2 +-
social/backends/coding.py | 48 +++++
social/backends/coursera.py | 4 +
social/backends/dribbble.py | 2 +-
social/backends/edmodo.py | 34 ++++
social/backends/facebook.py | 8 +-
social/backends/line.py | 91 ++++++++++
social/backends/oauth.py | 10 ++
social/backends/qiita.py | 2 +-
social/backends/reddit.py | 6 +-
social/backends/sketchfab.py | 39 ++++
social/backends/uber.py | 16 +-
social/backends/untappd.py | 110 ++++++++++++
social/backends/upwork.py | 39 ++++
social/backends/weixin.py | 78 +++++++-
social/pipeline/social_auth.py | 5 +-
social/pipeline/user.py | 4 +-
social/storage/django_orm.py | 29 ++-
social/storage/peewee_orm.py | 199 +++++++++++++++++++++
social/storage/sqlalchemy_orm.py | 8 +-
social/strategies/base.py | 2 +
social/strategies/pyramid_strategy.py | 8 +-
social/tests/backends/test_edmodo.py | 44 +++++
social/tests/backends/test_facebook.py | 2 +-
social/tests/backends/test_sketchfab.py | 26 +++
social/tests/backends/test_twitter.py | 129 +++++++++++++
social/tests/backends/test_upwork.py | 53 ++++++
social/tests/test_utils.py | 52 +++++-
social/utils.py | 27 ++-
95 files changed, 1746 insertions(+), 141 deletions(-)
diff --cc debian/.git-dpm
index a524827,0000000..c45c302
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
- 394adc8933adec4f980db464822a9a4a79188e37
- 394adc8933adec4f980db464822a9a4a79188e37
- ce6c63eb29fb0603b9fda7d6695eee06c0fd1fab
++0bd0b98c864251fb46d7c368a31cb8cf7454b252
++0bd0b98c864251fb46d7c368a31cb8cf7454b252
++02d4d7708972d1bf78a5ae590cfca8bdd6533293
+02d4d7708972d1bf78a5ae590cfca8bdd6533293
+python-social-auth_0.2.21+dfsg.orig.tar.gz
+5e6d6fcb949da81d7f8cab3f41e6c05e30c151fb
+318711
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-use-local-docs-for-intersphinx-links.patch
index dafaadc,0000000..3e290e4
mode 100644,000000..100644
--- a/debian/patches/0001-use-local-docs-for-intersphinx-links.patch
+++ b/debian/patches/0001-use-local-docs-for-intersphinx-links.patch
@@@ -1,22 -1,0 +1,22 @@@
- From 394adc8933adec4f980db464822a9a4a79188e37 Mon Sep 17 00:00:00 2001
++From 0bd0b98c864251fb46d7c368a31cb8cf7454b252 Mon Sep 17 00:00:00 2001
+From: "W. Martin Borgert" <debacle at debian.org>
+Date: Tue, 26 Jul 2016 12:35:03 +0200
+Subject: use local docs for intersphinx links
+
+Bug-Debian: https://bugs.debian.org/830608
+Origin: vendor
+Last-Update: 2016-07-26
+---
+ docs/conf.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/docs/conf.py b/docs/conf.py
+index e8692b2..2993bdc 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -19,4 +19,4 @@ man_pages = [
+ ('index', 'pythonsocialauth', u'Python Social Auth Documentation',
+ [u'Matías Aguirre'], 1)
+ ]
+-intersphinx_mapping = {'http://docs.python.org/': None}
++intersphinx_mapping = {'/usr/share/doc/python3-doc/html': None}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-social-auth.git
More information about the Python-modules-commits
mailing list