From 1f69ddeead48b28787943f41b182286e07929793 Mon Sep 17 00:00:00 2001 From: Denys Zhdanov Date: Sun, 25 Aug 2024 23:01:08 +0200 Subject: [PATCH] Trying to use Django 5 --- docs/install.rst | 2 +- docs/requirements.txt | 4 ++-- requirements.txt | 4 ++-- tox.ini | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/install.rst b/docs/install.rst index 31bb78e21..5dc9162ca 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -36,7 +36,7 @@ Basic Graphite requirements: * Python 3.8 or greater * `cairocffi`_ * `Django`_ 4.2+ -* `django-tagging`_ 0.4.6 (not `django-taggit`, unfortunately) +* `django-tagging`_ 0.5.0 (not `django-taggit`, unfortunately) * `pytz`_ * `pyparsing` 2.3.0+ * `fontconfig`_ and at least one font package (a system package usually) diff --git a/docs/requirements.txt b/docs/requirements.txt index 9c04a79c5..7f39a05f8 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,10 +1,10 @@ ## Requirements for documentation cairocffi -django-tagging +django-tagging==0.5.0 pytz git+https://github.com/graphite-project/whisper.git#egg=whisper git+https://github.com/graphite-project/ceres.git#egg=ceres -Django<5 +Django>=4.2,<6 pyparsing>=3.0.6 alabaster==1.0.0 Sphinx==1.3.6 diff --git a/requirements.txt b/requirements.txt index c0663c71e..5399a5359 100644 --- a/requirements.txt +++ b/requirements.txt @@ -35,10 +35,10 @@ # deactivate # -Django>=4.2,<5 +Django>=4.2,<6 python-memcached>=1.58 txAMQP>=0.8.2,<0.9 -django-tagging +django-tagging==0.5.0 gunicorn pytz pyparsing>=2.3.0 diff --git a/tox.ini b/tox.ini index 38edebd8a..d289cfea6 100644 --- a/tox.ini +++ b/tox.ini @@ -28,14 +28,14 @@ commands = deps = coverage cairocffi - django-tagging + django-tagging==0.5.0 pytz mock msgpack-python git+https://github.com/graphite-project/whisper.git#egg=whisper git+https://github.com/graphite-project/ceres.git#egg=ceres pyparsing>=3.0.6 - Django>=4.2,<5 + Django>=4.2,<6 urllib3 redis rrdtool @@ -48,11 +48,11 @@ basepython = python3.10 changedir = docs deps = cairocffi - django-tagging + django-tagging==0.5.0 pytz git+https://github.com/graphite-project/whisper.git#egg=whisper git+https://github.com/graphite-project/ceres.git#egg=ceres - Django<5 + Django>=4.2,<6 pyparsing3: pyparsing>=3.0.6 alabaster==1.0.0 Sphinx==8.0.2