Skip to content

Commit

Permalink
Merge branch 'refs/heads/master' into feature/scrubber-validation-whi…
Browse files Browse the repository at this point in the history
…telist-added

# Conflicts:
#	CHANGELOG.md
  • Loading branch information
GitRon committed Aug 20, 2024
2 parents ea04d5b + b6452f5 commit 64a15a3
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 0 deletions.
8 changes: 8 additions & 0 deletions .github/workflows/workflow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ jobs:
django:
- "4.2"
- "5.0"
- "5.1"
database:
- sqlite
- mysql
Expand All @@ -49,6 +50,10 @@ jobs:
django: "5.0"
- python-version: "3.9"
django: "5.0"
- python-version: "3.8"
django: "5.1"
- python-version: "3.9"
django: "5.1"

services:
# postgres service
Expand Down Expand Up @@ -97,6 +102,9 @@ jobs:
- name: Install Django 5.0
if: matrix.django == 5.0
run: pip install "Django>=5.0,<5.1"
- name: Install Django 5.1
if: matrix.django == 5.1
run: pip install "Django>=5.1,<5.2"
- name: Install MySQL libs
if: matrix.database == 'mysql'
run: pip install mysqlclient>=2.2.4 django-mysql>=4.14.0
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
<!--
## [Unreleased]
- Added support for `Django` version `5.1`
- Added `SCRUBBER_VALIDATION_WHITELIST` and excluded Django core test model
-->

Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ def get_version(*file_paths):
'Framework :: Django',
'Framework :: Django :: 4.2',
'Framework :: Django :: 5.0',
'Framework :: Django :: 5.1',
'Intended Audience :: Developers',
'License :: OSI Approved :: BSD License',
'Natural Language :: English',
Expand Down

0 comments on commit 64a15a3

Please sign in to comment.