Fix CI - remove old versions (Django & python) - pin ubuntu in CI (#354)

Author: asherf

.github/workflows/ci.yml

@@ -12,8 +12,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
-        os: [ubuntu-latest]
+        python-version: ["3.7", "3.8", "3.9", "3.10"]
+        os: [ubuntu-20.04]
     runs-on: ${{ matrix.os }}
     name: "${{ matrix.os }} Python: ${{ matrix.python-version }}"
     services:
@@ -48,7 +48,7 @@ jobs:
     - name: Install dependencies
       run: |
         pip install -U "pip>=21.1"
-        pip install -U setuptools "tox>=3.23.0,<4" codecov tox-gh-actions coverage
+        pip install -U setuptools "tox-gh-actions==2.12.0" coverage
         sudo apt-get update
         sudo apt-get install binutils libproj-dev gdal-bin libmemcached-dev
     - name: Log versions

README.md

@@ -15,14 +15,15 @@ Export Django monitoring metrics for Prometheus.io
 This library provides Prometheus metrics for Django related operations:
 
 * Requests & Responses
-* Database access done via [Django ORM](https://docs.djangoproject.com/en/3.0/topics/db/)
-* Cache access done via [Django Cache framework](https://docs.djangoproject.com/en/3.0/topics/cache/)
+* Database access done via [Django ORM](https://docs.djangoproject.com/en/3.2/topics/db/)
+* Cache access done via [Django Cache framework](https://docs.djangoproject.com/en/3.2/topics/cache/)
 
 ## Usage
 
 ### Requirements
 
-* Django >= 2.2
+* Django >= 3.2
+* Python 3.7 and above.
 
 ### Installation
 
@@ -73,12 +74,13 @@ urlpatterns = [
 
 Prometheus uses Histogram based grouping for monitoring latencies. The default
 buckets are:
+
 ```python
 PROMETHEUS_LATENCY_BUCKETS = (0.01, 0.025, 0.05, 0.075, 0.1, 0.25, 0.5, 0.75, 1.0, 2.5, 5.0, 7.5, 10.0, 25.0, 50.0, 75.0, float("inf"),)
 ```
 
 You can define custom buckets for latency, adding more buckets decreases performance but
-increases accuracy: https://prometheus.io/docs/practices/histograms/
+increases accuracy: <https://prometheus.io/docs/practices/histograms/>
 
 ```python
 PROMETHEUS_LATENCY_BUCKETS = (.1, .2, .5, .6, .8, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.5, 9.0, 12.0, 15.0, 20.0, 30.0, float("inf"))

django_prometheus/cache/backends/memcached.py

@@ -1,4 +1,3 @@
-from django import VERSION as DJANGO_VERSION
 from django.core.cache.backends import memcached
 
 from django_prometheus.cache.metrics import (
@@ -19,20 +18,13 @@ def get(self, key, default=None, version=None):
         return cached or default
 
 
-class MemcachedCache(MemcachedPrometheusCacheMixin, memcached.MemcachedCache):
+class PyLibMCCache(MemcachedPrometheusCacheMixin, memcached.PyLibMCCache):
     """Inherit memcached to add metrics about hit/miss ratio"""
 
     pass
 
 
-if DJANGO_VERSION >= (3, 2):
-
-    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"""
+class PyMemcacheCache(MemcachedPrometheusCacheMixin, memcached.PyMemcacheCache):
+    """Inherit memcached to add metrics about hit/miss ratio"""
 
-        pass
+    pass

django_prometheus/conf/__init__.py

@@ -24,4 +24,6 @@
 
 if settings.configured:
     NAMESPACE = getattr(settings, "PROMETHEUS_METRIC_NAMESPACE", NAMESPACE)
-    PROMETHEUS_LATENCY_BUCKETS = getattr(settings, "PROMETHEUS_LATENCY_BUCKETS", PROMETHEUS_LATENCY_BUCKETS)
+    PROMETHEUS_LATENCY_BUCKETS = getattr(
+        settings, "PROMETHEUS_LATENCY_BUCKETS", PROMETHEUS_LATENCY_BUCKETS
+    )

django_prometheus/middleware.py

@@ -1,4 +1,3 @@
-from django.conf import settings
 from django.utils.deprecation import MiddlewareMixin
 from prometheus_client import Counter, Histogram
 

django_prometheus/tests/end2end/testapp/settings.py

@@ -1,7 +1,6 @@
 import os
 import tempfile
 
-from django import VERSION as DJANGO_VERSION
 from testapp.helpers import get_middleware
 
 # SECURITY WARNING: keep the secret key used in production secret!
@@ -97,11 +96,15 @@
 
 CACHES = {
     "default": {
-        "BACKEND": "django_prometheus.cache.backends.memcached.MemcachedCache",
+        "BACKEND": "django_prometheus.cache.backends.memcached.PyLibMCCache",
+        "LOCATION": "localhost:11211",
+    },
+    "memcached.PyLibMCCache": {
+        "BACKEND": "django_prometheus.cache.backends.memcached.PyLibMCCache",
         "LOCATION": "localhost:11211",
     },
-    "memcached.MemcachedCache": {
-        "BACKEND": "django_prometheus.cache.backends.memcached.MemcachedCache",
+    "memcached.PyMemcacheCache": {
+        "BACKEND": "django_prometheus.cache.backends.memcached.PyMemcacheCache",
         "LOCATION": "localhost:11211",
     },
     "filebased": {
@@ -129,16 +132,6 @@
 }
 
 
-if DJANGO_VERSION >= (3, 2):
-    CACHES["memcached.PyLibMCCache"] = {
-        "BACKEND": "django_prometheus.cache.backends.memcached.PyLibMCCache",
-        "LOCATION": "localhost:11211",
-    }
-    CACHES["memcached.PyMemcacheCache"] = {
-        "BACKEND": "django_prometheus.cache.backends.memcached.PyMemcacheCache",
-        "LOCATION": "localhost:11211",
-    }
-
 # Internationalization
 LANGUAGE_CODE = "en-us"
 TIME_ZONE = "UTC"

django_prometheus/tests/end2end/testapp/test_caches.py

@@ -1,4 +1,3 @@
-from django import VERSION as DJANGO_VERSION
 from django.core.cache import caches
 from django.test import TestCase
 from redis import RedisError
@@ -11,20 +10,13 @@ class TestCachesMetrics(PrometheusTestCaseMixin, TestCase):
 
     def testCounters(self):
         supported_caches = [
-            "memcached.MemcachedCache",
+            "memcached.PyLibMCCache",
+            "memcached.PyMemcacheCache",
             "filebased",
             "locmem",
             "redis",
         ]
 
-        if DJANGO_VERSION >= (3, 2):
-            supported_caches.extend(
-                [
-                    "memcached.PyLibMCCache",
-                    "memcached.PyMemcacheCache",
-                ]
-            )
-
         # Note: those tests require a memcached server running
         for supported_cache in supported_caches:
             tested_cache = caches[supported_cache]
@@ -115,20 +107,13 @@ def test_redis_cache_fail(self):
 
     def test_cache_version_support(self):
         supported_caches = [
-            "memcached.MemcachedCache",
+            "memcached.PyLibMCCache",
+            "memcached.PyMemcacheCache",
             "filebased",
             "locmem",
             "redis",
         ]
 
-        if DJANGO_VERSION >= (3, 2):
-            supported_caches.extend(
-                [
-                    "memcached.PyLibMCCache",
-                    "memcached.PyMemcacheCache",
-                ]
-            )
-
         # Note: those tests require a memcached server running
         for supported_cache in supported_caches:
             tested_cache = caches[supported_cache]

django_prometheus/tests/end2end/testapp/test_middleware.py

@@ -138,7 +138,7 @@ def test_exception_latency_histograms(self):
             registry,
             2,
             M("requests_latency_seconds_by_view_method_bucket"),
-            le="2.0",
+            le="2.5",
             view="testapp.views.objection",
             method="GET",
         )

pyproject.toml

@@ -15,23 +15,19 @@ include_trailing_comma = true
 [tool.tox]
 legacy_tox_ini = """
 [tox]
-envlist = {py36,py37,py38,py39,py310}-django{220,300,310,320}-{end2end,unittests},{py38,py39,py310}-django-400-{end2end,unittests},py38-lint
+envlist = {py37,py38,py39,py310}-django{320}-{end2end,unittests},{py38,py39,py310}-django{400}-{end2end,unittests},py38-lint
 
 [gh-actions]
 python =
-    3.6: py36
     3.7: py37
     3.8: py38, py38-lint
     3.9: py39
     3.10: py310
 
 [testenv]
 deps =
-    django220: Django>=2.2,<2.3
-    django300: Django>=3.0,<3.1
-    django310: Django>=3.1,<3.2
     django320: Django>=3.2,<3.3
-    django4: Django==4.0
+    django400: Django>=4.0,<4.1
     coverage
     -rrequirements.txt
 skip_missing_interpreters=true
@@ -48,7 +44,7 @@ commands =
 
 [testenv:py38-lint]
 deps =
-    black
+    black==22.6.0
     flake8
     isort>=5.5.4,<6
     flake8-debugger

setup.py

@@ -51,14 +51,10 @@ def get_version():
         "Intended Audience :: Information Technology",
         "Intended Audience :: System Administrators",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
-        "Framework :: Django :: 2.2",
-        "Framework :: Django :: 3.0",
-        "Framework :: Django :: 3.1",
         "Framework :: Django :: 3.2",
         "Framework :: Django :: 4.0",
         "Topic :: System :: Monitoring",