Skip to content

Commit

Permalink
Merge pull request #45 from colibris-framework/several-fixes
Browse files Browse the repository at this point in the history
Several fixes and bump version
  • Loading branch information
lucifurtun authored Oct 29, 2019
2 parents 2d79973 + 99f68f4 commit bd31497
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion colibris/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from colibris import template


VERSION = '0.8.0'
VERSION = '0.9.0'


def setup():
Expand Down
6 changes: 2 additions & 4 deletions colibris/skeleton/__packagename__/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,9 @@ class Meta:
}

AUTHENTICATION = {
'backend': 'colibris.authentication.jwt.JWTBackend',
'backend': 'colibris.authentication.apikey.APIKeyBackend',
'model': '__packagename__.models.User',
'identity_claim': 'sub',
'identity_field': 'username',
'secret_field': 'password'
'key_field': 'password',
}

AUTHORIZATION = {
Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ def find_version():
version=find_version(),
install_requires=[
'aiohttp>=3.5.0,<=3.5.4',
'aiohttp-apispec>=1.0,<=1.3',
'aiohttp-apispec>=1.5',
'apispec>=3.0.0',
'async-timeout',
'marshmallow>=3.0.0b19,<=3.0.0rc7',
'marshmallow_peewee==2.3.0',
Expand Down

0 comments on commit bd31497

Please sign in to comment.