.gitignore                      |  1 +

 .tx/config                      |  9 ---------

 tests/test_description.py       |  6 ++++++

 tests/test_fields.py            | 14 +++++++-------

 tests/test_pagination.py        | 12 ++++++------

 tests/test_relations.py         |  2 +-

 tests/test_serializer.py        | 14 +++++++-------

 tests/test_serializer_lists.py  | 12 ++++++------

 tests/test_serializer_nested.py | 10 +++++-----

 tox.ini                         |  2 +-

 10 files changed, 40 insertions(+), 42 deletions(-)

diff --git a/.gitignore b/.gitignore

index 641714d1..fd7a0374 100644

--- a/.gitignore

+++ b/.gitignore

@@ -2,6 +2,7 @@

 *.db

 *~

 .*

+!.gear/

 *.py.bak

diff --git a/.tx/config b/.tx/config

deleted file mode 100644

index e151a7e6..00000000

--- a/.tx/config

+++ /dev/null

@@ -1,9 +0,0 @@

-[main]

-host = https://www.transifex.com

-lang_map = sr@latin:sr_Latn, zh-Hans:zh_Hans, zh-Hant:zh_Hant

-

-[django-rest-framework.djangopo]

-file_filter = rest_framework/locale/<lang>/LC_MESSAGES/django.po

-source_file = rest_framework/locale/en_US/LC_MESSAGES/django.po

-source_lang = en_US

-type = PO

diff --git a/tests/test_description.py b/tests/test_description.py

index ecc6b977..0e9a662a 100644

--- a/tests/test_description.py

+++ b/tests/test_description.py

@@ -139,6 +139,12 @@ class TestViewNamesAndDescriptions(TestCase):

         assert MockView().get_view_description() == 'a gettext string'

+    @pytest.mark.xfail(

+        reason=(

+            "Flaky test, see "

+            "https://github.com/encode/django-rest-framework/issues/8160"

+        ),

+    )

     @pytest.mark.skipif(not apply_markdown, reason="Markdown is not installed")

     def test_markdown(self):

         """

diff --git a/tests/test_fields.py b/tests/test_fields.py

index 11e29310..72ef23dc 100644

--- a/tests/test_fields.py

+++ b/tests/test_fields.py

@@ -239,7 +239,7 @@ class TestSource:

 class TestReadOnly:

-    def setup(self):

+    def setup_method(self):

         class TestSerializer(serializers.Serializer):

             read_only = serializers.ReadOnlyField(default="789")

             writable = serializers.IntegerField()

@@ -271,7 +271,7 @@ class TestReadOnly:

 class TestWriteOnly:

-    def setup(self):

+    def setup_method(self):

         class TestSerializer(serializers.Serializer):

             write_only = serializers.IntegerField(write_only=True)

             readable = serializers.IntegerField()

@@ -296,7 +296,7 @@ class TestWriteOnly:

 class TestInitial:

-    def setup(self):

+    def setup_method(self):

         class TestSerializer(serializers.Serializer):

             initial_field = serializers.IntegerField(initial=123)

             blank_field = serializers.IntegerField()

@@ -313,7 +313,7 @@ class TestInitial:

 class TestInitialWithCallable:

-    def setup(self):

+    def setup_method(self):

         def initial_value():

             return 123

@@ -331,7 +331,7 @@ class TestInitialWithCallable:

 class TestLabel:

-    def setup(self):

+    def setup_method(self):

         class TestSerializer(serializers.Serializer):

             labeled = serializers.IntegerField(label='My label')

         self.serializer = TestSerializer()

@@ -345,7 +345,7 @@ class TestLabel:

 class TestInvalidErrorKey:

-    def setup(self):

+    def setup_method(self):

         class ExampleField(serializers.Field):

             def to_native(self, data):

                 self.fail('incorrect')

@@ -539,7 +539,7 @@ class TestHTMLInput:

 class TestCreateOnlyDefault:

-    def setup(self):

+    def setup_method(self):

         default = serializers.CreateOnlyDefault('2001-01-01')

         class TestSerializer(serializers.Serializer):

diff --git a/tests/test_pagination.py b/tests/test_pagination.py

index c028f0ea..fe4a38b2 100644

--- a/tests/test_pagination.py

+++ b/tests/test_pagination.py

@@ -18,7 +18,7 @@ class TestPaginationIntegration:

     Integration tests.

     """

-    def setup(self):

