Skip to content

Commit f96d940

Browse files
committed
Add support for Django-5. Drop support for Django<4.1
1 parent 9410039 commit f96d940

File tree

5 files changed

+24
-19
lines changed

5 files changed

+24
-19
lines changed

.github/workflows/publish.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,27 +17,26 @@ jobs:
1717

1818
strategy:
1919
matrix:
20-
python-version: ["3.9"]
21-
node-version: ["16.x"]
20+
python-version: ["3.11"]
21+
node-version: ["18.x"]
2222

2323
steps:
2424
- uses: actions/checkout@v3
2525
- name: Use Node.js ${{ matrix.node-version }}
2626
uses: actions/setup-node@v3
2727
- name: Set up Python ${{ matrix.python-version }}
28-
uses: actions/setup-python@v3
28+
uses: actions/setup-python@v5
2929
- name: Install Dependencies
3030
run: |
31-
npm ci --also=dev
32-
python -m pip install --upgrade pip
31+
npm ci --include=dev
3332
python -m pip install build --user
3433
- name: Build Client
3534
run: |
3635
npm run build
3736
- name: Patch templates
3837
run: |
3938
mkdir -p adminsortable2/templates/adminsortable2/edit_inline
40-
DJANGO_VERSIONS=("4.0" "4.1" "4.2")
39+
DJANGO_VERSIONS=("4.2" "5.0")
4140
for django_version in ${DJANGO_VERSIONS[@]}; do
4241
echo $django_version
4342
curl --silent --output adminsortable2/templates/adminsortable2/edit_inline/stacked-django-$django_version.html https://raw.githubusercontent.com/django/django/stable/$django_version.x/django/contrib/admin/templates/admin/edit_inline/stacked.html

.github/workflows/tests.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,24 @@ jobs:
2020
runs-on: ubuntu-latest
2121

2222
strategy:
23-
matrix:
24-
python-version: ["3.8", "3.9", "3.10", "3.11"]
25-
node-version: ["16.x"]
26-
django-version: ["4.0.*", "4.1.*", "4.2.*"]
27-
exclude: # https://docs.djangoproject.com/en/4.2/faq/install/#what-python-version-can-i-use-with-django
28-
- python-version: "3.11"
29-
django-version: "4.0.*"
23+
matrix: # https://docs.djangoproject.com/en/5.0/faq/install/#what-python-version-can-i-use-with-django
24+
python-version: ["3.9", "3.10", "3.11", "3.12"]
25+
node-version: ["18.x"]
26+
django-version: ["4.2.*", "5.0.*"]
3027

3128
steps:
3229
- uses: actions/checkout@v3
3330
- name: Use Node.js ${{ matrix.node-version }}
3431
uses: actions/setup-node@v3
3532
- name: Set up Python ${{ matrix.python-version }}
36-
uses: actions/setup-python@v3
33+
uses: actions/setup-python@v5
34+
with:
35+
python-version: ${{ matrix.python-version }}
3736
- name: Install Dependencies
3837
run: |
39-
npm ci --also=dev
38+
npm ci --include=dev
4039
python -m pip install --upgrade pip
40+
python -m pip install --upgrade setuptools wheel
4141
python -m pip install "Django==${{ matrix.django-version }}"
4242
python -m pip install -r testapp/requirements.txt
4343
python -m playwright install
@@ -48,7 +48,7 @@ jobs:
4848
- name: Patch templates
4949
run: |
5050
mkdir -p adminsortable2/templates/adminsortable2/edit_inline
51-
DJANGO_VERSIONS=("4.0" "4.1" "4.2")
51+
DJANGO_VERSIONS=("4.2" "5.0")
5252
for django_version in ${DJANGO_VERSIONS[@]}; do
5353
echo $django_version
5454
curl --silent --output adminsortable2/templates/adminsortable2/edit_inline/stacked-django-$django_version.html https://raw.githubusercontent.com/django/django/stable/$django_version.x/django/contrib/admin/templates/admin/edit_inline/stacked.html

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
## Release history of [django-admin-sortable2](https://github.com/jrief/django-admin-sortable2/)
44

5+
### 2.2
6+
- Add support for Django-5.0
7+
- Drop support for Python-3.12
8+
- Drop support for Django-4.1 and lower.
9+
510
### 2.1.11
611
- Upgrade all external dependencies to their latest versions.
712
- Adopt E2E tests to use Playwright's `locator`.

adminsortable2/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '2.1.11'
1+
__version__ = '2.2'

setup.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,14 @@ def readfile(filename):
2121
'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
2222
'Topic :: Software Development :: Libraries :: Application Frameworks',
2323
'Development Status :: 5 - Production/Stable',
24-
'Programming Language :: Python :: 3.8',
2524
'Programming Language :: Python :: 3.9',
2625
'Programming Language :: Python :: 3.10',
26+
'Programming Language :: Python :: 3.11',
2727
'Framework :: Django',
2828
'Framework :: Django :: 4.0',
2929
'Framework :: Django :: 4.1',
3030
'Framework :: Django :: 4.2',
31+
'Framework :: Django :: 5.0',
3132
]
3233

3334

@@ -45,7 +46,7 @@ def readfile(filename):
4546
platforms=['OS Independent'],
4647
classifiers=CLASSIFIERS,
4748
install_requires=[
48-
'Django>=4.0',
49+
'Django>=4.2',
4950
],
5051
packages=find_packages(exclude=['client', 'testapp', 'testapp*', 'docs']),
5152
include_package_data=True,

0 commit comments

Comments
 (0)