Skip to content

Commit

Permalink
Add django 5.1 support
Browse files Browse the repository at this point in the history
  • Loading branch information
FinalAngel committed Aug 22, 2024
1 parent 9da7061 commit dc23f80
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 56 deletions.
24 changes: 10 additions & 14 deletions .github/workflows/default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "3.12"
- name: Install flake8
run: pip install --upgrade flake8
- name: Run flake8
uses: liskin/gh-problem-matcher-wrap@v1
uses: liskin/gh-problem-matcher-wrap@v2
with:
linters: flake8
run: flake8
Expand All @@ -25,11 +25,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "3.12"
- run: python -m pip install isort
- name: isort
uses: liskin/gh-problem-matcher-wrap@v1
Expand All @@ -42,13 +42,13 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.10", "3.11"]
python-version: ["3.10", "3.11", "3.12"]
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
- name: Install dependencies
run: sudo apt-get install -y libxml2-dev libxslt-dev python-dev-is-python3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand All @@ -58,7 +58,3 @@ jobs:
pip install --upgrade urllib3 setuptools
pip install -r tests/requirements.txt
python setup.py install
- name: Run coverage
run: coverage run setup.py test
- name: Upload Coverage to Codecov
uses: codecov/codecov-action@v1
38 changes: 2 additions & 36 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,41 +3,7 @@ Changelog
=========


5.0.8.0 (2024-08-06)
5.1.0.0 (2024-08-22)
====================

* Upgrade Django to 5.0.8
see https://www.djangoproject.com/weblog/2024/aug/06/security-releases/ for details


5.0.7.0 (2024-07-18)
====================

* Upgrade Django to 5.0.7
see https://www.djangoproject.com/weblog/2024/jul/09/security-releases/ for details


5.0.6.0 (2024-05-22)
====================

* Added support for Django 5.0.6


5.0.3.0 (2024-03-04)
====================

* Upgrade Django to 5.0.3 (fixes CVE-2024-27351)
see https://www.djangoproject.com/weblog/2024/mar/04/security-releases/ for details


5.0.2.0 (2024-02-07)
====================

* Upgrade Django to 5.0.2 (fixes CVE-2024-24680)
see https://www.djangoproject.com/weblog/2024/feb/06/security-releases/ for details


5.0.1.0 (2024-01-03)
====================

* Added support for Django 5.0.1
* Added support for Django 5.1
6 changes: 3 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -148,12 +148,12 @@ You can run tests by executing::

.. |pypi| image:: https://badge.fury.io/py/aldryn-django.svg
:target: http://badge.fury.io/py/aldryn-django
.. |build| image:: https://github.com/divio/aldryn-django/actions/workflows/default.yml/badge.svg?branch=support/5.0.x
.. |build| image:: https://github.com/divio/aldryn-django/actions/workflows/default.yml/badge.svg?branch=support/5.1.x
:target: https://github.com/divio/aldryn-django/actions
.. |coverage| image:: https://codecov.io/gh/divio/aldryn-django/branch/support/5.0.x/graph/badge.svg
.. |coverage| image:: https://codecov.io/gh/divio/aldryn-django/branch/support/5.1.x/graph/badge.svg
:target: https://codecov.io/gh/divio/aldryn-django

.. |python| image:: https://img.shields.io/badge/python-3.10%20%7C%203.11%20%7C%C2%A03.12-blue.svg
:target: https://pypi.org/project/aldryn-django/
.. |django| image:: https://img.shields.io/badge/django-5.0-blue.svg
.. |django| image:: https://img.shields.io/badge/django-5.1-blue.svg
:target: https://www.djangoproject.com/
2 changes: 1 addition & 1 deletion aldryn_django/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '5.0.8.0'
__version__ = '5.1.0.0'
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

REQUIREMENTS = [
'aldryn-addons',
'Django==5.0.8',
'Django==5.1',

# setup utils
'dj-database-url',
Expand Down Expand Up @@ -46,7 +46,7 @@
'License :: OSI Approved :: BSD License',
'Operating System :: OS Independent',
'Framework :: Django',
'Framework :: Django :: 5.0',
'Framework :: Django :: 5.1',
'Programming Language :: Python',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.10',
Expand Down

0 comments on commit dc23f80

Please sign in to comment.