Skip to content

Commit

Permalink
fix Django 5.1 error, test in Django 5.1
Browse files Browse the repository at this point in the history
  • Loading branch information
PetrDlouhy committed Aug 13, 2024
1 parent fa54411 commit 705d1ab
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 4 deletions.
21 changes: 18 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,26 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11']
django-version: ['3.2', '4.1', '4.2']
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
django-version: ['3.2', '4.1', '4.2', '5.0', '5.1.*']
exclude:
- python-version: 3.11
django-version: 3.2

- python-version: 3.12
django-version: 3.2

- python-version: 3.8
django-version: 5.0

- python-version: 3.9
django-version: 5.0

- python-version: 3.8
django-version: 5.1.*

- python-version: 3.9
django-version: 5.1.*
fail-fast: false

steps:
Expand All @@ -23,7 +38,7 @@ jobs:
run: |
pip install -r requirements.txt
pip install -r tests/requirements.txt
pip install "Django~=${{ matrix.django-version }}.0" .
pip install "Django==${{ matrix.django-version }}" .
- name: Run Tests
run: |
echo "$(python --version) / Django $(django-admin --version)"
Expand Down
3 changes: 2 additions & 1 deletion avatar/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ class AvatarConf(AppConf):
ALLOWED_FILE_EXTS = None
ALLOWED_MIMETYPES = None
CACHE_TIMEOUT = 60 * 60
STORAGE = settings.DEFAULT_FILE_STORAGE
if hasattr(settings, "DEFAULT_FILE_STORAGE"):
STORAGE = settings.DEFAULT_FILE_STORAGE # deprecated settings
STORAGE_ALIAS = "default"
CLEANUP_DELETED = True
AUTO_GENERATE_SIZES = (DEFAULT_SIZE,)
Expand Down
5 changes: 5 additions & 0 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,11 @@ appear on the site. Listed below are those settings:
Suggested safe setting: ``("image/png", "image/gif", "image/jpeg")``.
When enabled you'll get the following error on the form upload *File content is invalid. Detected: image/tiff Allowed content types are: image/png, image/gif, image/jpg*.

.. py:data:: AVATAR_STORAGE_ALIAS
Default: 'default'
Alias of the storage backend (from STORAGES settings) to use for storing avatars.


Management Commands
-------------------
Expand Down

0 comments on commit 705d1ab

Please sign in to comment.