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

Jump to bottom

Support Python 3.12 and Django 5.0 #69

Merged
merged 3 commits into from
Dec 13, 2023
Merged

Support Python 3.12 and Django 5.0 #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c5f9509
Support Python 3.12 and Django 5.0
mgax Dec 11, 2023
e48346d
Add classifier for Django 5.0
mgax Dec 13, 2023
883038b
Loosen restrictions on numpy and scipy
mgax Dec 13, 2023
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
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,19 +49,19 @@ jobs:
continue-on-error: ${{ matrix.experimental }}
strategy:
matrix:
python: ["3.8", "3.9", "3.10", "3.11"]
python: ["3.8", "3.9", "3.10", "3.11", "3.12"]
experimental: [false]
toxenv: ["py"]
include:
# Linting
- python: "3.11"
- python: "3.12"
toxenv: flake8
experimental: false
# Future Wagtail release from main branch (allowed to fail)
- python: "3.11"
- python: "3.12"
toxenv: wagtailmain-sqlite
experimental: true
- python: "3.11"
- python: "3.12"
toxenv: wagtailmain-postgres
experimental: true
steps:
Expand Down
6 changes: 4 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,20 +36,22 @@
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Framework :: Django",
"Framework :: Django :: 3.2",
"Framework :: Django :: 4.0",
Copy link
Member

Choose a reason for hiding this comment

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

@mgax could you please add the Django 5.0 trove classifier too?

"Framework :: Django :: 4.1",
"Framework :: Django :: 4.2",
"Framework :: Django :: 5.0",
"Framework :: Wagtail",
"Framework :: Wagtail :: 4",
"Framework :: Wagtail :: 5",
],
install_requires=[
"Wagtail>=4.1",
"user-agents>=2.2,<2.3",
"numpy>=1.19.4,<1.25",
"scipy>=1.5.4,<1.10",
"numpy>=1.19.4,<2",
"scipy>=1.5.4,<2",
],
extras_require={
"testing": ["dj-database-url==0.5.0", "freezegun==1.2.1"],
Expand Down
5 changes: 4 additions & 1 deletion tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ envlist =
py{38,39,310}-django{32,40,41}-wagtail{41,42}-{sqlite,postgres}
py311-django41-wagtail{41,42}-{sqlite,postgres}
py{38,39,310,311}-django{32,41,42}-wagtail{50,51,52}-{sqlite,postgres}
py312-django{42,50}-wagtail52-{sqlite,postgres}

[flake8]
# E501: Line too long
Expand All @@ -22,13 +23,15 @@ basepython =
py39: python3.9
py310: python3.10
py311: python3.11
py312: python3.12

deps =
coverage
django32: django>=3.2,<4.0
django40: django>=4.0,<4.1
django41: django>=4.1,<4.2
django42: django>=4.2,<5
django50: django>=5.0,<5.1

wagtail41: wagtail~=4.1
wagtail42: wagtail~=4.2
Expand All @@ -43,7 +46,7 @@ setenv =
postgres: DATABASE_URL={env:DATABASE_URL:postgres:///wagtail_ab_testing}

[testenv:flake8]
basepython=python3.11
basepython=python3.12
deps=flake8>=2.2.0
commands=flake8 wagtail_ab_testing

Expand Down