Skip to content

Commit 3656023

Browse files
authoredDec 29, 2023··
Add Django 5.0 and Python 3.12 support (#63)
* Add Django 5.0 and Python 3.12 support * Explicitly install setuptools * Only install setuptools for python 3.12
1 parent 36e4f7d commit 3656023

File tree

3 files changed

+26
-7
lines changed

3 files changed

+26
-7
lines changed
 

‎.github/workflows/action.yml

+16-4
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ jobs:
1111
runs-on: ubuntu-latest
1212
strategy:
1313
matrix:
14-
python-version: ['3.8', '3.9', '3.10', '3.11']
15-
django-version: ['3.2', '4.0', '4.1', '4.2']
14+
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
15+
django-version: ['3.2', '4.0', '4.1', '4.2', '5.0']
1616
services:
1717
postgres:
1818
image: postgres:12
@@ -50,15 +50,27 @@ jobs:
5050
- name: Test versions Python ${{ matrix.python-version }} Django ${{ matrix.django-version }}
5151
shell: bash
5252
run: |
53-
if [[ "${{ matrix.python-version }}" == "3.11" && "${{ matrix.django-version }}" == "3.2" ]]; then
53+
if [[ "${{ matrix.python-version }}" == "3.8" && "${{ matrix.django-version }}" == "5.0" ]]; then
5454
echo "Skipping unsupported Python/Django combination"
5555
exit 0
56-
elif [[ "${{ matrix.python-version }}" == "3.11" && "${{ matrix.django-version }}" == "4.0" ]]; then
56+
elif [[ "${{ matrix.python-version }}" == "3.9" && "${{ matrix.django-version }}" == "5.0" ]]; then
57+
echo "Skipping unsupported Python/Django combination"
58+
exit 0
59+
elif [[ "${{ matrix.python-version }}" == "3.11" && ( "${{ matrix.django-version }}" == "3.2" || "${{ matrix.django-version }}" == "4.0" ) ]]; then
60+
echo "Skipping unsupported Python/Django combination"
61+
exit 0
62+
elif [[ "${{ matrix.python-version }}" == "3.12" && ( "${{ matrix.django-version }}" == "3.2" || "${{ matrix.django-version }}" == "4.0" || "${{ matrix.django-version }}" == "4.1" ) ]]; then
5763
echo "Skipping unsupported Python/Django combination"
5864
exit 0
5965
fi
66+
6067
pip install Django==${{ matrix.django-version }} mysqlclient psycopg2
6168
pip install flake8 pylint pytest pytest-django
69+
70+
if [[ "${{ matrix.python-version }}" == "3.12" ]]; then
71+
pip install setuptools
72+
fi
73+
6274
pip install -e .
6375
python setup.py test
6476
./lint.sh

‎CHANGELOG.rst

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
Changelog
22
=========
33

4-
3.4.0
4+
4.1.0
5+
--------------------
6+
- Add support for Python 3.12
7+
- Add support for Django 5.0
8+
9+
4.0.0
510
--------------------
611
- Add support for Python 3.8 - 3.11
712
- Add support for Django 4.1 and 4.2

‎setup.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616

1717
install_requires = (
18-
'Django>=3.2,<4.3',
18+
'Django>=3.2,<5.1',
1919
)
2020

2121

@@ -67,7 +67,7 @@ def run_tests(self):
6767

6868
setup(
6969
name='django-livefield',
70-
version='4.0.0',
70+
version='4.1.0',
7171
description='Convenient soft-deletion support for Django models',
7272
long_description=(
7373
open('README.rst').read() + '\n\n' +
@@ -79,10 +79,12 @@ def run_tests(self):
7979
'Framework :: Django :: 4.0',
8080
'Framework :: Django :: 4.1',
8181
'Framework :: Django :: 4.2',
82+
'Framework :: Django :: 5.0',
8283
'Programming Language :: Python :: 3.8',
8384
'Programming Language :: Python :: 3.9',
8485
'Programming Language :: Python :: 3.10',
8586
'Programming Language :: Python :: 3.11',
87+
'Programming Language :: Python :: 3.12',
8688
],
8789
keywords='python django soft-delete',
8890
url='https://github.com/hearsaycorp/django-livefield',

0 commit comments

Comments
 (0)
Please sign in to comment.