Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into romancertn-main
Browse files Browse the repository at this point in the history
* origin/main:
  Fix incorrect test that was picked up by Django 5
  Add Django 5 to test matrix
  • Loading branch information
j4mie committed Jan 12, 2024
2 parents de05497 + e57725f commit 84b9824
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 3 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,16 @@ jobs:
strategy:
matrix:
python: ["3.8", "3.9", "3.10", "3.11"]
django: ["3.2", "4.0", "4.1", "4.2"]
django: ["3.2", "4.0", "4.1", "4.2", "5.0"]
exclude:
- python: "3.11"
django: "3.2"
- python: "3.11"
django: "4.0"
- python: "3.8"
django: "5.0"
- python: "3.9"
django: "5.0"

steps:
- uses: actions/checkout@v2
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- Added support for Django's reverse generic relations (`GenericRelation` model field) ([#93](https://github.com/dabapps/django-readers/pull/93)).

### Changed
- Add support for Django 5.0

## [2.1.2] - 2023-07-17

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 3.2, 4.0, 4.1 and 4.2 on Python 3.8, 3.9, 3.10 and 3.11.
Tested against Django 3.2, 4.0, 4.1, 4.2 and 5.0 on Python 3.8, 3.9, 3.10 and 3.11.

![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)
Expand Down
2 changes: 1 addition & 1 deletion tests/test_producers.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def test_nullable(self):
self.assertEqual(result, None)

def test_nullable_one_to_one(self):
widget = Widget.objects.create(thing=None)
widget = Widget.objects.create()
produce = producers.relationship(
"thing", projectors.producer_to_projector("name", producers.attr("name"))
)
Expand Down

0 comments on commit 84b9824

Please sign in to comment.