Commit fcfdc321 authored by Bruno Martin's avatar Bruno Martin
Browse files

Merge branch 'develop' of git.hacklab.com.br:hacklab/base-django-project into develop

parents d9d8e0dc 6c73a957
...@@ -131,7 +131,7 @@ class TwitterAccessToken(generics.GenericAPIView): ...@@ -131,7 +131,7 @@ class TwitterAccessToken(generics.GenericAPIView):
def get_api_key(request): def get_api_key(request):
if request.user.id is None: if request.user.id is None:
raise Http404 raise Http404
token = Token.objects.get_or_create(user=request.user) token = Token.objects.get_or_create(user=request.user)
return JsonResponse({'key': token[0].key}, status=200) return JsonResponse({'key': token[0].key}, status=200)
...@@ -9,7 +9,7 @@ networks: ...@@ -9,7 +9,7 @@ networks:
services: services:
redis: redis:
image: redis:3.2 image: redis:5.0
hostname: redis hostname: redis
networks: networks:
- base - base
...@@ -33,7 +33,7 @@ services: ...@@ -33,7 +33,7 @@ services:
- base - base
postgres: postgres:
image: postgres:9.6 image: postgres:11.1
volumes: volumes:
- db_data:/var/lib/postgresql/data - db_data:/var/lib/postgresql/data
environment: environment:
......
...@@ -6,48 +6,48 @@ wheel==0.30.0 ...@@ -6,48 +6,48 @@ wheel==0.30.0
# LTS Django # LTS Django
django~=1.11 django~=2.1
# Configuration # Configuration
django-environ==0.4.4 django-environ==0.4.5
# Models # Models
django-model-utils==3.1.1 django-model-utils==3.1.2
# Images # Images
Pillow==5.0.0 Pillow==5.4.1
# Password storage # Password storage
argon2-cffi==18.1.0 argon2-cffi==19.1.0
# For user registration, either via email or social # For user registration, either via email or social
# Well-built with regular release cycles! # Well-built with regular release cycles!
django-allauth==0.35.0 django-allauth==0.37.0
# On Windows, you must download/install psycopg2 manually # On Windows, you must download/install psycopg2 manually
# from http://www.lfd.uci.edu/~gohlke/pythonlibs/#psycopg # from http://www.lfd.uci.edu/~gohlke/pythonlibs/#psycopg
psycopg2~=2.7 psycopg2-binary~=2.7
# Unicode slugification # Unicode slugification
awesome-slugify==1.6.5 awesome-slugify==1.6.5
# Time zones support # Time zones support
pytz==2017.3 pytz==2018.9
# Redis support # Redis support
django-redis==4.8.0 django-redis==4.10.0
redis>=2.10.5 redis>=3.0.1
django-filter==1.0.2 django-filter==2.0.0
djangorestframework==3.8.2 djangorestframework==3.9.1
django-rest-auth[with_social]==0.9.3 django-rest-auth[with_social]==0.9.3
django-cors-headers==1.2.0 django-cors-headers==1.2.0
# libs needed by django-rest-framework api auto documentations # libs needed by django-rest-framework api auto documentations
coreapi==2.3.3 coreapi==2.3.3
coreapi-cli==1.0.6 coreapi-cli==1.0.9
pygments==2.2.0 pygments==2.3.1
markdown==2.6.9 markdown==3.0.1
django-crispy-forms==1.7.2 django-crispy-forms==1.7.2
django-autoslug==1.9.3 django-autoslug==1.9.3
...@@ -10,17 +10,17 @@ ...@@ -10,17 +10,17 @@
-e ext-apps/django-courses-reports -e ext-apps/django-courses-reports
coverage==4.5 coverage==4.5
django-coverage-plugin==1.5.0 django-coverage-plugin==1.6.0
django-extensions==1.9.9 django-extensions==2.1.4
Werkzeug==0.14.1 Werkzeug==0.14.1
django-test-plus==1.0.22 django-test-plus==1.1.1
factory-boy==2.10.0 factory-boy==2.11.1
django-debug-toolbar==1.9.1 django-debug-toolbar==1.11
# improved REPL # improved REPL
ipdb==0.10.3 ipdb==0.11
pytest-django==3.1.2 pytest-django==3.4.5
pytest-sugar==0.9.1 pytest-sugar==0.9.2
...@@ -4,22 +4,22 @@ ...@@ -4,22 +4,22 @@
# WSGI Handler # WSGI Handler
# ------------------------------------------------ # ------------------------------------------------
gevent==1.2.2 # gevent==1.4.0
gunicorn==19.7.1 gunicorn==19.9.0
# Static and Media Storage # Static and Media Storage
# ------------------------------------------------ # ------------------------------------------------
boto3==1.5.23 # boto3==1.5.23
django-storages==1.6.5 # django-storages==1.6.5
Collectfast==0.6.0 # Collectfast==0.6.0
# Email backends for Mailgun, Postmark, SendGrid and more # Email backends for Mailgun, Postmark, SendGrid and more
# ------------------------------------------------------- # -------------------------------------------------------
django-anymail==1.3 django-anymail==5.0
# Raven is the Sentry client # Raven is the Sentry client
# -------------------------- # --------------------------
raven==6.5.0 raven==6.10.0
# <external_app> # <external_app>
# Example: git+https://gitlab.com/empurrandojuntos/django-courier.git # Example: git+https://gitlab.com/empurrandojuntos/django-courier.git
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment