Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
thalia
concrexit
Commits
a4ebd835
Commit
a4ebd835
authored
Nov 30, 2016
by
Wietse Kuipers
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Configured CI to use postgres
parent
ce78087e
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
27 additions
and
2 deletions
+27
-2
.gitlab-ci.yml
.gitlab-ci.yml
+9
-0
ci-requirements.txt
ci-requirements.txt
+1
-0
tox.ini
tox.ini
+5
-1
website/thaliawebsite/settings/__init__.py
website/thaliawebsite/settings/__init__.py
+2
-0
website/thaliawebsite/settings/settings.py
website/thaliawebsite/settings/settings.py
+0
-1
website/thaliawebsite/settings/testing.py
website/thaliawebsite/settings/testing.py
+10
-0
No files found.
.gitlab-ci.yml
View file @
a4ebd835
variables
:
POSTGRES_DB
:
thalia
POSTGRES_USER
:
postgres
POSTGRES_PASSWORD
:
"
"
CI_DEPS
:
psycopg2
services
:
-
postgres:latest
pep8
:
image
:
python:3.4
before_script
:
...
...
ci-requirements.txt
0 → 100644
View file @
a4ebd835
psycopg2
tox.ini
View file @
a4ebd835
...
...
@@ -9,7 +9,11 @@ commands =
python
manage.py
templatecheck
--project-only
python
manage.py
makemigrations
--no-input
--check
--dry-run
python
-Wall
manage.py
test
deps
=
-r{toxinidir}/requirements.txt
deps
=
-r{toxinidir}/requirements.txt
{env:CI_DEPS:}
passenv
=
GITLAB_CI
[flake8]
exclude
=
*/migrations/*, */urls.py, .ropeproject
...
...
website/thaliawebsite/settings/__init__.py
View file @
a4ebd835
...
...
@@ -8,3 +8,5 @@ except ImportError:
if
os
.
environ
.
get
(
'DJANGO_PRODUCTION'
):
from
.production
import
*
if
os
.
environ
.
get
(
'GITLAB_CI'
):
from
.testing
import
*
website/thaliawebsite/settings/settings.py
View file @
a4ebd835
...
...
@@ -110,7 +110,6 @@ WSGI_APPLICATION = 'thaliawebsite.wsgi.application'
# Database
# https://docs.djangoproject.com/en/dev/ref/settings/#databases
DATABASES
=
{
'default'
:
{
'ENGINE'
:
'django.db.backends.sqlite3'
,
...
...
website/thaliawebsite/settings/testing.py
0 → 100644
View file @
a4ebd835
DATABASES
=
{
'default'
:
{
'ENGINE'
:
'django.db.backends.postgresql'
,
'NAME'
:
'thalia'
,
'USER'
:
'postgres'
,
'PASSWORD'
:
''
,
'HOST'
:
'postgres'
,
'PORT'
:
5432
,
},
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment