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

upgrade to Django 5.0.1 #316

Merged
merged 5 commits into from
Jan 4, 2024
Merged

upgrade to Django 5.0.1 #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
38042cf
upgrade to Django 5.0.1
FinalAngel Jan 3, 2024
d12af06
set version specifically
FinalAngel Jan 3, 2024
b0eb4a3
add setuptools as reqs
FinalAngel Jan 3, 2024
140cba7
sure
FinalAngel Jan 3, 2024
42ab1e9
app helper doesn't support 3.12 yet
FinalAngel Jan 3, 2024
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/default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: 3.9
python-version: "3.10"
- name: Install flake8
run: pip install --upgrade flake8
- name: Run flake8
Expand All @@ -29,7 +29,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: 3.9
python-version: "3.10"
- run: python -m pip install isort
- name: isort
uses: liskin/gh-problem-matcher-wrap@v1
Expand All @@ -42,7 +42,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.8", "3.9", "3.10"]
python-version: ["3.10", "3.11"]
steps:
- uses: actions/checkout@v1
- name: Install dependencies
Expand All @@ -55,7 +55,7 @@ jobs:
run: |
python -m pip install --upgrade pip
pip install packaging
pip install --upgrade urllib3
pip install --upgrade urllib3 setuptools
pip install -r tests/requirements.txt
python setup.py install
- name: Run coverage
Expand Down
63 changes: 2 additions & 61 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,66 +3,7 @@ Changelog
=========


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

* Added support for Django 4.2.9


4.2.8.0 (2023-12-19)
====================

* Added support for Django 4.2.8


4.2.7.0 (2023-11-01)
====================

* Upgrade Django to 4.2.7 (fixes CVE-2023-46695)
see https://www.djangoproject.com/weblog/2023/nov/01/security-releases/ for details


4.2.6.0 (2023-10-05)
====================

* Upgrade Django to 4.2.6 (fixes CVE-2023-43665)
see https://www.djangoproject.com/weblog/2023/oct/04/security-releases/ for details


4.2.5.0 (2023-09-04)
====================

* Upgrade Django to 4.2.5 (fixes CVE-2023-41164)
see https://www.djangoproject.com/weblog/2023/sep/04/security-releases/ for details


4.2.4.0 (2023-08-09)
====================

* Added support for Django 4.2.4


4.2.3.0 (2023-07-03)
====================

* Upgrade Django to 4.2.3 (fixes CVE-2023-36053)
see https://www.djangoproject.com/weblog/2023/jul/03/security-releases/ for details


4.2.2.0 (2023-06-06)
====================

* Added support for Django 4.2.2


4.2.1.0 (2023-05-03)
====================

* Upgrade Django to 4.2.1 (fixes CVE-2023-31047)
see https://www.djangoproject.com/weblog/2023/may/03/security-releases/ for details


4.2.0.0 (2023-04-04)
====================

* Added support for Django 4.2
* Added support for Django 5.0.1
8 changes: 4 additions & 4 deletions README.rst
View file
Open in desktop
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/4.2.x
.. |build| image:: https://github.com/divio/aldryn-django/actions/workflows/default.yml/badge.svg?branch=support/5.0.x
:target: https://github.com/divio/aldryn-django/actions
.. |coverage| image:: https://codecov.io/gh/divio/aldryn-django/branch/support/4.2.x/graph/badge.svg
.. |coverage| image:: https://codecov.io/gh/divio/aldryn-django/branch/support/5.0.x/graph/badge.svg
:target: https://codecov.io/gh/divio/aldryn-django

.. |python| image:: https://img.shields.io/badge/python-3.8%20%7C%203.9%20%7C%C2%A03.10-blue.svg
.. |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-4.2-blue.svg
.. |django| image:: https://img.shields.io/badge/django-5.0-blue.svg
:target: https://www.djangoproject.com/
2 changes: 1 addition & 1 deletion aldryn_django/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '4.2.9.0'
__version__ = '5.0.1.0'
8 changes: 4 additions & 4 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

REQUIREMENTS = [
'aldryn-addons',
'Django==4.2.9',
'Django==5.0.1',

# setup utils
'dj-database-url',
Expand Down Expand Up @@ -46,12 +46,12 @@
'License :: OSI Approved :: BSD License',
'Operating System :: OS Independent',
'Framework :: Django',
'Framework :: Django :: 4.2',
'Framework :: Django :: 5.0',
'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',
'Topic :: Internet :: WWW/HTTP',
'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
'Topic :: Software Development',
Expand Down
Loading