Download as
Browse Code »

Commit e5deb8f09213c6d30288f609bde3ad71a7fd6c39

Authored by fbormann
1 parent c6c9cf23
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

database settings updated for Heroku

Showing 2 changed files with 107 additions and 8 deletions   Show diff stats
amadeus/settings.py
  Diff comments   View file @e5deb8f
@@ -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
@@ -93,14 +98,7 @@ WSGI_APPLICATION = 'amadeus.wsgi.application' @@ -93,14 +98,7 @@ WSGI_APPLICATION = 'amadeus.wsgi.application'
93 # https://docs.djangopr/*oject.com/en/1.9/ref/settings/#databases 98 # https://docs.djangopr/*oject.com/en/1.9/ref/settings/#databases
94 99
95 DATABASES = { 100 DATABASES = {
96 - 'default': {  
97 - 'ENGINE': 'django.db.backends.postgresql',  
98 - 'NAME': 'amadeus',  
99 - 'USER': 'amadeus_admin',  
100 - 'PASSWORD': 'amadeus',  
101 - 'HOST': '127.0.0.1',  
102 - 'PORT': '5432',  
103 - } 101 + 'default': db_from_ev
104 } 102 }
105 103
106 104
requirements.txt
  Diff comments   View file @e5deb8f
  1 +apturl==0.5.2
  2 +beautifulsoup4==4.4.1
  3 +blinker==1.3
  4 +bokeh==0.12.1
  5 +Brlapi==0.6.4
  6 +cairocffi==0.7.2
  7 +cffi==1.7.0
  8 +chardet==2.3.0
  9 +checkbox-support==0.22
1 click==6.6 10 click==6.6
  11 +command-not-found==0.3
  12 +cryptography==1.2.3
  13 +cycler==0.10.0
  14 +decorator==4.0.10
  15 +defer==1.0.6
2 deps==0.1.0 16 deps==0.1.0
  17 +dj-database-url==0.4.1
3 Django==1.10 18 Django==1.10
  19 +django-autoslug==1.9.3
4 django-bootstrap-breadcrumbs==0.8 20 django-bootstrap-breadcrumbs==0.8
5 django-discover-runner==1.0 21 django-discover-runner==1.0
6 django-role-permissions==1.2.1 22 django-role-permissions==1.2.1
7 django-widget-tweaks==1.4.1 23 django-widget-tweaks==1.4.1
8 djangorestframework==3.4.6 24 djangorestframework==3.4.6
  25 +entrypoints==0.2.2
  26 +feedparser==5.1.3
  27 +guacamole==0.9.2
  28 +gunicorn==19.6.0
  29 +html5lib==0.999
  30 +httplib2==0.9.1
  31 +idna==2.0
  32 +ipykernel==4.3.1
  33 +ipython==4.2.1
  34 +ipython-genutils==0.1.0
  35 +ipywidgets==5.1.5
9 itsdangerous==0.24 36 itsdangerous==0.24
10 Jinja2==2.8 37 Jinja2==2.8
  38 +jsonschema==2.5.1
  39 +jupyter==1.0.0
  40 +jupyter-client==4.3.0
  41 +jupyter-console==5.0.0
  42 +jupyter-core==4.1.0
  43 +language-selector==0.1
  44 +louis==2.6.4
  45 +lxml==3.5.0
  46 +Mako==1.0.3
11 MarkupSafe==0.23 47 MarkupSafe==0.23
  48 +matplotlib==1.5.1
  49 +mistune==0.7.3
  50 +nbconvert==4.2.0
  51 +nbformat==4.0.1
  52 +notebook==4.2.1
  53 +numpy==1.11.1
  54 +oauthlib==1.0.3
  55 +onboard==1.2.0
  56 +padme==1.1.1
  57 +pandas==0.18.1
  58 +pexpect==4.2.0
  59 +pickleshare==0.7.3
12 Pillow==3.3.1 60 Pillow==3.3.1
  61 +plainbox==0.25
  62 +prompt-toolkit==1.0.3
  63 +psycopg2==2.6.2
  64 +ptyprocess==0.5.1
  65 +pyasn1==0.1.9
  66 +pycparser==2.14
13 pycpfcnpj==1.0.2 67 pycpfcnpj==1.0.2
  68 +pycups==1.9.73
  69 +pycurl==7.43.0
  70 +Pygments==2.1.3
  71 +pygobject==3.20.0
  72 +PyJWT==1.3.0
  73 +pyparsing==2.0.3
  74 +python-apt==1.1.0b1
  75 +python-dateutil==2.5.3
  76 +python-debian==0.1.27
  77 +python-systemd==231
  78 +pytz==2016.6.1
  79 +pyxdg==0.25
  80 +PyYAML==3.11
  81 +pyzmq==15.3.0
  82 +qtconsole==4.2.1
  83 +reportlab==3.3.0
  84 +requests==2.9.1
  85 +sessioninstaller==0.0.0
  86 +simplegeneric==0.8.1
14 six==1.10.0 87 six==1.10.0
15 slugify==0.0.1 88 slugify==0.0.1
  89 +system-service==0.3
  90 +terminado==0.6
  91 +tornado==4.3
  92 +traitlets==4.2.2
  93 +ubuntu-drivers-common==0.0.0
  94 +ufw==0.35
  95 +unattended-upgrades==0.1
  96 +unity-scope-calculator==0.1
  97 +unity-scope-chromiumbookmarks==0.1
  98 +unity-scope-colourlovers==0.1
  99 +unity-scope-devhelp==0.1
  100 +unity-scope-firefoxbookmarks==0.1
  101 +unity-scope-gdrive==0.7
  102 +unity-scope-manpages==0.1
  103 +unity-scope-openclipart==0.1
  104 +unity-scope-texdoc==0.1
  105 +unity-scope-tomboy==0.1
  106 +unity-scope-virtualbox==0.1
  107 +unity-scope-yelp==0.1
  108 +unity-scope-zotero==0.1
  109 +urllib3==1.13.1
  110 +usb-creator==0.3.0
  111 +virtualenv==15.0.2
  112 +wcwidth==0.1.7
16 Werkzeug==0.11.11 113 Werkzeug==0.11.11
  114 +widgetsnbextension==1.2.6
  115 +xdiagnose==3.8.4.1
  116 +xkit==0.0.0
  117 +XlsxWriter==0.7.3