From e9a8b3605f79daea922b5bf71f6394d2dd3a5af3 Mon Sep 17 00:00:00 2001 From: peko Date: Sat, 16 Dec 2023 22:15:08 +0100 Subject: [PATCH 1/2] fix: make it work for django5.0 --- .github/workflows/ci.yml | 2 +- pyproject.toml | 3 ++- tox.ini | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4c64f559..1cffb5a6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: python-version: "3.11" cache: 'poetry' - run: pip install tox - - run: tox -e lint,py311-dj42 + - run: tox -e lint,py311-dj50 test_compatibility: needs: test runs-on: ubuntu-latest diff --git a/pyproject.toml b/pyproject.toml index 6e040d8a..f0b5519f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -25,6 +25,7 @@ classifiers = [ "Framework :: Django :: 3.2", "Framework :: Django :: 4.1", "Framework :: Django :: 4.2", + "Framework :: Django :: 5.0", ] packages = [ { include = "pattern_library" }, @@ -43,7 +44,7 @@ exclude = [ [tool.poetry.dependencies] python = "^3.8" -Django = ">=3.2,<5.0" +Django = ">=3.2,<5.1" PyYAML = ">=5.1,<7.0" Markdown = "^3.1" diff --git a/tox.ini b/tox.ini index 50484742..1d9a8eb7 100644 --- a/tox.ini +++ b/tox.ini @@ -3,6 +3,7 @@ envlist = py{38,39,310}-dj32 py{38,39,310,311}-dj41 py{38,39,310,311}-dj42 + py{38,39,310,311}-dj50 py{310,311}-djmain lint skipsdist = true @@ -20,6 +21,7 @@ deps = dj32: Django>=3.2,<3.3 dj41: Django>=4.1,<4.2 dj42: Django>=4.2,<5.0 + dj50: Django>=5.0,<5.1 djmain: https://github.com/django/django/archive/main.zip [testenv:lint] From 6cd2990209d9eaee9a1951521f69caeba46f933f Mon Sep 17 00:00:00 2001 From: Alex Bridge Date: Tue, 16 Jan 2024 11:26:15 +0000 Subject: [PATCH 2/2] Update CHANGELOG --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4655afd1..6216395e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## Unreleased + +### Added + +- Add support for Django 5.0 ([#241](https://github.com/torchbox/django-pattern-library/pull/241)) + ## [1.1.0](https://github.com/torchbox/django-pattern-library/releases/tag/v1.1.0) - 2023-10-25 ### Added