From 8ee5270a6a3026ec2b1142e68ff85c4fee38a8be Mon Sep 17 00:00:00 2001 From: nothink Date: Thu, 26 Jul 2018 00:50:23 +0900 Subject: [PATCH] Check Travis-CI env --- .travis.yml | 1 + server/szurubooru/config.py | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index a54c7e82..4e6d0551 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,6 +33,7 @@ matrix: - pip install -r requirements.txt - pip install -r dev-requirements.txt script: + - python -c "print(os.getenv('CI'))" - pycodestyle wait-for-es - pycodestyle generate-thumb - pycodestyle szurubooru/ diff --git a/server/szurubooru/config.py b/server/szurubooru/config.py index b4f51e31..90958255 100644 --- a/server/szurubooru/config.py +++ b/server/szurubooru/config.py @@ -51,10 +51,9 @@ def read_config() -> Dict: if os.path.exists('../config.yaml'): with open('../config.yaml') as handle: ret = merge(ret, yaml.load(handle.read())) - if os.path.exists('/.dockerenv') and os.getenv('CI', '') != 'true': - ret = merge(ret, docker_config()) +# if os.path.exists('/.dockerenv') and os.getenv('CI', '') != 'true': +# ret = merge(ret, docker_config()) return ret -print(os.getenv('CI')) config = read_config() # pylint: disable=invalid-name