From 8bcef136ef85b50ed8187fcee8823b7e6c5ba281 Mon Sep 17 00:00:00 2001 From: Jamie Matthews Date: Wed, 20 Jul 2022 08:09:43 +0100 Subject: [PATCH 1/2] Add Django 4.1rc1 to test matrix, remove Django 2.2 --- .github/workflows/ci.yml | 8 +++++--- CHANGELOG.md | 4 ++++ README.md | 2 +- setup.py | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f1d6677..0997d36 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,14 +14,16 @@ jobs: strategy: matrix: python: ["3.6", "3.7", "3.8", "3.9", "3.10"] - django: ["2.2", "3.2", "4.0"] + django: ["3.2", "4.0", "4.1rc1"] exclude: - python: "3.6" django: "4.0" - python: "3.7" django: "4.0" - - python: "3.10" - django: "2.2" + - python: "3.6" + django: "4.1rc1" + - python: "3.7" + django: "4.1rc1" steps: - uses: actions/checkout@v2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 4bf5ff2..09d2202 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Changed +- Add support for Django 4.1 +- Drop support for Django 2.2 + ## [2.0.0] - 2022-07-19 ### Changed diff --git a/README.md b/README.md index c586f30..f23d187 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ django-readers **A lightweight function-oriented toolkit for better organisation of business logic and efficient selection and projection of data in Django projects.** -Tested against Django 2.2, 3.2 and 4.0 on Python 3.6, 3.7, 3.8, 3.9 and 3.10 +Tested against Django 3.2, 4.0 and 4.1 on Python 3.6, 3.7, 3.8, 3.9 and 3.10 ![Build Status](https://github.com/dabapps/django-readers/workflows/CI/badge.svg?branch=main) [![pypi release](https://img.shields.io/pypi/v/django-readers.svg)](https://pypi.python.org/pypi/django-readers) diff --git a/setup.py b/setup.py index b70c089..6ec5f5f 100644 --- a/setup.py +++ b/setup.py @@ -72,7 +72,7 @@ def get_package_data(package): package_data=get_package_data(package), python_requires=">=3.6", install_requires=[ - "Django>=2.2", + "Django>=3.2", ], project_urls={ "Changelog": "https://github.com/dabapps/django-readers/releases", From fb6b7ed878e5fe0e1c4fa490cde17cebf9efc903 Mon Sep 17 00:00:00 2001 From: Jamie Matthews Date: Wed, 10 Aug 2022 09:39:57 +0100 Subject: [PATCH 2/2] Django 4.1 final --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0997d36..71fffb8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,16 +14,16 @@ jobs: strategy: matrix: python: ["3.6", "3.7", "3.8", "3.9", "3.10"] - django: ["3.2", "4.0", "4.1rc1"] + django: ["3.2", "4.0", "4.1"] exclude: - python: "3.6" django: "4.0" - python: "3.7" django: "4.0" - python: "3.6" - django: "4.1rc1" + django: "4.1" - python: "3.7" - django: "4.1rc1" + django: "4.1" steps: - uses: actions/checkout@v2