Commit 10f5ba3e03e51bd8fe9f98f73317a4ddee62ffe6
Exists in
master
and in
5 other branches
fixing requirements.txt merge
Showing
6 changed files
with
47 additions
and
8 deletions
Show diff stats
README.md
| @@ -86,3 +86,24 @@ Para Classes que envolvem formulários: | @@ -86,3 +86,24 @@ Para Classes que envolvem formulários: | ||
| 86 | [2] https://github.com/FezVrasta/bootstrap-material-design | 86 | [2] https://github.com/FezVrasta/bootstrap-material-design |
| 87 | 87 | ||
| 88 | [Django Breadcrumbs](http://django-bootstrap-breadcrumbs.readthedocs.io/en/latest/) | 88 | [Django Breadcrumbs](http://django-bootstrap-breadcrumbs.readthedocs.io/en/latest/) |
| 89 | + | ||
| 90 | + | ||
| 91 | +## Sprint WorkFlow | ||
| 92 | +[PT-BR] | ||
| 93 | +**Dia : Atividade** | ||
| 94 | +* 01 Segunda: Retrospective/Planning | ||
| 95 | +* 05 Sexta: Review | ||
| 96 | +* 08 Segunda: Weekly Meeting | ||
| 97 | +* 10 Quarta: Sprint Deadline | ||
| 98 | +* 11 Quinta: Review | ||
| 99 | +* 12 Sexta: Deploy | ||
| 100 | + | ||
| 101 | +[EN-US] | ||
| 102 | + | ||
| 103 | +**Day : Activity** | ||
| 104 | +* 01 Monday: Retrospective/Planning | ||
| 105 | +* 05 Friday: Review | ||
| 106 | +* 08 Monday: Weekly Meeting | ||
| 107 | +* 10 Wednesday: Sprint Deadline | ||
| 108 | +* 11 Thursday: Review | ||
| 109 | +* 12 Friday: Deploy |
amadeus/settings.py
| @@ -12,6 +12,11 @@ https://docs.djangoproject.com/en/1.9/ref/settings/ | @@ -12,6 +12,11 @@ https://docs.djangoproject.com/en/1.9/ref/settings/ | ||
| 12 | 12 | ||
| 13 | import os | 13 | import os |
| 14 | 14 | ||
| 15 | +import dj_database_url | ||
| 16 | + | ||
| 17 | +db_from_ev = dj_database_url.config(conn_max_age=500) | ||
| 18 | + | ||
| 19 | + | ||
| 15 | # Build paths inside the project like this: os.path.join(BASE_DIR, ...) | 20 | # Build paths inside the project like this: os.path.join(BASE_DIR, ...) |
| 16 | BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) | 21 | BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) |
| 17 | 22 | ||
| @@ -95,14 +100,7 @@ WSGI_APPLICATION = 'amadeus.wsgi.application' | @@ -95,14 +100,7 @@ WSGI_APPLICATION = 'amadeus.wsgi.application' | ||
| 95 | # https://docs.djangopr/*oject.com/en/1.9/ref/settings/#databases | 100 | # https://docs.djangopr/*oject.com/en/1.9/ref/settings/#databases |
| 96 | 101 | ||
| 97 | DATABASES = { | 102 | DATABASES = { |
| 98 | - 'default': { | ||
| 99 | - 'ENGINE': 'django.db.backends.postgresql', | ||
| 100 | - 'NAME': 'amadeus', | ||
| 101 | - 'USER': 'amadeus_admin', | ||
| 102 | - 'PASSWORD': 'amadeus', | ||
| 103 | - 'HOST': '127.0.0.1', | ||
| 104 | - 'PORT': '5432', | ||
| 105 | - } | 103 | + 'default': db_from_ev |
| 106 | } | 104 | } |
| 107 | 105 | ||
| 108 | 106 |
requirements.txt