django-prometheus 2.4.0.dev27__tar.gz → 2.5.0.dev3__tar.gz

{django_prometheus-2.4.0.dev27/django_prometheus.egg-info → django_prometheus-2.5.0.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-prometheus
-Version: 2.4.0.dev27
+Version: 2.5.0.dev3
 Summary: Django middlewares to monitor your application with Prometheus.io.
 Home-page: http://github.com/korfuri/django-prometheus
 Author: Uriel Corfa

{django_prometheus-2.4.0.dev27 → django_prometheus-2.5.0.dev3}/django_prometheus/__init__.py

@@ -10,7 +10,7 @@ from django_prometheus import middleware, models
 
 __all__ = ["middleware", "models", "pip_prometheus"]
 
-__version__ = "2.4.0.dev27"
+__version__ = "2.5.0.dev3"
 
 
 # Import pip_prometheus to export the pip metrics automatically.

{django_prometheus-2.4.0.dev27 → django_prometheus-2.5.0.dev3}/django_prometheus/cache/backends/memcached.py

@@ -22,10 +22,6 @@ class MemcachedPrometheusCacheMixin:
 class PyLibMCCache(MemcachedPrometheusCacheMixin, memcached.PyLibMCCache):
     """Inherit memcached to add metrics about hit/miss ratio"""
 
-    pass
-
 
 class PyMemcacheCache(MemcachedPrometheusCacheMixin, memcached.PyMemcacheCache):
     """Inherit memcached to add metrics about hit/miss ratio"""
-
-    pass

{django_prometheus-2.4.0.dev27 → django_prometheus-2.5.0.dev3}/django_prometheus/cache/backends/redis.py

@@ -28,9 +28,8 @@ class RedisCache(cache.RedisCache):
             if cached is not None:
                 django_cache_hits_total.labels(backend="redis").inc()
                 return cached
-            else:
-                django_cache_misses_total.labels(backend="redis").inc()
-                return default
+            django_cache_misses_total.labels(backend="redis").inc()
+            return default
 
 
 class NativeRedisCache(DjangoRedisCache):
@@ -44,6 +43,5 @@ class NativeRedisCache(DjangoRedisCache):
         if result is not None:
             django_cache_hits_total.labels(backend="native_redis").inc()
             return result
-        else:
-            django_cache_misses_total.labels(backend="native_redis").inc()
-            return default
+        django_cache_misses_total.labels(backend="native_redis").inc()
+        return default

{django_prometheus-2.4.0.dev27 → django_prometheus-2.5.0.dev3}/django_prometheus/db/backends/mysql/base.py

@@ -6,8 +6,6 @@ from django_prometheus.db.common import DatabaseWrapperMixin, ExportingCursorWra
 class DatabaseFeatures(base.DatabaseFeatures):
     """Our database has the exact same features as the base one."""
 
-    pass
-
 
 class DatabaseWrapper(DatabaseWrapperMixin, base.DatabaseWrapper):
     CURSOR_CLASS = base.CursorWrapper

{django_prometheus-2.4.0.dev27 → django_prometheus-2.5.0.dev3}/django_prometheus/db/backends/spatialite/base.py

@@ -7,8 +7,6 @@ from django_prometheus.db.common import DatabaseWrapperMixin
 class DatabaseFeatures(features.DatabaseFeatures):
     """Our database has the exact same features as the base one."""
 
-    pass
-
 
 class DatabaseWrapper(DatabaseWrapperMixin, base.DatabaseWrapper):
     CURSOR_CLASS = sqlite_base.SQLiteCursorWrapper

{django_prometheus-2.4.0.dev27 → django_prometheus-2.5.0.dev3}/django_prometheus/db/backends/sqlite3/base.py

@@ -6,8 +6,6 @@ from django_prometheus.db.common import DatabaseWrapperMixin
 class DatabaseFeatures(base.DatabaseFeatures):
     """Our database has the exact same features as the base one."""
 
-    pass
-
 
 class DatabaseWrapper(DatabaseWrapperMixin, base.DatabaseWrapper):
     CURSOR_CLASS = base.SQLiteCursorWrapper

{django_prometheus-2.4.0.dev27 → django_prometheus-2.5.0.dev3}/django_prometheus/db/common.py

@@ -55,7 +55,6 @@ def ExportingCursorWrapper(cursor_class, alias, vendor):
     """Returns a CursorWrapper class that knows its database's alias and
     vendor name.
     """
-
     labels = {"alias": alias, "vendor": vendor}
 
     class CursorWrapper(cursor_class):

{django_prometheus-2.4.0.dev27 → django_prometheus-2.5.0.dev3}/django_prometheus/exports.py

@@ -91,7 +91,7 @@ def SetupPrometheusEndpointOnPortRange(port_range, addr=""):
         thread = PrometheusEndpointServer(httpd)
         thread.daemon = True
         thread.start()
-        logger.info("Exporting Prometheus /metrics/ on port %s" % port)
+        logger.info(f"Exporting Prometheus /metrics/ on port {port}")
         return port  # Stop trying ports at this point
     logger.warning("Cannot export Prometheus /metrics/ - no available ports in supplied range")
     return None

{django_prometheus-2.4.0.dev27 → django_prometheus-2.5.0.dev3}/django_prometheus/migrations.py

@@ -31,7 +31,6 @@ def ExportMigrations():
     This is meant to be called during app startup, ideally by
     django_prometheus.apps.AppConfig.
     """
-
     # Import MigrationExecutor lazily. MigrationExecutor checks at
     # import time that the apps are ready, and they are not when
     # django_prometheus is imported. ExportMigrations() should be

django_prometheus-2.5.0.dev3/django_prometheus/tests/test_django_prometheus.py

@@ -0,0 +1,11 @@
+#!/usr/bin/env python
+from django_prometheus.utils import PowersOf
+
+
+class TestDjangoPrometheus:
+    def testPowersOf(self):
+        """Tests utils.PowersOf."""
+        assert PowersOf(2, 4) == [0, 1, 2, 4, 8]
+        assert PowersOf(3, 5, lower=1) == [0, 3, 9, 27, 81, 243]
+        assert PowersOf(2, 4, include_zero=False) == [1, 2, 4, 8]
+        assert PowersOf(2, 6, lower=2, include_zero=False) == [4, 8, 16, 32, 64, 128]

{django_prometheus-2.4.0.dev27 → django_prometheus-2.5.0.dev3}/django_prometheus/tests/test_testutils.py

@@ -17,7 +17,7 @@ from django_prometheus.testutils import (
 
 
 class TestPrometheusTestCaseMixin:
-    @pytest.fixture()
+    @pytest.fixture
     def registry(self):
         return prometheus_client.CollectorRegistry()
 
@@ -43,20 +43,23 @@ class TestPrometheusTestCaseMixin:
 
     def test_get_metric(self, registry):
         """Tests get_metric."""
-        assert 42 == get_metric("some_gauge", registry=registry)
-        assert 1 == get_metric(
-            "some_labelled_gauge",
-            registry=registry,
-            labelred="pink",
-            labelblue="indigo",
+        assert get_metric("some_gauge", registry=registry) == 42
+        assert (
+            get_metric(
+                "some_labelled_gauge",
+                registry=registry,
+                labelred="pink",
+                labelblue="indigo",
+            )
+            == 1
         )
 
     def test_get_metrics_vector(self, registry):
         """Tests get_metrics_vector."""
         vector = get_metrics_vector("some_nonexistent_gauge", registry=registry)
-        assert [] == vector
+        assert vector == []
         vector = get_metrics_vector("some_gauge", registry=registry)
-        assert [({}, 42)] == vector
+        assert vector == [({}, 42)]
         vector = get_metrics_vector("some_labelled_gauge", registry=registry)
         assert sorted(
             [
@@ -99,18 +102,30 @@ class TestPrometheusTestCaseMixin:
         """Tests save_registry and frozen registries operations."""
         frozen_registry = save_registry(registry=registry)
         # Test that we can manipulate a frozen scalar metric.
-        assert 42 == get_metric_from_frozen_registry("some_gauge", frozen_registry)
+        assert get_metric_from_frozen_registry("some_gauge", frozen_registry) == 42
         some_gauge.set(99)
-        assert 42 == get_metric_from_frozen_registry("some_gauge", frozen_registry)
+        assert get_metric_from_frozen_registry("some_gauge", frozen_registry) == 42
         assert_metric_diff(frozen_registry, 99 - 42, "some_gauge", registry=registry)
         assert_metric_no_diff(frozen_registry, 1, "some_gauge", registry=registry)
         # Now test the same thing with a labelled metric.
-        assert 1 == get_metric_from_frozen_registry(
-            "some_labelled_gauge", frozen_registry, labelred="pink", labelblue="indigo"
+        assert (
+            get_metric_from_frozen_registry(
+                "some_labelled_gauge",
+                frozen_registry,
+                labelred="pink",
+                labelblue="indigo",
+            )
+            == 1
         )
         some_labelled_gauge.labels("pink", "indigo").set(5)
-        assert 1 == get_metric_from_frozen_registry(
-            "some_labelled_gauge", frozen_registry, labelred="pink", labelblue="indigo"
+        assert (
+            get_metric_from_frozen_registry(
+                "some_labelled_gauge",
+                frozen_registry,
+                labelred="pink",
+                labelblue="indigo",
+            )
+            == 1
         )
         assert_metric_diff(
             frozen_registry,

{django_prometheus-2.4.0.dev27 → django_prometheus-2.5.0.dev3}/django_prometheus/testutils.py

@@ -189,7 +189,7 @@ def format_labels(labels):
     Out:
       '{method="GET",port="80"}'
     """
-    return "{%s}" % ",".join([f'{k}="{v}"' for k, v in labels.items()])
+    return "{{{}}}".format(",".join([f'{k}="{v}"' for k, v in labels.items()]))
 
 
 def format_vector(vector):

{django_prometheus-2.4.0.dev27 → django_prometheus-2.5.0.dev3}/django_prometheus/utils.py

@@ -17,6 +17,7 @@ def TimeSince(t):
 
     Returns:
       the time since t, in fractional seconds.
+
     """
     return default_timer() - t
 
@@ -25,5 +26,4 @@ def PowersOf(logbase, count, lower=0, include_zero=True):
     """Returns a list of count powers of logbase (from logbase**lower)."""
     if not include_zero:
         return [logbase**i for i in range(lower, count + lower)]
-    else:
-        return [0] + [logbase**i for i in range(lower, count + lower)]
+    return [0] + [logbase**i for i in range(lower, count + lower)]

{django_prometheus-2.4.0.dev27 → django_prometheus-2.5.0.dev3/django_prometheus.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-prometheus
-Version: 2.4.0.dev27
+Version: 2.5.0.dev3
 Summary: Django middlewares to monitor your application with Prometheus.io.
 Home-page: http://github.com/korfuri/django-prometheus
 Author: Uriel Corfa

{django_prometheus-2.4.0.dev27 → django_prometheus-2.5.0.dev3}/pyproject.toml

@@ -4,10 +4,3 @@ build-backend = "setuptools.build_meta"
 
 [tool.pytest.ini_options]
 addopts = " --ignore django_prometheus/tests/end2end"
-
-[tool.ruff]
-line-length = 120
-target-version = "py39"
-
-[tool.ruff.lint]
-select = ["B", "C4", "E", "F", "I", "T10", "YTT", "W"]

{django_prometheus-2.4.0.dev27 → django_prometheus-2.5.0.dev3}/setup.py

@@ -36,7 +36,7 @@ setup(
     packages=find_packages(
         exclude=[
             "tests",
-        ]
+        ],
     ),
     test_suite="django_prometheus.tests",
     long_description=LONG_DESCRIPTION,

django_prometheus-2.4.0.dev27/django_prometheus/tests/test_django_prometheus.py

@@ -1,11 +0,0 @@
-#!/usr/bin/env python
-from django_prometheus.utils import PowersOf
-
-
-class TestDjangoPrometheus:
-    def testPowersOf(self):
-        """Tests utils.PowersOf."""
-        assert [0, 1, 2, 4, 8] == PowersOf(2, 4)
-        assert [0, 3, 9, 27, 81, 243] == PowersOf(3, 5, lower=1)
-        assert [1, 2, 4, 8] == PowersOf(2, 4, include_zero=False)
-        assert [4, 8, 16, 32, 64, 128] == PowersOf(2, 6, lower=2, include_zero=False)