Merge pull request #22 from caravancoop/feature/post-release-merge

merwok · web-flow · commit 04cd3a9ba885 · 2018-02-21T20:24:31.000-05:00
Post-release merge
diff --git a/.gitignore b/.gitignore
@@ -1,12 +1,13 @@
 *.pyc
 __pycache__
-db.sqlite3
+/demo/db.sqlite3
+/demo/.env
 
 # Test artifacts
-.cache/
-.tox/
+/.cache/
+/.tox/
 
 # Packaging litter
-*.egg-info
-build/
-dist/
+/*.egg-info
+/build/
+/dist/
diff --git a/demo/demo/accounts/authentication.py b/demo/demo/accounts/authentication.py
@@ -4,4 +4,5 @@
 
 
 class APITokenAuthentication(TokenAuthentication):
+    keyword = 'Bearer'
     model = APIToken
diff --git a/setup.py b/setup.py
@@ -15,7 +15,7 @@
 
 setup(
     name='Rest-Framework-Auth-Toolkit',
-    version='0.7-dev',
+    version='0.8.dev',
     description='Simple, flexible signup and login for APIs',
     long_description=long_description,
     url='https://github.com/caravancoop/rest-framework-auth-toolkit',

Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,5 @@`
`4`	`4`
`5`	`5`
`6`	`6`	`class APITokenAuthentication(TokenAuthentication):`
	`7`	`+ keyword = 'Bearer'`
`7`	`8`	`model = APIToken`