+    def setup_method(self):

         class PassThroughSerializer(serializers.BaseSerializer):

             def to_representation(self, item):

                 return item

@@ -140,7 +140,7 @@ class TestPaginationDisabledIntegration:

     Integration tests for disabled pagination.

     """

-    def setup(self):

+    def setup_method(self):

         class PassThroughSerializer(serializers.BaseSerializer):

             def to_representation(self, item):

                 return item

@@ -163,7 +163,7 @@ class TestPageNumberPagination:

     Unit tests for `pagination.PageNumberPagination`.

     """

-    def setup(self):

+    def setup_method(self):

         class ExamplePagination(pagination.PageNumberPagination):

             page_size = 5

@@ -302,7 +302,7 @@ class TestPageNumberPaginationOverride:

     the Django Paginator Class is overridden.

     """

-    def setup(self):

+    def setup_method(self):

         class OverriddenDjangoPaginator(DjangoPaginator):

             # override the count in our overridden Django Paginator

             # we will only return one page, with one item

@@ -358,7 +358,7 @@ class TestLimitOffset:

     Unit tests for `pagination.LimitOffsetPagination`.

     """

-    def setup(self):

+    def setup_method(self):

         class ExamplePagination(pagination.LimitOffsetPagination):

             default_limit = 10

             max_limit = 15

@@ -937,7 +937,7 @@ class TestCursorPagination(CursorPaginationTestsMixin):

     Unit tests for `pagination.CursorPagination`.

     """

-    def setup(self):

+    def setup_method(self):

         class MockObject:

             def __init__(self, idx):

                 self.created = idx

diff --git a/tests/test_relations.py b/tests/test_relations.py

index bb719a65..7a4db1c4 100644

--- a/tests/test_relations.py

+++ b/tests/test_relations.py

@@ -374,7 +374,7 @@ class TestManyRelatedField(APISimpleTestCase):

 class TestHyperlink:

-    def setup(self):

+    def setup_method(self):

         self.default_hyperlink = serializers.Hyperlink('http://example.com', 'test')

     def test_can_be_pickled(self):

diff --git a/tests/test_serializer.py b/tests/test_serializer.py

index c4c29ba4..1d9efaa4 100644

--- a/tests/test_serializer.py

+++ b/tests/test_serializer.py

@@ -61,7 +61,7 @@ class TestFieldImports:

 # -----------------------------

 class TestSerializer:

-    def setup(self):

+    def setup_method(self):

         class ExampleSerializer(serializers.Serializer):

             char = serializers.CharField()

             integer = serializers.IntegerField()

@@ -240,7 +240,7 @@ class TestValidateMethod:

 class TestBaseSerializer:

-    def setup(self):

+    def setup_method(self):

         class ExampleSerializer(serializers.BaseSerializer):

             def to_representation(self, obj):

                 return {

@@ -337,7 +337,7 @@ class TestStarredSource:

         'nested2': {'c': 3, 'd': 4}

     }

-    def setup(self):

+    def setup_method(self):

         class NestedSerializer1(serializers.Serializer):

             a = serializers.IntegerField()

             b = serializers.IntegerField()

@@ -463,7 +463,7 @@ class TestNotRequiredOutput:

 class TestDefaultOutput:

-    def setup(self):

+    def setup_method(self):

         class ExampleSerializer(serializers.Serializer):

             has_default = serializers.CharField(default='x')

             has_default_callable = serializers.CharField(default=lambda: 'y')

@@ -584,7 +584,7 @@ class TestCacheSerializerData:

 class TestDefaultInclusions:

-    def setup(self):

+    def setup_method(self):

         class ExampleSerializer(serializers.Serializer):

             char = serializers.CharField(default='abc')

             integer = serializers.IntegerField()

@@ -612,7 +612,7 @@ class TestDefaultInclusions:

 class TestSerializerValidationWithCompiledRegexField:

-    def setup(self):

+    def setup_method(self):

         class ExampleSerializer(serializers.Serializer):

             name = serializers.RegexField(re.compile(r'\d'), required=True)

         self.Serializer = ExampleSerializer

@@ -641,7 +641,7 @@ class Test2555Regression:

 class Test4606Regression:

-    def setup(self):

+    def setup_method(self):

         class ExampleSerializer(serializers.Serializer):

             name = serializers.CharField(required=True)

             choices = serializers.CharField(required=True)

diff --git a/tests/test_serializer_lists.py b/tests/test_serializer_lists.py

index 551f6266..4b60643a 100644

--- a/tests/test_serializer_lists.py

+++ b/tests/test_serializer_lists.py

@@ -32,7 +32,7 @@ class TestListSerializer:

     Note that this is in contrast to using ListSerializer as a field.

     """

