Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update tox.ini for Django 3.2, pypy, github actions #227

Closed
wants to merge 2 commits into from
Closed

Update tox.ini for Django 3.2, pypy, github actions #227

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd7c35c
Update tox.ini for Django 3.2, pypy, gh
jwhitlock Jun 21, 2024
fa9d503
Remove pypy from Django 3.2 testing
jwhitlock Jun 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ envlist =
{3.10,3.11,3.12,pypy310}-main
{3.10,3.11,3.12,pypy310}-5.0.x
{3.8,3.9,3.10,3.11,3.12,pypy38,pypy39,pypy310}-4.2.x
{3.8,3.9,3.10,pypy38,pypy39,pypy310}-3.2.x
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was able to get this working in a branch where I added typing annotations. I'll see if I can uplift that fix to this PR.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't figured out the changes that made these work yet. It seems unlikely that pypy changes behavior based on types, so I'll work to tease apart the code changes from the typing changes and see if that fixes it.

I think this PR is still mergable because of the improvement in the testing configuration.

{3.8,3.9,3.10}-3.2.x


# Don't run coverage when testing with pypy:
# see https://github.com/nedbat/coveragepy/issues/1382
[testenv:pypy310-main,pypy310-5.0.x,{pypy38,pypy39,pypy310}-4.2.x,{pypy38,pypy39,pypy310}-3.2.x]
[testenv:pypy310-main,pypy310-5.0.x,{pypy38,pypy39,pypy310}-4.2.x]
commands =
pip install --upgrade pip
pip install -e .[tests]
Expand All @@ -32,10 +32,13 @@ basepython =
3.10: python3.10
3.11: python3.11
3.12: python3.12
pypy3: pypy3
pypy38: pypy3.8
pypy39: pypy3.9
pypy310: pypy3.10

deps =
pytest
3.2.x: Django>=3.2,<3.3
4.2.x: Django>=4.2,<4.3
5.0.x: Django>=5.0.1,<5.1
main: https://github.com/django/django/archive/main.tar.gz
Expand All @@ -45,11 +48,11 @@ deps =
# Running tox in GHA without redefining it all in a GHA matrix:
# https://github.com/ymyzk/tox-gh-actions
python =
3.8: py38
3.9: py39
3.10: py310
3.11: py311
3.12: py312
3.8: 3.8
3.9: 3.9
3.10: 3.10
3.11: 3.11
3.12: 3.12
pypy-3.8: pypy38
pypy-3.9: pypy39
pypy-3.10: pypy310