ulysia/szurubooru
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Check Travis-CI env

Browse source
This commit is contained in:
nothink 2018-07-26 00:50:23 +09:00
parent 99128bdc1f
commit 8ee5270a6a
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.travis.yml
View file

@ -33,6 +33,7 @@ matrix:
- pip install -r requirements.txt - pip install -r requirements.txt
- pip install -r dev-requirements.txt - pip install -r dev-requirements.txt
script: script:
- python -c "print(os.getenv('CI'))"
- pycodestyle wait-for-es - pycodestyle wait-for-es
- pycodestyle generate-thumb - pycodestyle generate-thumb
- pycodestyle szurubooru/ - pycodestyle szurubooru/

5
server/szurubooru/config.py
View file

@ -51,10 +51,9 @@ def read_config() -> Dict:
if os.path.exists('../config.yaml'): if os.path.exists('../config.yaml'):
with open('../config.yaml') as handle: with open('../config.yaml') as handle:
ret = merge(ret, yaml.load(handle.read())) ret = merge(ret, yaml.load(handle.read()))
if os.path.exists('/.dockerenv') and os.getenv('CI', '') != 'true': # if os.path.exists('/.dockerenv') and os.getenv('CI', '') != 'true':
ret = merge(ret, docker_config()) # ret = merge(ret, docker_config())
return ret return ret
print(os.getenv('CI'))
config = read_config() # pylint: disable=invalid-name config = read_config() # pylint: disable=invalid-name