diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8a22f17..71a65f1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -24,6 +24,16 @@ jobs: strategy: matrix: + Python3.12 - Django 5.1: + python.version: '3.12' + tox.env: 'py312-django51' + Python3.11 - Django 5.1: + python.version: '3.11' + tox.env: 'py311-django51' + Python3.10 - Django 5.1: + python.version: '3.10' + tox.env: 'py310-django51' + Python3.12 - Django 5.0: python.version: '3.12' tox.env: 'py312-django50' @@ -34,6 +44,9 @@ jobs: python.version: '3.10' tox.env: 'py310-django50' + Python3.12 - Django 4.2: + python.version: '3.12' + tox.env: 'py311-django42' Python3.11 - Django 4.2: python.version: '3.11' tox.env: 'py311-django42' @@ -47,43 +60,6 @@ jobs: python.version: '3.8' tox.env: 'py38-django42' - Python3.11 - Django 4.1: - python.version: '3.11' - tox.env: 'py311-django41' - Python3.10 - Django 4.1: - python.version: '3.10' - tox.env: 'py310-django41' - Python 3.9 - Django 4.1: - python.version: '3.9' - tox.env: 'py39-django41' - Python 3.8 - Django 4.1: - python.version: '3.8' - tox.env: 'py38-django41' - - Python3.11 - Django 4.0: - python.version: '3.11' - tox.env: 'py311-django40' - Python3.10 - Django 4.0: - python.version: '3.10' - tox.env: 'py310-django40' - Python 3.9 - Django 4.0: - python.version: '3.9' - tox.env: 'py39-django40' - Python 3.8 - Django 4.0: - python.version: '3.8' - tox.env: 'py38-django40' - - Python3.11 - Django 3.2: - python.version: '3.11' - tox.env: 'py311-django32' - Python 3.9 - Django 3.2: - python.version: '3.9' - tox.env: 'py39-django32' - Python 3.8 - Django 3.2: - python.version: '3.8' - tox.env: 'py38-django32' - - steps: - task: CredScan@3 inputs: @@ -138,6 +114,16 @@ jobs: strategy: matrix: + Python3.12 - Django 5.1: + python.version: '3.12' + tox.env: 'py312-django51' + Python3.11 - Django 5.1: + python.version: '3.11' + tox.env: 'py311-django51' + Python3.10 - Django 5.1: + python.version: '3.10' + tox.env: 'py310-django51' + Python3.12 - Django 5.0: python.version: '3.12' tox.env: 'py312-django50' @@ -148,6 +134,9 @@ jobs: python.version: '3.10' tox.env: 'py310-django50' + Python3.12 - Django 4.2: + python.version: '3.12' + tox.env: 'py311-django42' Python3.11 - Django 4.2: python.version: '3.11' tox.env: 'py311-django42' @@ -161,42 +150,6 @@ jobs: python.version: '3.8' tox.env: 'py38-django42' - Python3.11 - Django 4.1: - python.version: '3.11' - tox.env: 'py311-django41' - Python3.10 - Django 4.1: - python.version: '3.10' - tox.env: 'py310-django41' - Python 3.9 - Django 4.1: - python.version: '3.9' - tox.env: 'py39-django41' - Python 3.8 - Django 4.1: - python.version: '3.8' - tox.env: 'py38-django41' - - Python3.11 - Django 4.0: - python.version: '3.11' - tox.env: 'py311-django40' - Python3.10 - Django 4.0: - python.version: '3.10' - tox.env: 'py310-django40' - Python 3.9 - Django 4.0: - python.version: '3.9' - tox.env: 'py39-django40' - Python 3.8 - Django 4.0: - python.version: '3.8' - tox.env: 'py38-django40' - - Python3.11 - Django 3.2: - python.version: '3.11' - tox.env: 'py311-django32' - Python 3.9 - Django 3.2: - python.version: '3.9' - tox.env: 'py39-django32' - Python 3.8 - Django 3.2: - python.version: '3.8' - tox.env: 'py38-django32' - steps: - task: UsePythonVersion@0 inputs: diff --git a/setup.py b/setup.py index 0c9a712..17a8fc0 100644 --- a/setup.py +++ b/setup.py @@ -16,11 +16,10 @@ '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', + 'Framework :: Django :: 5.1', + ] this_directory = path.abspath(path.dirname(__file__)) @@ -42,7 +41,7 @@ license='BSD', packages=find_packages(), install_requires=[ - 'django>=3.2,<5.1', + 'django>=4.2,<5.2', 'pyodbc>=3.0', 'pytz', ], diff --git a/tox.ini b/tox.ini index 8a30485..f4de106 100644 --- a/tox.ini +++ b/tox.ini @@ -1,10 +1,9 @@ [tox] envlist = - {py36,py37,py38,py39}-django32, - {py38, py39, py310}-django40, - {py38, py39, py310}-django41, {py38, py39, py310}-django42, - {py310, py311, py312}-django50 + {py310, py311, py312}-django50, + {py310, py311, py312}-django51 + [testenv] allowlist_externals = @@ -18,8 +17,6 @@ deps = coverage==5.5 unittest-xml-reporting - django32: django==3.2.* - django40: django>=4.0a1,<4.1 - django41: django>=4.1a1,<4.2 django42: django>=4.2,<4.3 django50: django>=5.0,<5.1 + django51: django>=5.1a1,<5.2