Skip to content

Commit

Permalink
Merge pull request #3 from skruger/django_18
Browse files Browse the repository at this point in the history
Update official support for Django 1.8
  • Loading branch information
skruger committed Nov 24, 2015
2 parents 2d44fb9 + b54e93b commit d3ad31f
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ _build
dist
build
venv
.idea
*.sqlite
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: python
env:
- DJANGO="django>=1.7,<1.8"
- DJANGO="django>=1.7,<1.9"
python:
- "2.7"
# command to install dependencies
Expand Down
2 changes: 1 addition & 1 deletion provider/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "1.1"
__version__ = "1.2"
4 changes: 2 additions & 2 deletions provider/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@

SCOPES = getattr(settings, 'OAUTH_SCOPES', DEFAULT_SCOPES)

EXPIRE_DELTA = getattr(settings, 'OAUTH_EXPIRE_DELTA', timedelta(days=365))
EXPIRE_DELTA = getattr(settings, 'OAUTH_EXPIRE_DELTA', timedelta(days=7))

# Expiry delta for public clients (which typically have shorter lived tokens)
EXPIRE_DELTA_PUBLIC = getattr(settings, 'OAUTH_EXPIRE_DELTA_PUBLIC', timedelta(days=30))
EXPIRE_DELTA_PUBLIC = getattr(settings, 'OAUTH_EXPIRE_DELTA_PUBLIC', timedelta(days=1))

EXPIRE_CODE_DELTA = getattr(settings, 'OAUTH_EXPIRE_CODE_DELTA', timedelta(seconds=10 * 60))

Expand Down

0 comments on commit d3ad31f

Please sign in to comment.