Skip to content

Commit

Permalink
update tox.ini to use actual versions of django (1.8, 1.9) - fix mysq…
Browse files Browse the repository at this point in the history
…l and postgres settings
  • Loading branch information
lampslave committed Mar 2, 2016
1 parent 023e793 commit 48975f0
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Expand Up @@ -16,3 +16,6 @@ env:
- TOXENV="sqlite_tz_nopytz"
install: pip install tox
script: tox -e $TOXENV
before_script:
- mysql -e 'create database qsstats_test;'
- psql -c 'create database qsstats_test;' -U postgres
6 changes: 3 additions & 3 deletions test_settings/mysql.py
Expand Up @@ -8,9 +8,9 @@
'default': {
'ENGINE': 'django.db.backends.mysql',
'NAME': 'qsstats_test',
'USER': 'qsstats_test',
'PASSWORD': 'qsstats_test',
'USER': 'root',
'PASSWORD': '',
}
}

SECRET_KEY = 'foo'
SECRET_KEY = 'foo'
6 changes: 3 additions & 3 deletions test_settings/postgres.py
Expand Up @@ -8,9 +8,9 @@
'default': {
'ENGINE': 'django.db.backends.postgresql_psycopg2',
'NAME': 'qsstats_test',
'USER': 'qsstats_test',
'PASSWORD': 'qsstats_test',
'USER': 'postgres',
'PASSWORD': '',
}
}

SECRET_KEY = 'foo'
SECRET_KEY = 'foo'

0 comments on commit 48975f0

Please sign in to comment.