Fix tests

.github/workflows/tests.yml

@@ -6,6 +6,7 @@ on:
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [ master, 1.0.x, 1.1.x ]
+  workflow_dispatch:
 
 jobs:
   build:
@@ -37,7 +38,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
 
     steps:
       - uses: actions/checkout@v4
@@ -66,7 +67,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip 'setuptools<58' --force-reinstall
-          pip install 'tox<4' tox-gh-actions flake8 pytest
+          pip install 'tox<4' tox-gh-actions flake8 pytest pytz
           if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
       - name: Test with tox
         env:
@@ -81,24 +82,24 @@ jobs:
         run: |
           tox
       - name: Linting
-        if: ${{ matrix.python-version==3.12 }}
+        if: ${{ matrix.python-version==3.13 }}
         env:
           TOXENV: lint
         run: |
           tox
       - name: Testing documentation
-        if: ${{ matrix.python-version==3.12 }}
+        if: ${{ matrix.python-version==3.13 }}
         env:
           TOXENV: docs
         run: |
           tox
       - name: Run Codecov
-        if: ${{ matrix.python-version==3.12 }}
+        if: ${{ matrix.python-version==3.13 }}
         env:
           TOXENV: lint
         run: |
           pip install codecov
           codecov
       - name: Upload coverage to Codecov
-        if: ${{ matrix.python-version==3.12 }}
+        if: ${{ matrix.python-version==3.13 }}
         uses: codecov/codecov-action@v4

docs/conf.py

@@ -18,7 +18,7 @@
 from sphinx.ext import autodoc
 
 # Bring in the new ReadTheDocs sphinx theme
-import sphinx_rtd_theme
+#import sphinx_rtd_theme
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -146,7 +146,7 @@ def setup(app):
 #html_theme_options = {}
 
 # Add any paths that contain custom themes here, relative to this directory.
-html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
+# html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
@@ -239,3 +239,8 @@ def setup(app):
 
 # If false, no module index is generated.
 #latex_use_modindex = True
+
+suppress_warnings = [
+    'toc.not_readable',  # Suppress warnings about excluded toctree entries
+    'app.add_directive',
+]

docs/config-webapp.rst

@@ -323,7 +323,7 @@ Finally, configure the nginx vhost:
         listen 80;
 
         location /static/ {
-            alias /opt/graphite/webapp/content/
+            alias /opt/graphite/webapp/content/;
         }
 
         location / {

setup.py

@@ -107,7 +107,7 @@ def read(fname):
       package_data={'graphite': ['templates/*', 'local_settings.py.example']},
       scripts=glob('bin/*'),
       data_files=list(webapp_content.items()) + storage_dirs + conf_files + examples,
-      install_requires=['Django>=3.2,<4', 'django-tagging==0.5.0', 'pytz',
+      install_requires=['Django>=4.2,<5', 'django-tagging', 'pytz',
                         'pyparsing', 'cairocffi', 'urllib3', 'six'],
       classifiers=[
           'Intended Audience :: Developers',

tox.ini

@@ -1,14 +1,14 @@
 [gh-actions]
 python =
-    3.8: py38
     3.9: py39
     3.10: py310
     3.11: py311
     3.12: py312
+    3.13: py313
 
 [tox]
 envlist =
-  py{38,39,310,311,312},lint, docs
+  py{39,310,311,312,313},lint,docs
 
 [testenv]
 whitelist_externals =
@@ -44,7 +44,7 @@ deps =
 	pyhash: pyhash
 
 [testenv:docs]
-basepython = python3.10
+basepython = python3.13
 changedir = docs
 deps =
 	cairocffi
@@ -54,17 +54,17 @@ deps =
 	git+https://github.com/graphite-project/ceres.git#egg=ceres
 	Django<5
 	pyparsing3: pyparsing>=3.0.6
-	alabaster==0.7.12
-	Sphinx==1.3.6
-	jinja2<3.1.0
+	alabaster
+	Sphinx
+	jinja2
 	sphinx_rtd_theme
 	urllib3
 commands =
 	mkdir -p {envsitepackagesdir}/../storage/ceres
 	sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html
 
 [testenv:lint]
-basepython = python3.12
+basepython = python3.13
 changedir = {toxinidir}
 deps =
 	flake8==3.7.9