Skip to content

Commit

Permalink
Adds Python3.12 and Wagtail 5.0, 5.1 and 5.2 to Tox and remove suppor…
Browse files Browse the repository at this point in the history
…t for Wagtail <4.1
  • Loading branch information
leewesleyv committed Jan 9, 2024
1 parent da579fe commit 0b7e873
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
python-version: ["3.8", "3.9", "3.10", "3.11"]
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
steps:
- name: Checkout code
uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion docs/setup.rst
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ If you are already referencing one of these apps in your :code:`INSTALLED_APPS`
INSTALLED_APPS = (
...
'wagtail.contrib.legacy.richtext',
'wagtail.core',
'wagtail',
'wagtail.admin',
'wagtail.documents',
'wagtail.snippets',
Expand Down
8 changes: 6 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ def get_metadata(package, field):
long_description=codecs.open(os.path.join(os.path.dirname(__file__), 'README.rst'), encoding='utf-8').read(),
install_requires=[
'Django>=3.2,<4.3',
'wagtail>=4.0,<5.1',
'wagtail>=4.1,<5.3',
'django-el-pagination==4.0.0',
'django-social-share>=1.3.0',
'django-colorful>=1.3',
'django-taggit>=3.1.0,<4.1',
'wagtail-markdown==0.11.0'
'wagtail-markdown==0.11.1'
],
url='http://github.com/APSL/puput',
author=get_metadata('puput', 'author'),
Expand All @@ -44,13 +44,17 @@ def get_metadata(package, field):
'Framework :: Django :: 4.0',
'Framework :: Django :: 4.1',
'Framework :: Django :: 4.2',
'Framework :: Wagtail',
'Framework :: Wagtail :: 4',
'Framework :: Wagtail :: 5',
'Intended Audience :: Developers',
'Programming Language :: Python',
'Programming Language :: Python :: 3',
'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',
'Operating System :: OS Independent',
'Topic :: Software Development'
]
Expand Down
22 changes: 16 additions & 6 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
[tox]
envlist = py{38,39,310,311}-dj{32,40,41,42}, flake8, black
envlist =
py{38,39,310}-dj{32,40,41}-wt{41,42,50,51}
py311-dj{32,40,41,42}-wt{50,51}
py312-dj{32,40,41,42}-wt52
flake8
black

[gh-actions]
python =
3.8: py38-dj{32,40,41,42}, flake8, black
3.9: py39-dj{32,40,41,42}
3.10: py310-dj{32,40,41,42}
3.11: py311-dj{32,40,41,42}

3.8: py38-dj{32,40,41}-wt{41,42,50,51,52}
3.9: py39-dj{32,40,41}-wt{41,42,50,51,52}
3.10: py310-dj{32,40,41,42}-wt{50,51,52}, flake8, black
3.11: py311-dj{32,40,41,42}-wt{50,51,52}
3.12: py312-dj{32,40,41,42}-wt52

[flake8]
max-line-length = 120
Expand Down Expand Up @@ -37,6 +42,11 @@ deps =
dj41: Django>=4.1,<4.2
dj42: Django>=4.2,<4.3

wt41: wagtail>=4.1,<4.2
wt42: wagtail>=4.2,<4.3
wt50: wagtail>=5.0,<5.1
wt51: wagtail>=5.1,<5.2
wt52: wagtail>=5.2,<5.3

[testenv:flake8]
basepython = python3.10
Expand Down

0 comments on commit 0b7e873

Please sign in to comment.