[Python-modules-commits] [django-oauth-toolkit] 03/11: merge patched into master
Michael Fladischer
fladi at moszumanska.debian.org
Thu Nov 2 16:08:20 UTC 2017
This is an automated email from the git hooks/post-receive script.
fladi pushed a commit to branch debian/master
in repository django-oauth-toolkit.
commit 1fac7a9702732ce11705662f78de1b9506bd5747
Merge: 2771b63 d49cdff
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Tue Jun 20 09:47:50 2017 +0200
merge patched into master
.coveragerc | 3 -
.travis.yml | 13 +-
AUTHORS | 22 +-
CHANGELOG.md | 16 +
CONTRIBUTING.md | 6 +
CONTRIBUTING.rst | 5 -
README.rst | 2 +-
debian/.git-dpm | 6 +-
...e-CDN-URL-with-a-local-bootstrap-CSS-file.patch | 2 +-
...2-Use-io.open-to-read-UTF-8-encoded-files.patch | 38 -
debian/patches/series | 1 -
docs/conf.py | 12 +-
docs/index.rst | 1 +
docs/install.rst | 2 +-
docs/resource_server.rst | 68 ++
docs/rest-framework/getting_started.rst | 6 +-
docs/rfc.py | 6 +-
docs/settings.rst | 38 +-
oauth2_provider/__init__.py | 7 +-
oauth2_provider/admin.py | 10 +-
oauth2_provider/apps.py | 2 +-
oauth2_provider/compat.py | 14 +-
oauth2_provider/{ext => contrib}/__init__.py | 0
.../{ext => contrib}/rest_framework/__init__.py | 0
.../rest_framework/authentication.py | 2 +-
.../{ext => contrib}/rest_framework/permissions.py | 22 +-
oauth2_provider/decorators.py | 8 +-
oauth2_provider/management/commands/cleartokens.py | 1 +
oauth2_provider/middleware.py | 11 +-
oauth2_provider/migrations/0001_initial.py | 17 +-
.../migrations/0005_auto_20170514_1141.py | 102 ++
oauth2_provider/models.py | 201 ++--
oauth2_provider/oauth2_backends.py | 30 +-
oauth2_provider/oauth2_validators.py | 197 +++-
oauth2_provider/settings.py | 119 ++-
oauth2_provider/tests/models.py | 6 -
oauth2_provider/tests/settings.py | 128 ---
oauth2_provider/tests/test_application_views.py | 100 --
oauth2_provider/tests/test_authorization_code.py | 1059 -------------------
oauth2_provider/tests/test_models.py | 179 ----
oauth2_provider/tests/test_token_revocation.py | 169 ---
oauth2_provider/tests/test_token_view.py | 179 ----
oauth2_provider/tests/test_utils.py | 17 -
oauth2_provider/tests/urls.py | 16 -
oauth2_provider/urls.py | 24 +-
oauth2_provider/validators.py | 35 +-
oauth2_provider/views/__init__.py | 1 +
oauth2_provider/views/application.py | 31 +-
oauth2_provider/views/base.py | 92 +-
oauth2_provider/views/generic.py | 2 +-
oauth2_provider/views/introspect.py | 75 ++
oauth2_provider/views/mixins.py | 23 +-
oauth2_provider/views/token.py | 24 +-
requirements/base.txt | 4 -
requirements/optional.txt | 2 -
requirements/project.txt | 2 -
requirements/testing.txt | 7 -
runtests.py | 8 -
setup.cfg | 37 +
setup.py | 57 +-
{oauth2_provider/tests => tests}/__init__.py | 0
tests/models.py | 22 +
tests/settings.py | 126 +++
tests/test_application_views.py | 104 ++
.../tests => tests}/test_auth_backends.py | 70 +-
tests/test_authorization_code.py | 1071 ++++++++++++++++++++
.../tests => tests}/test_client_credential.py | 93 +-
.../tests => tests}/test_decorators.py | 45 +-
{oauth2_provider/tests => tests}/test_generator.py | 8 +-
{oauth2_provider/tests => tests}/test_implicit.py | 181 ++--
tests/test_introspection_auth.py | 195 ++++
tests/test_introspection_view.py | 260 +++++
{oauth2_provider/tests => tests}/test_mixins.py | 17 +-
tests/test_models.py | 294 ++++++
.../tests => tests}/test_oauth2_backends.py | 18 +-
.../tests => tests}/test_oauth2_validators.py | 106 +-
{oauth2_provider/tests => tests}/test_password.py | 62 +-
.../tests => tests}/test_rest_framework.py | 116 ++-
{oauth2_provider/tests => tests}/test_scopes.py | 272 ++---
.../tests => tests}/test_scopes_backend.py | 0
tests/test_token_revocation.py | 181 ++++
tests/test_token_view.py | 206 ++++
.../tests => tests}/test_validators.py | 26 +-
tests/urls.py | 12 +
tests/utils.py | 16 +
tox.ini | 69 +-
86 files changed, 3974 insertions(+), 2863 deletions(-)
diff --cc debian/.git-dpm
index ba4b5aa,0000000..0b9ee93
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
- 1d96ba2494d11305796cec603e397dd9b1cd3f00
- 1d96ba2494d11305796cec603e397dd9b1cd3f00
- 92d2cf5e3cc71fd97dccd83aa5546fcdf6867aef
++d49cdff49508e14cf757b423ddf7607362d7bc29
++d49cdff49508e14cf757b423ddf7607362d7bc29
++733e73785e1308e6544647a6aaef529395b58394
+733e73785e1308e6544647a6aaef529395b58394
+django-oauth-toolkit_1.0.0.orig.tar.gz
+4a5fb9af66e3c6267830d87a9659838f7321df46
+78173
diff --cc debian/patches/0001-Replace-CDN-URL-with-a-local-bootstrap-CSS-file.patch
index ab22f40,0000000..e0d69b9
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 332c023cc9dfb817d78301c187738e1d72495a30 Mon Sep 17 00:00:00 2001
++From d49cdff49508e14cf757b423ddf7607362d7bc29 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 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/series
index 1adbeaf,0000000..3c50a87
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
+0001-Replace-CDN-URL-with-a-local-bootstrap-CSS-file.patch
- 0002-Use-io.open-to-read-UTF-8-encoded-files.patch
--
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