Skip to content

Commit 219232f

Browse files
authored
Fix CI (#437)
1 parent e967088 commit 219232f

File tree

5 files changed

+6
-7
lines changed

5 files changed

+6
-7
lines changed

django_prometheus/cache/backends/redis.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from django import VERSION as DJANGO_VERSION
22
from django_redis import cache, exceptions
3+
34
from django_prometheus.cache.metrics import (
45
django_cache_get_fail_total,
56
django_cache_get_total,
@@ -36,7 +37,6 @@ def get(self, key, default=None, version=None, client=None):
3637
from django.core.cache.backends.redis import RedisCache as DjangoRedisCache
3738

3839
class NativeRedisCache(DjangoRedisCache):
39-
4040
def get(self, key, default=None, version=None):
4141
django_cache_get_total.labels(backend="native_redis").inc()
4242
try:

django_prometheus/tests/end2end/testapp/settings.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
import tempfile
33

44
from django import VERSION as DJANGO_VERSION
5-
65
from testapp.helpers import get_middleware
76

87
# SECURITY WARNING: keep the secret key used in production secret!

django_prometheus/tests/end2end/testapp/test_caches.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import pytest
2-
from django.core.cache import caches
32
from django import VERSION as DJANGO_VERSION
3+
from django.core.cache import caches
44
from redis import RedisError
55

66
from django_prometheus.testutils import assert_metric_equal, get_metric

pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[build-system]
2-
requires = [ "setuptools >= 67.7.2", "wheel >= 0.40.0"]
2+
requires = ["setuptools >= 67.7.2, < 72.0.0", "wheel >= 0.40.0"]
33
build-backend = "setuptools.build_meta"
44

55
[tool.pytest.ini_options]
@@ -24,8 +24,8 @@ legacy_tox_ini = """
2424
min_version = 4.4
2525
envlist =
2626
{py37,py38,py39,py310,py311}-django{320}-{end2end,unittests}
27-
{py38,py39,py310,py311,312}-django{400,410,420}-{end2end,unittests}
28-
{py310,py311,312}-django{500}-{end2end,unittests}
27+
{py38,py39,py310,py311,py312}-django{400,410,420}-{end2end,unittests}
28+
{py310,py311,py312}-django{500}-{end2end,unittests}
2929
py39-lint
3030
3131
[gh-actions]

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ pytest-django
1010
pylibmc
1111
pymemcache
1212
python-memcached
13-
setuptools
13+
setuptools<72.0.0
1414
wheel

0 commit comments

Comments
 (0)