Merge branch 'broken-build' into 'develop'

fixed broken build

See merge request funkwhale/funkwhale!547
merge-requests/552/head
Eliot Berriot 2019-01-21 14:38:34 +01:00
commit 29083f72ea
1 zmienionych plików z 4 dodań i 5 usunięć

Wyświetl plik

@ -148,11 +148,10 @@ test_api:
- branches - branches
before_script: before_script:
- cd api - cd api
- apt-get update - sed -i '/Pillow/d' requirements/base.txt
- grep "^[^#;]" requirements.apt | grep -Fv "python3-dev" | xargs apt-get install -y --no-install-recommends - pip3 install -r requirements/base.txt
- pip install -r requirements/base.txt - pip3 install -r requirements/local.txt
- pip install -r requirements/local.txt - pip3 install -r requirements/test.txt
- pip install -r requirements/test.txt
script: script:
- pytest --cov=funkwhale_api tests/ - pytest --cov=funkwhale_api tests/
tags: tags: