diff options
| -rw-r--r-- | .gitlab-ci.yml | 11 | ||||
| -rw-r--r-- | chimere/views.py | 3 | ||||
| -rw-r--r-- | chimere_example_project/settings.py | 1 |
3 files changed, 6 insertions, 9 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a4d3a85..e44c932 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,16 +1,17 @@ before_script: - apt-get update - - apt-get install -q -y python-pip libpq-dev python-dev + - apt-get install -q -y python-pip libpq-dev python-dev libjpeg-dev zlib1g-dev libxml2-dev libxslt1-dev libgeos-dev - pip install -q -r requirements.txt - cp Makefile.example Makefile + - echo "LOG_PATH = '/tmp/'" > chimere_example_project/local_settings.py variables: - POSTGRES_DB: morrigan - POSTGRES_USER: morrigan - POSTGRES_PASSWORD: "morrigan" + POSTGRES_DB: chimere + POSTGRES_USER: chimere + POSTGRES_PASSWORD: "chimere" services: - - postgres:9.1 + - mdillon/postgis:9.1 master: script: "make test_gitlab" diff --git a/chimere/views.py b/chimere/views.py index a95357f..1ccd482 100644 --- a/chimere/views.py +++ b/chimere/views.py @@ -1,9 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # Copyright (C) 2008-2016 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> -# -# RSS : Copyright (C) 2010 Pierre Clarenc <pierre.crc_AT_gmailDOTcom>, -# Samuel Renard <renard.samuel_AT_gmailDOTcom>, # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as diff --git a/chimere_example_project/settings.py b/chimere_example_project/settings.py index 8ab1da4..360e66d 100644 --- a/chimere_example_project/settings.py +++ b/chimere_example_project/settings.py @@ -5,7 +5,6 @@ # overload all theses settings in your local_settings.py file import os -import sys _ = lambda s: s DEBUG = False |