From dc37288d71828ef7c16be40e49e07c70c8795a78 Mon Sep 17 00:00:00 2001 From: johnthagen Date: Thu, 25 May 2023 15:44:30 -0400 Subject: [PATCH 1/9] Add support for Django 4.2 --- .github/workflows/main.yml | 11 +++++++++++ setup.py | 1 + tox.ini | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bc9a569..960f805 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -45,6 +45,17 @@ jobs: toxenv: py311-django41 - python: "pypy-3.8" toxenv: pypy3-django41 + + - python: "3.8" + toxenv: py38-django42 + - python: "3.9" + toxenv: py39-django42 + - python: "3.10" + toxenv: py310-django42 + - python: "3.11" + toxenv: py311-django42 + - python: "pypy-3.8" + toxenv: pypy3-django42 steps: - uses: actions/checkout@v2 - name: Setup Python diff --git a/setup.py b/setup.py index cd318db..7409a1d 100644 --- a/setup.py +++ b/setup.py @@ -50,6 +50,7 @@ def find_version(*parts): 'Framework :: Django :: 3.2', 'Framework :: Django :: 4.0', 'Framework :: Django :: 4.1', + 'Framework :: Django :: 4.2', 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Operating System :: OS Independent', diff --git a/tox.ini b/tox.ini index efa353f..488a83e 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,7 @@ envlist = py{36,37,38,39,310,py3}-django32 py{38,39,310,py3}-django40 - py{38,39,310,311,py3}-django{41,main} + py{38,39,310,311,py3}-django{41,42,main} [testenv] deps = djangomain: https://github.com/django/django/tarball/main From 24f442cd5497c4e05e1c7b234cd71acbaee8e9e2 Mon Sep 17 00:00:00 2001 From: johnthagen Date: Thu, 25 May 2023 15:53:16 -0400 Subject: [PATCH 2/9] Update Pypy testing to 3.9 --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 960f805..1329694 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,7 +23,7 @@ jobs: toxenv: py39-django32 - python: "3.10" toxenv: py310-django32 - - python: "pypy-3.8" + - python: "pypy-3.9" toxenv: pypy3-django32 - python: "3.8" @@ -32,7 +32,7 @@ jobs: toxenv: py39-django40 - python: "3.10" toxenv: py310-django40 - - python: "pypy-3.8" + - python: "pypy-3.9" toxenv: pypy3-django40 - python: "3.8" @@ -43,7 +43,7 @@ jobs: toxenv: py310-django41 - python: "3.11" toxenv: py311-django41 - - python: "pypy-3.8" + - python: "pypy-3.9" toxenv: pypy3-django41 - python: "3.8" @@ -54,7 +54,7 @@ jobs: toxenv: py310-django42 - python: "3.11" toxenv: py311-django42 - - python: "pypy-3.8" + - python: "pypy-3.9" toxenv: pypy3-django42 steps: - uses: actions/checkout@v2 From 9e1b6ee6e87ba21445371e66e333a6cde1041fb6 Mon Sep 17 00:00:00 2001 From: Mario Rosa Date: Thu, 25 May 2023 17:12:10 -0400 Subject: [PATCH 3/9] try removing coverage check for pypy --- test/pytest_plugin/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/pytest_plugin/__init__.py b/test/pytest_plugin/__init__.py index cf7f78e..bb16761 100644 --- a/test/pytest_plugin/__init__.py +++ b/test/pytest_plugin/__init__.py @@ -1,4 +1,5 @@ import sys +import platform import pytest @@ -7,3 +8,5 @@ def pytest_load_initial_conftests(early_config, parser, args): if hasattr(sys, 'gettrace') and sys.gettrace() is not None and '--forked' in args: args.remove('--forked') + if platform.python_implementation() == 'PyPy': + args.remove('--cov-report=term-missing --cov=django_cleanup') From 107a1a7948568ec1dc2d373927989bd36cb2a324 Mon Sep 17 00:00:00 2001 From: Mario Rosa Date: Thu, 25 May 2023 17:22:27 -0400 Subject: [PATCH 4/9] add --no-cov --- test/pytest_plugin/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/pytest_plugin/__init__.py b/test/pytest_plugin/__init__.py index bb16761..32b3142 100644 --- a/test/pytest_plugin/__init__.py +++ b/test/pytest_plugin/__init__.py @@ -10,3 +10,4 @@ def pytest_load_initial_conftests(early_config, parser, args): args.remove('--forked') if platform.python_implementation() == 'PyPy': args.remove('--cov-report=term-missing --cov=django_cleanup') + args.add('--no-cov') From 2659eaa789dff32efd615751079bd20a4b035425 Mon Sep 17 00:00:00 2001 From: Mario Rosa Date: Thu, 25 May 2023 17:28:50 -0400 Subject: [PATCH 5/9] try separate removes --- test/pytest_plugin/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/pytest_plugin/__init__.py b/test/pytest_plugin/__init__.py index 32b3142..612e9e9 100644 --- a/test/pytest_plugin/__init__.py +++ b/test/pytest_plugin/__init__.py @@ -9,5 +9,6 @@ def pytest_load_initial_conftests(early_config, parser, args): if hasattr(sys, 'gettrace') and sys.gettrace() is not None and '--forked' in args: args.remove('--forked') if platform.python_implementation() == 'PyPy': - args.remove('--cov-report=term-missing --cov=django_cleanup') + args.remove('--cov-report=term-missing') + args.remove('--cov=django_cleanup') args.add('--no-cov') From 8be3e9d5266fec0b32d7b593970fcf07f69cdc98 Mon Sep 17 00:00:00 2001 From: Mario Rosa Date: Thu, 25 May 2023 17:30:14 -0400 Subject: [PATCH 6/9] backout changes --- test/pytest_plugin/__init__.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/test/pytest_plugin/__init__.py b/test/pytest_plugin/__init__.py index 612e9e9..cf7f78e 100644 --- a/test/pytest_plugin/__init__.py +++ b/test/pytest_plugin/__init__.py @@ -1,5 +1,4 @@ import sys -import platform import pytest @@ -8,7 +7,3 @@ def pytest_load_initial_conftests(early_config, parser, args): if hasattr(sys, 'gettrace') and sys.gettrace() is not None and '--forked' in args: args.remove('--forked') - if platform.python_implementation() == 'PyPy': - args.remove('--cov-report=term-missing') - args.remove('--cov=django_cleanup') - args.add('--no-cov') From 2a34c71c50a83849ab4b561a0942e539c4fc1945 Mon Sep 17 00:00:00 2001 From: Mario Rosa Date: Thu, 25 May 2023 17:31:49 -0400 Subject: [PATCH 7/9] pin asgiref --- test/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/test/requirements.txt b/test/requirements.txt index a2dc4d4..f6026b1 100644 --- a/test/requirements.txt +++ b/test/requirements.txt @@ -7,3 +7,4 @@ pytest-pythonpath pytest-cov pytest-xdist pytest-forked +asgiref=3.6.0 From b174e78d363eba9ea2b797897c67eb7361d87742 Mon Sep 17 00:00:00 2001 From: Mario Rosa Date: Thu, 25 May 2023 17:32:26 -0400 Subject: [PATCH 8/9] typo --- test/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/requirements.txt b/test/requirements.txt index f6026b1..37d6850 100644 --- a/test/requirements.txt +++ b/test/requirements.txt @@ -7,4 +7,4 @@ pytest-pythonpath pytest-cov pytest-xdist pytest-forked -asgiref=3.6.0 +asgiref==3.6.0 From 9e973e58b989082b36588b5534edb17bf7f06674 Mon Sep 17 00:00:00 2001 From: Mario Rosa Date: Thu, 25 May 2023 17:34:46 -0400 Subject: [PATCH 9/9] anything less than 3.7 --- test/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/requirements.txt b/test/requirements.txt index 37d6850..7716de7 100644 --- a/test/requirements.txt +++ b/test/requirements.txt @@ -7,4 +7,4 @@ pytest-pythonpath pytest-cov pytest-xdist pytest-forked -asgiref==3.6.0 +asgiref<3.7.0