Merge pull request #256 from asherf/pytest

Upgrade dependencies - isort & pytest.

Author: asherf

django_prometheus/tests/test_testutils.py

@@ -61,15 +61,18 @@ def testGetMetricVector(self):
         vector = self.test_case.getMetricVector(
             "some_labelled_gauge", registry=self.registry
         )
-        assert sorted(
-            [
-                ({"labelred": "pink", "labelblue": "indigo"}, 1),
-                ({"labelred": "pink", "labelblue": "royal"}, 2),
-                ({"labelred": "carmin", "labelblue": "indigo"}, 3),
-                ({"labelred": "carmin", "labelblue": "royal"}, 4),
-            ],
-            key=itemgetter(1),
-        ) == sorted(vector, key=itemgetter(1))
+        assert (
+            sorted(
+                [
+                    ({"labelred": "pink", "labelblue": "indigo"}, 1),
+                    ({"labelred": "pink", "labelblue": "royal"}, 2),
+                    ({"labelred": "carmin", "labelblue": "indigo"}, 3),
+                    ({"labelred": "carmin", "labelblue": "royal"}, 4),
+                ],
+                key=itemgetter(1),
+            )
+            == sorted(vector, key=itemgetter(1))
+        )
 
     def testAssertMetricEquals(self):
         """Tests assertMetricEquals."""

django_prometheus/testutils.py

@@ -167,7 +167,11 @@ def assertMetricCompare(
             saved_value,
             current_value,
         )
-        assert predicate(saved_value, current_value) is True, (
-            METRIC_COMPARE_ERR_EXPLANATION
-            % (metric_name, self.formatLabels(labels), saved_value, current_value)
+        assert (
+            predicate(saved_value, current_value) is True
+        ), METRIC_COMPARE_ERR_EXPLANATION % (
+            metric_name,
+            self.formatLabels(labels),
+            saved_value,
+            current_value,
         )

requirements.txt

@@ -1,12 +1,11 @@
 django-redis>=4.12.1
 black; python_version >= '3.6'
 flake8
-isort<5
+isort>=5.5.4,<6
 prometheus-client>=0.7
 pip-prometheus>=1.2.1
-mock
 mysqlclient
 psycopg2
-pytest==6.0.1
+pytest>=6.1.1,<7
 pytest-django
 python-memcached