From cf8c0752cd2304eead787d8858b9c5d223b0b801 Mon Sep 17 00:00:00 2001
From: Georg Krause <mail@georg-krause.net>
Date: Mon, 5 Jul 2021 12:21:52 +0000
Subject: [PATCH] Update dev and test dependencies

---
 .gitlab-ci.yml                            |  2 +-
 api/funkwhale_api/federation/factories.py |  6 +++---
 api/funkwhale_api/moderation/factories.py | 10 +++++-----
 api/requirements/local.txt                |  4 ++--
 api/requirements/test.txt                 |  4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 27f1951e1a..fb732fb072 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -143,7 +143,7 @@ test_api:
     - pip3 install -r requirements/local.txt
     - pip3 install -r requirements/test.txt
   script:
-    - pytest --cov-report xml --cov=funkwhale_api --junitxml=report.xml tests/
+    - pytest --cov-report xml --cov-report term-missing --cov=funkwhale_api --junitxml=report.xml tests/
   tags:
     - docker
   artifacts:
diff --git a/api/funkwhale_api/federation/factories.py b/api/funkwhale_api/federation/factories.py
index 574560f0df..51aef3afda 100644
--- a/api/funkwhale_api/federation/factories.py
+++ b/api/funkwhale_api/federation/factories.py
@@ -98,7 +98,7 @@ def get_cached_key_pair():
 
 
 @registry.register
-class ActorFactory(NoUpdateOnCreate, factory.DjangoModelFactory):
+class ActorFactory(NoUpdateOnCreate, factory.django.DjangoModelFactory):
     public_key = None
     private_key = None
     preferred_username = factory.Faker("user_name")
@@ -154,7 +154,7 @@ class ActorFactory(NoUpdateOnCreate, factory.DjangoModelFactory):
 
 
 @registry.register
-class FollowFactory(NoUpdateOnCreate, factory.DjangoModelFactory):
+class FollowFactory(NoUpdateOnCreate, factory.django.DjangoModelFactory):
     target = factory.SubFactory(ActorFactory)
     actor = factory.SubFactory(ActorFactory)
 
@@ -234,7 +234,7 @@ class DeliveryFactory(NoUpdateOnCreate, factory.django.DjangoModelFactory):
 
 
 @registry.register
-class LibraryFollowFactory(NoUpdateOnCreate, factory.DjangoModelFactory):
+class LibraryFollowFactory(NoUpdateOnCreate, factory.django.DjangoModelFactory):
     target = factory.SubFactory(MusicLibraryFactory)
     actor = factory.SubFactory(ActorFactory)
 
diff --git a/api/funkwhale_api/moderation/factories.py b/api/funkwhale_api/moderation/factories.py
index 35256285df..74a1daa652 100644
--- a/api/funkwhale_api/moderation/factories.py
+++ b/api/funkwhale_api/moderation/factories.py
@@ -9,7 +9,7 @@ from . import serializers
 
 
 @registry.register
-class InstancePolicyFactory(NoUpdateOnCreate, factory.DjangoModelFactory):
+class InstancePolicyFactory(NoUpdateOnCreate, factory.django.DjangoModelFactory):
     summary = factory.Faker("paragraph")
     actor = factory.SubFactory(federation_factories.ActorFactory)
     block_all = True
@@ -28,7 +28,7 @@ class InstancePolicyFactory(NoUpdateOnCreate, factory.DjangoModelFactory):
 
 
 @registry.register
-class UserFilterFactory(NoUpdateOnCreate, factory.DjangoModelFactory):
+class UserFilterFactory(NoUpdateOnCreate, factory.django.DjangoModelFactory):
     user = factory.SubFactory(users_factories.UserFactory)
     target_artist = None
 
@@ -42,7 +42,7 @@ class UserFilterFactory(NoUpdateOnCreate, factory.DjangoModelFactory):
 
 
 @registry.register
-class NoteFactory(NoUpdateOnCreate, factory.DjangoModelFactory):
+class NoteFactory(NoUpdateOnCreate, factory.django.DjangoModelFactory):
     author = factory.SubFactory(federation_factories.ActorFactory)
     target = None
     summary = factory.Faker("paragraph")
@@ -52,7 +52,7 @@ class NoteFactory(NoUpdateOnCreate, factory.DjangoModelFactory):
 
 
 @registry.register
-class ReportFactory(NoUpdateOnCreate, factory.DjangoModelFactory):
+class ReportFactory(NoUpdateOnCreate, factory.django.DjangoModelFactory):
     submitter = factory.SubFactory(federation_factories.ActorFactory)
     target = factory.SubFactory(music_factories.ArtistFactory)
     summary = factory.Faker("paragraph")
@@ -77,7 +77,7 @@ class ReportFactory(NoUpdateOnCreate, factory.DjangoModelFactory):
 
 
 @registry.register
-class UserRequestFactory(NoUpdateOnCreate, factory.DjangoModelFactory):
+class UserRequestFactory(NoUpdateOnCreate, factory.django.DjangoModelFactory):
     submitter = factory.SubFactory(federation_factories.ActorFactory, local=True)
 
     class Meta:
diff --git a/api/requirements/local.txt b/api/requirements/local.txt
index f321c81c6a..fa53b23cb8 100644
--- a/api/requirements/local.txt
+++ b/api/requirements/local.txt
@@ -1,8 +1,8 @@
 # Local development dependencies go here
 
 coverage~=5.5.0
-django_coverage_plugin~=1.8.0
-factory_boy~=2.12.0
+django_coverage_plugin~=2.0.0
+factory_boy~=3.2.0
 
 # django-debug-toolbar that works with Django 1.5+
 django-debug-toolbar~=3.2.1
diff --git a/api/requirements/test.txt b/api/requirements/test.txt
index 0f217da3d0..0821198f06 100644
--- a/api/requirements/test.txt
+++ b/api/requirements/test.txt
@@ -3,10 +3,10 @@
 flake8~=3.9.1
 pytest~=6.2.3
 pytest-cov~=2.12.0
-pytest-django~=4.3.0
+pytest-django~=4.4.0
 pytest-env~=0.6.0
 pytest-mock~=3.6.0
 pytest-randomly~=3.8.0
 pytest-sugar~=0.9.0
 requests-mock~=1.9.0
-faker~=8.2.0
+faker~=8.9.1
-- 
GitLab