diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 5aae356..0000000 --- a/.travis.yml +++ /dev/null @@ -1,15 +0,0 @@ -dist: xenial -language: python -python: - - 3.6 - -addons: - apt: - packages: - - poppler-utils - -install: - - pip install -r requirements.txt - - mkdir media - -script: python manage.py test diff --git a/common/settings.py b/common/settings.py index d0bc411..6da2629 100644 --- a/common/settings.py +++ b/common/settings.py @@ -144,8 +144,4 @@ DATE_LIEU_EXAMEN_EDE = "mercredi 7 mars 2018, à 13h30, salle A405" DATE_LIEU_EXAMEN_EDS = "mercredi 7 mars 2018, à 13h30, salle A405" RESP_FILIERE_EDS = ("Brahim Ali Hemma", 'M') -if 'TRAVIS' in os.environ: - SECRET_KEY = 'secretkeyfortravistests' - STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.StaticFilesStorage' -else: - from .local_settings import * +from .local_settings import *