From 8e602a9b7aba709592e40047808c8c8206256e3e Mon Sep 17 00:00:00 2001 From: Oliver Marks Date: Mon, 3 Oct 2016 21:56:27 +0100 Subject: [PATCH] tests should be setup correctly now --- .drone.yml | 4 +++- website/config/settings.py | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index b1ccbde..509b12c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,7 +5,9 @@ build: SERVER_ENVIRONMENT: DOCKER commands: - sleep 15 - - python3 -m "scaffold" "migrate --username=mhackspace --password=mhackspace --database=maidstone_hackspace --host=127.0.0.1" + - cd website + - python3 -m "scaffold" "import" + - cd ../ # - python3 -m "scaffold" - pytest diff --git a/website/config/settings.py b/website/config/settings.py index 5415dde..0d6c85e 100644 --- a/website/config/settings.py +++ b/website/config/settings.py @@ -5,8 +5,8 @@ from scaffold.core.data.database import db from scaffold.core.data.sql import query_builder from scaffold import web -from website import constants -from website.libs import mail +#from website import constants +#from website.libs import mail schema = 'https:' @@ -95,5 +95,6 @@ with web.template as setup: port=port) query_builder.set_path(os.path.abspath('./website/data/sql/')) +print('set database config') db.config(database) -mail.sendmail.set_server(email_server) +#mail.sendmail.set_server(email_server)