-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #283 from IMAmuseum/upgrade/django-1-9
Upgrade to Django 1.9
- Loading branch information
Showing
26 changed files
with
255 additions
and
953 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,15 @@ | ||
-r ./common.txt | ||
|
||
django-debug-toolbar | ||
django-debug-toolbar==1.4 | ||
django-profiler==2.0 | ||
|
||
#testing. | ||
coverage==3.7.1 | ||
#testing. | ||
coverage==4.0.3 | ||
webtest==2.0.9 | ||
django-webtest==1.7.5 | ||
model_mommy==1.2 | ||
mock==1.0.1 | ||
python-dbusmock==0.8 | ||
django-webtest==1.7.9 | ||
model_mommy==1.2.6 | ||
mock==2.0.0 | ||
python-dbusmock==0.16.3 | ||
|
||
#interactive interpreter for debugging | ||
ipython | ||
ipython==4.0.3 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,20 +1,4 @@ | ||
# Roundware Server is released under the GNU Affero General Public License v3. | ||
# See COPYRIGHT.txt, AUTHORS.txt, and LICENSE.txt in the project root directory. | ||
|
||
# Contains Roundware DRF REST API V2 signals. | ||
from __future__ import unicode_literals | ||
from django.contrib.auth import get_user_model | ||
from django.db.models.signals import post_save | ||
from rest_framework.authtoken.models import Token | ||
import logging | ||
|
||
logger = logging.getLogger(__name__) | ||
|
||
def create_auth_token(sender, instance=None, created=False, **kwargs): | ||
""" | ||
Create an access Token for every new user | ||
""" | ||
if created: | ||
Token.objects.create(user=instance) | ||
|
||
post_save.connect(create_auth_token, get_user_model) | ||
default_app_config = 'api2.apps.RoundwareApi2Config' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
# Roundware Server is released under the GNU Affero General Public License v3. | ||
# See COPYRIGHT.txt, AUTHORS.txt, and LICENSE.txt in the project root directory. | ||
|
||
from django.apps import AppConfig | ||
|
||
class RoundwareApi2Config(AppConfig): | ||
name = 'api2' | ||
|
||
def ready(self): | ||
import roundware.api2.signals |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
# Roundware Server is released under the GNU Affero General Public License v3. | ||
# See COPYRIGHT.txt, AUTHORS.txt, and LICENSE.txt in the project root directory. | ||
|
||
# Contains Roundware DRF REST API V2 signals. | ||
from __future__ import unicode_literals | ||
from django.contrib.auth import get_user_model | ||
from django.db.models.signals import post_save | ||
from rest_framework.authtoken.models import Token | ||
import logging | ||
|
||
logger = logging.getLogger(__name__) | ||
|
||
def create_auth_token(sender, instance=None, created=False, **kwargs): | ||
""" | ||
Create an access Token for every new user | ||
""" | ||
if created: | ||
Token.objects.create(user=instance) | ||
|
||
post_save.connect(create_auth_token, get_user_model) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.