diff --git a/Dockerfile b/Dockerfile index 1f9677d..ae29385 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,6 +2,7 @@ FROM python:2.7 ENV PYTHONBUFFERED 1 RUN mkdir /code +RUN mkdir /files RUN mkdir /files/static RUN mkdir /files/media RUN mkdir /files/cache diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 25af2bd..0000000 --- a/docker-compose.yml +++ /dev/null @@ -1,11 +0,0 @@ -db: - image: postgres -web: - build: . - command: python manage.py runserver 0.0.0.0:8000 - volumes: - - .:/code - ports: - - "8000:8000" - links: - - db diff --git a/dss/settings.py b/dss/settings.py index 1aed694..faba7de 100755 --- a/dss/settings.py +++ b/dss/settings.py @@ -71,12 +71,6 @@ TEMPLATE_CONTEXT_PROCESSORS = global_settings.TEMPLATE_CONTEXT_PROCESSORS + ( 'django.core.context_processors.media', 'django.core.context_processors.static', 'django.contrib.auth.context_processors.auth', - - - # TODO: remove.. - # `allauth` specific context processors - "allauth.account.context_processors.account", - "allauth.socialaccount.context_processors.socialaccount", ) @@ -138,7 +132,6 @@ INSTALLED_APPS = ( 'djrill', 'rest_framework', 'rest_framework.authtoken', - 'rest_framework_swagger', ) # where to redirect users to after logging in diff --git a/dss/urls.py b/dss/urls.py index c1db362..4625528 100755 --- a/dss/urls.py +++ b/dss/urls.py @@ -9,7 +9,6 @@ admin.autodiscover() urlpatterns = patterns( '', url(r'^admin/', include(admin.site.urls)), - url(r'^api/docs/', include('rest_framework_swagger.urls')), url(r'^api/v2/', include('api.urls')), url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')), (r'^grappelli/', include('grappelli.urls')), diff --git a/dss/wsgi.py b/dss/wsgi.py index 8765705..c998099 100755 --- a/dss/wsgi.py +++ b/dss/wsgi.py @@ -1,28 +1,6 @@ -""" -WSGI config for dss project. - -This module contains the WSGI application used by Django's development server -and any production WSGI deployments. It should expose a module-level variable -named ``application``. Django's ``runserver`` and ``runfcgi`` commands discover -this application via the ``WSGI_APPLICATION`` setting. - -Usually you will have the standard Django WSGI application here, but it also -might make sense to replace the whole Django WSGI application with a custom one -that later delegates to the Django one. For example, you could introduce WSGI -middleware here, or combine a Django application with an application of another -framework. - -""" import os os.environ.setdefault("DJANGO_SETTINGS_MODULE", "dss.settings") -# This application object is used by any WSGI server configured to use this -# file. This includes Django's development server, if the WSGI_APPLICATION -# setting points here. from django.core.wsgi import get_wsgi_application application = get_wsgi_application() - -# Apply WSGI middleware here. -# from helloworld.wsgi import HelloWorldApplication -# application = HelloWorldApplication(application) diff --git a/requirements.txt b/requirements.txt index 83dc88d..1246684 100755 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Django>=1.6,<1.7 +Django==1.6.11 django-extensions django-sendfile Werkzeug @@ -9,9 +9,9 @@ django-dirtyfields django-storages django-user-sessions django-cors-headers -django-rest-swagger +six==1.6.0 django-filter -django-grappelli +django-grappelli==2.5.7 django-model_utils django-dbbackup django-user-agents @@ -30,8 +30,8 @@ apache-libcloud mandrill djrill -djangorestframework -djangorestframework-jwt +djangorestframework==3.1.3 +djangorestframework-jwt==1.6.0 drf-nested-routers django-celery pillow