fixing requirements.txt merge

fbormann
2 parents f47bcf5d 2204dbd0
Showing 6 changed files with 47 additions and 8 deletions Show diff stats
Procfile
README.md
amadeus/settings.py
app.json
requirements.txt
runtime.txt
@@ -0,0 +1 @@
+web: gunicorn amadeus.wsgi:application --log-file -
 \ No newline at end of file
@@ -86,3 +86,24 @@ Para Classes que envolvem formulários:
 [2] https://github.com/FezVrasta/bootstrap-material-design
  
 [Django Breadcrumbs](http://django-bootstrap-breadcrumbs.readthedocs.io/en/latest/)
+
+
+## Sprint WorkFlow
+[PT-BR]
+**Dia : Atividade**
+* 01 Segunda: Retrospective/Planning
+* 05 Sexta: Review
+* 08 Segunda: Weekly Meeting
+* 10 Quarta: Sprint Deadline
+* 11 Quinta: Review
+* 12 Sexta: Deploy
+
+[EN-US]
+
+**Day  : Activity**
+* 01 Monday: Retrospective/Planning
+* 05 Friday: Review
+* 08 Monday: Weekly Meeting
+* 10 Wednesday: Sprint Deadline
+* 11 Thursday: Review
+* 12 Friday: Deploy
@@ -12,6 +12,11 @@ https://docs.djangoproject.com/en/1.9/ref/settings/
  
 import os
  
+import dj_database_url
+
+db_from_ev = dj_database_url.config(conn_max_age=500)
+
+
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
  
@@ -95,14 +100,7 @@ WSGI_APPLICATION = &#39;amadeus.wsgi.application&#39;
 # https://docs.djangopr/*oject.com/en/1.9/ref/settings/#databases
  
 DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.postgresql',
-        'NAME': 'amadeus',
-        'USER': 'amadeus_admin',
-        'PASSWORD': 'amadeus',
-        'HOST': '127.0.0.1',
-        'PORT': '5432',
-    }
+    'default': db_from_ev
 }
  
  
@@ -0,0 +1,16 @@
+{
+  "name": "amadeuslms",
+  "description": "Json created to integrate github with heroku",
+  "scripts": {
+  },
+  "env": {
+  },
+  "formation": {
+  },
+  "addons": [
+
+  ],
+  "buildpacks": [
+
+  ]
+}
 click==6.6
+deps==0.1.0
+dj-database-url==0.4.1
 Django==1.10
 django-autoslug==1.9.3
 django-bootstrap-breadcrumbs==0.8
@@ -0,0 +1 @@
+python-3.5.2
 \ No newline at end of file
...	...	@@ -0,0 +1 @@
	1	+web: gunicorn amadeus.wsgi:application --log-file -
0	2	\ No newline at end of file
...	...
...	...	@@ -86,3 +86,24 @@ Para Classes que envolvem formulários:
86	86	[2] https://github.com/FezVrasta/bootstrap-material-design
87	87
88	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
...	...
...	...	@@ -12,6 +12,11 @@ https://docs.djangoproject.com/en/1.9/ref/settings/
12	12
13	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	20	# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
16	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	100	# https://docs.djangopr/*oject.com/en/1.9/ref/settings/#databases
96	101
97	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
...	...
...	...	@@ -0,0 +1,16 @@
	1	+{
	2	+ "name": "amadeuslms",
	3	+ "description": "Json created to integrate github with heroku",
	4	+ "scripts": {
	5	+ },
	6	+ "env": {
	7	+ },
	8	+ "formation": {
	9	+ },
	10	+ "addons": [
	11	+
	12	+ ],
	13	+ "buildpacks": [
	14	+
	15	+ ]
	16	+}
...	...
1	1	click==6.6
	2	+deps==0.1.0
	3	+dj-database-url==0.4.1
2	4	Django==1.10
3	5	django-autoslug==1.9.3
4	6	django-bootstrap-breadcrumbs==0.8
...	...
...	...	@@ -0,0 +1 @@
	1	+python-3.5.2
0	2	\ No newline at end of file
...	...