[Python-modules-commits] [django-oauth-toolkit] 05/07: merge patched-experimental into experimental
Michael Fladischer
fladi at moszumanska.debian.org
Fri Mar 10 08:01:25 UTC 2017
This is an automated email from the git hooks/post-receive script.
fladi pushed a commit to branch experimental
in repository django-oauth-toolkit.
commit 135afc3a85d33c76d7f85c1b7a3b72729320db49
Merge: 3ca78b5 1d96ba2
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Tue Mar 7 10:14:46 2017 +0100
merge patched-experimental into experimental
.travis.yml | 26 ++-
README.rst => CHANGELOG.md | 198 +++++------------
README.rst | 226 +------------------
debian/.git-dpm | 6 +-
...e-CDN-URL-with-a-local-bootstrap-CSS-file.patch | 4 +-
...2-Use-io.open-to-read-UTF-8-encoded-files.patch | 4 +-
docs/advanced_topics.rst | 14 ++
docs/changelog.rst | 21 +-
docs/conf.py | 7 +
docs/index.rst | 5 +-
docs/rest-framework/getting_started.rst | 2 +-
docs/rest-framework/permissions.rst | 2 +-
docs/settings.rst | 53 +++--
docs/templates.rst | 245 +++++++++++++++++++++
docs/tutorial/tutorial_01.rst | 9 +-
docs/tutorial/tutorial_02.rst | 4 +-
docs/tutorial/tutorial_03.rst | 10 +-
docs/tutorial/tutorial_04.rst | 6 +-
oauth2_provider/__init__.py | 2 +-
oauth2_provider/admin.py | 33 ++-
oauth2_provider/compat.py | 15 ++
oauth2_provider/compat_handlers.py | 6 -
oauth2_provider/decorators.py | 11 +-
oauth2_provider/ext/rest_framework/permissions.py | 4 +-
oauth2_provider/forms.py | 7 -
oauth2_provider/generators.py | 9 +-
oauth2_provider/middleware.py | 13 +-
oauth2_provider/migrations/0001_initial.py | 16 +-
oauth2_provider/migrations/0002_08_updates.py | 4 +-
.../migrations/0003_auto_20160316_1503.py | 2 +-
oauth2_provider/models.py | 40 +++-
oauth2_provider/oauth2_backends.py | 11 +-
oauth2_provider/oauth2_validators.py | 58 ++---
oauth2_provider/scopes.py | 53 +++++
oauth2_provider/settings.py | 9 +-
.../templates/oauth2_provider/base.html | 3 -
oauth2_provider/tests/settings.py | 10 +-
oauth2_provider/tests/test_application_views.py | 2 +-
oauth2_provider/tests/test_auth_backends.py | 11 +-
oauth2_provider/tests/test_authorization_code.py | 4 +-
oauth2_provider/tests/test_client_credential.py | 2 +-
oauth2_provider/tests/test_implicit.py | 3 +-
oauth2_provider/tests/test_oauth2_backends.py | 2 +-
oauth2_provider/tests/test_password.py | 2 +-
oauth2_provider/tests/test_rest_framework.py | 3 +
oauth2_provider/tests/test_scopes.py | 67 +-----
oauth2_provider/tests/test_scopes_backend.py | 14 ++
oauth2_provider/tests/test_token_revocation.py | 3 +-
oauth2_provider/tests/test_token_view.py | 2 +-
oauth2_provider/tests/urls.py | 8 +-
oauth2_provider/urls.py | 26 ++-
oauth2_provider/views/application.py | 12 +-
oauth2_provider/views/base.py | 10 +-
oauth2_provider/views/mixins.py | 3 +-
oauth2_provider/views/token.py | 3 +-
requirements/base.txt | 6 +-
requirements/project.txt | 2 +-
requirements/testing.txt | 10 +-
setup.py | 11 +-
tox.ini | 27 +--
60 files changed, 737 insertions(+), 644 deletions(-)
diff --cc debian/.git-dpm
index cea776c,0000000..cdb03bf
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
+# see git-dpm(1) from git-dpm package
- 32081b61f7ea91b548abadc53c8210e907ef6c20
- 32081b61f7ea91b548abadc53c8210e907ef6c20
- acc128fd39dff68579749639a8dbffa64a0e4a78
++1d96ba2494d11305796cec603e397dd9b1cd3f00
++1d96ba2494d11305796cec603e397dd9b1cd3f00
++92d2cf5e3cc71fd97dccd83aa5546fcdf6867aef
+92d2cf5e3cc71fd97dccd83aa5546fcdf6867aef
+django-oauth-toolkit_0.12.0.orig.tar.gz
+7f6015c123837760ba6c3a99a0da9064b67a03ca
+73542
diff --cc debian/patches/0001-Replace-CDN-URL-with-a-local-bootstrap-CSS-file.patch
index 1fc8c64,0000000..ab22f40
mode 100644,000000..100644
--- a/debian/patches/0001-Replace-CDN-URL-with-a-local-bootstrap-CSS-file.patch
+++ b/debian/patches/0001-Replace-CDN-URL-with-a-local-bootstrap-CSS-file.patch
@@@ -1,26 -1,0 +1,26 @@@
- From 15d5d2f5fe0decbee63bff4e3673da6b4e2ae518 Mon Sep 17 00:00:00 2001
++From 332c023cc9dfb817d78301c187738e1d72495a30 Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <fladi at debian.org>
+Date: Fri, 25 Dec 2015 14:05:27 +0100
+Subject: Replace CDN URL with a local bootstrap CSS file
+
+Last-Update: 2015-08-27
+Forwarded: not-needed
+---
+ oauth2_provider/templates/oauth2_provider/base.html | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/oauth2_provider/templates/oauth2_provider/base.html b/oauth2_provider/templates/oauth2_provider/base.html
- index 0781951..3f2afb1 100644
++index 048c41f..7afd814 100644
+--- a/oauth2_provider/templates/oauth2_provider/base.html
++++ b/oauth2_provider/templates/oauth2_provider/base.html
+@@ -7,8 +7,9 @@
+ <meta name="description" content="">
+ <meta name="author" content="">
+
++ {% load staticfiles %}
+ {% block css %}
+- <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.no-icons.min.css" rel="stylesheet">
++ <link href="{% static 'oauth2_provider/bootstrap.min.css' %}" rel="stylesheet">
+ {% endblock css %}
+
+ <style>
diff --cc debian/patches/0002-Use-io.open-to-read-UTF-8-encoded-files.patch
index 303aaf4,0000000..c5a0864
mode 100644,000000..100644
--- a/debian/patches/0002-Use-io.open-to-read-UTF-8-encoded-files.patch
+++ b/debian/patches/0002-Use-io.open-to-read-UTF-8-encoded-files.patch
@@@ -1,38 -1,0 +1,38 @@@
- From 32081b61f7ea91b548abadc53c8210e907ef6c20 Mon Sep 17 00:00:00 2001
++From 1d96ba2494d11305796cec603e397dd9b1cd3f00 Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <FladischerMichael at fladi.at>
+Date: Wed, 7 Dec 2016 17:14:14 +0100
+Subject: Use io.open to read UTF-8 encoded files.
+
+---
+ setup.py | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
- index 309c526..89e8d6b 100644
++index a0b6689..aabd973 100644
+--- a/setup.py
++++ b/setup.py
+@@ -2,6 +2,7 @@
+ # -*- coding: utf-8 -*-
+
+ from setuptools import setup, find_packages
++import io
+ import os
+ import re
+
+@@ -10,14 +11,14 @@ def get_version(package):
+ """
+ Return package version as listed in `__version__` in `init.py`.
+ """
+- init_py = open(os.path.join(package, '__init__.py')).read()
++ init_py = io.open(os.path.join(package, '__init__.py'), encoding='utf-8').read()
+ return re.match("__version__ = ['\"]([^'\"]+)['\"]", init_py).group(1)
+
+
+ version = get_version('oauth2_provider')
+
+
+-LONG_DESCRIPTION = open('README.rst').read()
++LONG_DESCRIPTION = io.open('README.rst', encoding='utf-8').read()
+
+ setup(
+ name="django-oauth-toolkit",
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/django-oauth-toolkit.git
More information about the Python-modules-commits
mailing list