Skip to content

updated django to 1.9 #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gerhc wants to merge 3 commits into
base: master
Choose a base branch
from
Open

updated django to 1.9 #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c4e1ec
Update requirements.txt
gerhc Apr 26, 2016
a783f9f
database settings changed in Django 1.8
gerhc Apr 26, 2016
7289d36
Update Vagrantfile
gerhc May 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Vagrantfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|

config.ssh.forward_agent = true
config.ssh.private_key_path = "deploy/keys/vagrant"
config.ssh.insert_key = false

config.vm.provider :virtualbox do |vb|
vb.customize ["modifyvm", :id, "--memory", "1024"]
Expand Down
2 changes: 1 addition & 1 deletion deploy/roles/application/files/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Django==1.7.3
Django>=1.9,<1.9.99
psycopg2==2.5.4

argparse==1.3.0
Expand Down
2 changes: 1 addition & 1 deletion deploy/roles/application/templates/django/settings.py.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ DATABASES = {

# Optimizes read heavy PG workload, install only if PG
if '{{ settings_dbbackend }}' == 'postgresql_psycopg2':
DATABASES['default']['OPTIONS'] = {'autocommit': True}
DATABASES['default']['AUTOCOMMIT'] = True

# Internationalization
LANGUAGE_CODE = 'en-us'
Expand Down