-    def setup(self):

+    def setup_method(self):

         class IntegerListSerializer(serializers.ListSerializer):

             child = serializers.IntegerField()

         self.Serializer = IntegerListSerializer

@@ -70,7 +70,7 @@ class TestListSerializerContainingNestedSerializer:

     Tests for using a ListSerializer containing another serializer.

     """

-    def setup(self):

+    def setup_method(self):

         class TestSerializer(serializers.Serializer):

             integer = serializers.IntegerField()

             boolean = serializers.BooleanField()

@@ -156,7 +156,7 @@ class TestNestedListSerializer:

     Tests for using a ListSerializer as a field.

     """

-    def setup(self):

+    def setup_method(self):

         class TestSerializer(serializers.Serializer):

             integers = serializers.ListSerializer(child=serializers.IntegerField())

             booleans = serializers.ListSerializer(child=serializers.BooleanField())

@@ -278,7 +278,7 @@ class TestNestedListSerializerAllowEmpty:

 class TestNestedListOfListsSerializer:

-    def setup(self):

+    def setup_method(self):

         class TestSerializer(serializers.Serializer):

             integers = serializers.ListSerializer(

                 child=serializers.ListSerializer(

@@ -594,7 +594,7 @@ class TestEmptyListSerializer:

     Tests the behaviour of ListSerializers when there is no data passed to it

     """

-    def setup(self):

+    def setup_method(self):

         class ExampleListSerializer(serializers.ListSerializer):

             child = serializers.IntegerField()

@@ -623,7 +623,7 @@ class TestMaxMinLengthListSerializer:

     Tests the behaviour of ListSerializers when max_length and min_length are used

     """

-    def setup(self):

+    def setup_method(self):

         class IntegerSerializer(serializers.Serializer):

             some_int = serializers.IntegerField()

diff --git a/tests/test_serializer_nested.py b/tests/test_serializer_nested.py

index 09ac37f2..986972a6 100644

--- a/tests/test_serializer_nested.py

+++ b/tests/test_serializer_nested.py

@@ -9,7 +9,7 @@ from rest_framework.serializers import raise_errors_on_nested_writes

 class TestNestedSerializer:

-    def setup(self):

+    def setup_method(self):

         class NestedSerializer(serializers.Serializer):

             one = serializers.IntegerField(max_value=10)

             two = serializers.IntegerField(max_value=10)

@@ -54,7 +54,7 @@ class TestNestedSerializer:

 class TestNotRequiredNestedSerializer:

-    def setup(self):

+    def setup_method(self):

         class NestedSerializer(serializers.Serializer):

             one = serializers.IntegerField(max_value=10)

@@ -83,7 +83,7 @@ class TestNotRequiredNestedSerializer:

 class TestNestedSerializerWithMany:

-    def setup(self):

+    def setup_method(self):

         class NestedSerializer(serializers.Serializer):

             example = serializers.IntegerField(max_value=10)

@@ -181,7 +181,7 @@ class TestNestedSerializerWithMany:

 class TestNestedSerializerWithList:

-    def setup(self):

+    def setup_method(self):

         class NestedSerializer(serializers.Serializer):

             example = serializers.MultipleChoiceField(choices=[1, 2, 3])

@@ -210,7 +210,7 @@ class TestNestedSerializerWithList:

 class TestNotRequiredNestedSerializerWithMany:

-    def setup(self):

+    def setup_method(self):

         class NestedSerializer(serializers.Serializer):

             one = serializers.IntegerField(max_value=10)

diff --git a/tox.ini b/tox.ini

index 957d8a2e..ece603f2 100644

--- a/tox.ini

+++ b/tox.ini

@@ -16,7 +16,7 @@ DJANGO =

     main: djangomain

 [testenv]

-commands = python -W error::DeprecationWarning -W error::PendingDeprecationWarning runtests.py --coverage {posargs}

+commands = python -W error::DeprecationWarning -W error::PendingDeprecationWarning runtests.py {posargs}

 envdir = {toxworkdir}/venvs/{envname}

 setenv =

        PYTHONDONTWRITEBYTECODE=1