From 77c0b2b1a28b30f4054409199ebf069a4853df14 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Sun, 10 Jun 2018 12:10:15 +0200
Subject: [PATCH] See #297: added black as a local dependency, more verbose
check in CI
---
.gitlab-ci.yml | 4 ++--
api/requirements/local.txt | 1 +
api/tests/music/test_activity.py | 2 --
api/tests/subsonic/test_views.py | 4 +---
4 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 345451f1..5dfbf064 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,7 +20,7 @@ black:
before_script:
- pip install black
script:
- - black --check api/
+ - black --check --diff api/
flake8:
image: python:3.6
@@ -30,7 +30,7 @@ flake8:
before_script:
- pip install flake8
script:
- - flake8 api
+ - flake8 -v api
cache:
key: "$CI_PROJECT_ID__flake8_pip_cache"
paths:
diff --git a/api/requirements/local.txt b/api/requirements/local.txt
index c5f2ad0b..f11f976b 100644
--- a/api/requirements/local.txt
+++ b/api/requirements/local.txt
@@ -9,3 +9,4 @@ django-debug-toolbar>=1.9,<1.10
# improved REPL
ipdb==0.8.1
+black
diff --git a/api/tests/music/test_activity.py b/api/tests/music/test_activity.py
index 5286f1fe..8c119394 100644
--- a/api/tests/music/test_activity.py
+++ b/api/tests/music/test_activity.py
@@ -1,5 +1,3 @@
-
-
def test_get_track_activity_url_mbid(factories):
track = factories["music.Track"]()
expected = "https://musicbrainz.org/recording/{}".format(track.mbid)
diff --git a/api/tests/subsonic/test_views.py b/api/tests/subsonic/test_views.py
index f823a443..1523a2f6 100644
--- a/api/tests/subsonic/test_views.py
+++ b/api/tests/subsonic/test_views.py
@@ -163,9 +163,7 @@ def test_unstar(f, db, logged_in_api_client, factories):
url = reverse("api:subsonic-unstar")
assert url.endswith("unstar") is True
track = factories["music.Track"]()
- factories["favorites.TrackFavorite"](
- track=track, user=logged_in_api_client.user
- )
+ factories["favorites.TrackFavorite"](track=track, user=logged_in_api_client.user)
response = logged_in_api_client.get(url, {"f": f, "id": track.pk})
assert response.status_code == 200
--
GitLab