Check Travis-CI env
This commit is contained in:
parent
99128bdc1f
commit
8ee5270a6a
2 changed files with 3 additions and 3 deletions
|
@ -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/
|
||||
|
|
|
@ -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
|
||||
|
|
Reference in a new issue