From 290429062257eb0d4cb570007df13e8823f4e57c Mon Sep 17 00:00:00 2001 From: Maxwell Date: Sun, 28 Apr 2024 16:21:10 +0200 Subject: [PATCH] hotfix: add support for Django ~5.0 and drop Django ~3.2 --- .github/workflows/cicd.yaml | 12 +++++++++--- pyproject.toml | 5 +++-- tox.ini | 16 ++++++++-------- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/.github/workflows/cicd.yaml b/.github/workflows/cicd.yaml index 06156f0..af24fac 100644 --- a/.github/workflows/cicd.yaml +++ b/.github/workflows/cicd.yaml @@ -10,9 +10,6 @@ jobs: strategy: matrix: include: - - python: 3.7 - django: 3.2 - toxenv: py37-django32 - python: 3.8 django: 3.2 toxenv: py38-django32 @@ -37,6 +34,15 @@ jobs: - python: '3.10' django: 4.1 toxenv: py310-django41 + - python: '3.10' + django: 5.0 + toxenv: py310-django50 + - python: '3.11' + django: 5.0 + toxenv: py311-django50 + - python: '3.12' + django: 5.0 + toxenv: py312-django50 steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v1 diff --git a/pyproject.toml b/pyproject.toml index 79ae59a..fda1f31 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,16 +32,17 @@ documentation = "https://github.com/eamigo86/graphene-django-extras" classifiers = [ "Intended Audience :: Developers", "Topic :: Software Development :: Libraries", - "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", "Programming Language :: Python :: Implementation :: PyPy", ] keywords = ["api", "graphql", "protocol", "graphene", "django"] [tool.poetry.dependencies] -python = "^3.8 || ^3.9 || ^3.10 || ^3.11" +python = "^3.8 || ^3.9 || ^3.10 || ^3.11 || ^3.12" django-filter = "^24.0" djangorestframework = "^3" python-dateutil = "^2.8.0" diff --git a/tox.ini b/tox.ini index bf88cbe..1128c3a 100644 --- a/tox.ini +++ b/tox.ini @@ -1,18 +1,18 @@ [tox] isolated_build = true envlist = - py{37,38,39}-django32 py{38,39,310}-django40 py{38,39,310}-django41 + py{310,311,312}-django50 quality security build [travis:env] DJANGO = - 3.2: django32 4.0: django40 4.1: django41 + 5.0: django50 [testenv] allowlist_externals = poetry @@ -21,31 +21,31 @@ commands = poetry install -vvv poetry run pytest tests/ --cov=graphene_django_extras -[testenv:py{37,38,39}-django32] +[testenv:py{38,39,310}-django40] allowlist_externals = poetry skip_install = true commands = poetry update --lock poetry install -vvv - poetry run pip install 'django~=3.2' + poetry run pip install 'django~=4.0' poetry run pytest tests/ --cov=graphene_django_extras -[testenv:py{38,39,310}-django40] +[testenv:py{38,39,310}-django41] allowlist_externals = poetry skip_install = true commands = poetry update --lock poetry install -vvv - poetry run pip install 'django~=4.0' + poetry run pip install 'django~=4.1' poetry run pytest tests/ --cov=graphene_django_extras -[testenv:py{38,39,310}-django41] +[testenv:py{310,311,312}-django50] allowlist_externals = poetry skip_install = true commands = poetry update --lock poetry install -vvv - poetry run pip install 'django~=4.1' + poetry run pip install 'django~=5.0' poetry run pytest tests/ --cov=graphene_django_extras [testenv:quality]