Remove CI checking from config.py
This commit is contained in:
parent
2c8ba2bfc9
commit
db41b9fbce
2 changed files with 3 additions and 11 deletions
12
.travis.yml
12
.travis.yml
|
@ -7,12 +7,12 @@ services:
|
|||
|
||||
matrix:
|
||||
include:
|
||||
- language: python # Backend test for on-premise
|
||||
- language: python
|
||||
python:
|
||||
- "3.6"
|
||||
allow_failures:
|
||||
- python: "3.6"
|
||||
name: ""
|
||||
name: "Backend test for on-premise / 3.6"
|
||||
before_install:
|
||||
- sudo apt-get -y install software-properties-common
|
||||
- sudo add-apt-repository -y ppa:mc3man/trusty-media
|
||||
|
@ -35,7 +35,6 @@ matrix:
|
|||
- pip install -r requirements.txt
|
||||
- pip install -r dev-requirements.txt
|
||||
script:
|
||||
# - pycodestyle wait-for-es generate-thumb szurubooru/
|
||||
- ./wait-for-es
|
||||
- alembic upgrade head
|
||||
- py.test
|
||||
|
@ -67,17 +66,10 @@ matrix:
|
|||
- pip install -r requirements.txt
|
||||
- pip install -r dev-requirements.txt
|
||||
script:
|
||||
# - pycodestyle wait-for-es generate-thumb szurubooru/
|
||||
- ./wait-for-es
|
||||
- alembic upgrade head
|
||||
- py.test
|
||||
|
||||
- language: python
|
||||
python:
|
||||
- "3.6"
|
||||
script:
|
||||
- sudo cat /.dockerenv
|
||||
|
||||
- language: node_js # Frontend test using npm
|
||||
node_js:
|
||||
- "9"
|
||||
|
|
|
@ -51,7 +51,7 @@ 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':
|
||||
if os.path.exists('/.dockerenv'):
|
||||
ret = merge(ret, docker_config())
|
||||
|
||||
return ret
|
||||
|
|
Reference in a new issue