diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4cc13e7d..a091a150 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] + python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] os: [ubuntu-22.04] runs-on: ${{ matrix.os }} name: "${{ matrix.os }} Python: ${{ matrix.python-version }}" diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a43bc2e..ca6f4a2c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## v2.4.0 - UNPUBLISHED +* Add support for Django 5.0 and Python 3.12. + ## v2.3.1 - May 2nd, 2023 * Fix postgresql provider import, Thanks [@wilsonehusin](https://github.com/korfuri/django-prometheus/pull/402) @@ -40,4 +42,4 @@ ## v1.1.0 - Sep 28, 2019 -* maintenance release that updates this library to support recent and supported version of python & Django \ No newline at end of file +* maintenance release that updates this library to support recent and supported version of python & Django diff --git a/pyproject.toml b/pyproject.toml index d59b21fc..1ddd9f3a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,7 +22,11 @@ line-length = 120 legacy_tox_ini = """ [tox] min_version = 4.4 -envlist = {py37,py38,py39,py310,py311}-django{320}-{end2end,unittests},{py38,py39,py310,py311}-django{400,410,420}-{end2end,unittests},py39-lint +envlist = + {py37,py38,py39,py310,py311}-django{320}-{end2end,unittests} + {py38,py39,py310,py311,312}-django{400,410,420}-{end2end,unittests} + {py310,py311,312}-django{500}-{end2end,unittests} + py39-lint [gh-actions] python = @@ -31,6 +35,7 @@ python = 3.9: py39, py39-lint 3.10: py310 3.11: py311 + 3.12: py312 [testenv] deps = @@ -38,6 +43,7 @@ deps = django400: Django>=4.0,<4.1 django410: Django>=4.1,<4.2 django420: Django>=4.2,<4.3 + django500: Django>=5.0a1,<5.1 coverage -rrequirements.txt skip_missing_interpreters=true diff --git a/requirements.txt b/requirements.txt index a2dcf286..3cd82f19 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,8 +5,10 @@ prometheus-client>=0.12.0 pip-prometheus>=1.2.1 mysqlclient psycopg2 -pytest==7.3.1 +pytest==7.4.3 pytest-django pylibmc pymemcache -python-memcached \ No newline at end of file +python-memcached +setuptools +wheel diff --git a/setup.py b/setup.py index 471439d9..f874eb1c 100644 --- a/setup.py +++ b/setup.py @@ -56,10 +56,12 @@ def get_version(): "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", "Framework :: Django :: 3.2", "Framework :: Django :: 4.0", "Framework :: Django :: 4.1", "Framework :: Django :: 4.2", + "Framework :: Django :: 5.0", "Topic :: System :: Monitoring", "License :: OSI Approved :: Apache Software License", ],