diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 143caa1..cb93e81 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -6,10 +6,13 @@ jobs: strategy: matrix: python-version: ['3.8', '3.9', '3.10', '3.11'] - django-version: ['3.2', '4.0', '4.1'] + django-version: ['3.2', '4.1', '4.2'] include: - python-version: 3.7 django-version: 3.2 + exclude: + - python-version: 3.11 + django-version: 3.2 fail-fast: false steps: diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 98eba14..8a77ee1 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,5 +1,8 @@ Changelog ========= +* Unreleased + * Use ``Image.Resampling.LANCZOS`` instead of ``Image.LANCZOS`` that was removed in Pillow 10.0.0 + * 7.1.1 (February 23, 2023) * Switch to setuptools for building diff --git a/avatar/admin.py b/avatar/admin.py index 55ad544..9425ef3 100644 --- a/avatar/admin.py +++ b/avatar/admin.py @@ -17,14 +17,12 @@ class AvatarAdmin(admin.ModelAdmin): list_per_page = 50 def get_avatar(self, avatar_in): - context = dict( - { - "user": avatar_in.user, - "url": avatar_in.avatar.url, - "alt": str(avatar_in.user), - "size": 80, - } - ) + context = { + "user": avatar_in.user, + "url": avatar_in.avatar.url, + "alt": str(avatar_in.user), + "size": 80, + } return render_to_string("avatar/avatar_tag.html", context) get_avatar.short_description = _("Avatar") diff --git a/avatar/conf.py b/avatar/conf.py index caf3da9..a29cec6 100644 --- a/avatar/conf.py +++ b/avatar/conf.py @@ -5,7 +5,7 @@ from PIL import Image class AvatarConf(AppConf): DEFAULT_SIZE = 80 - RESIZE_METHOD = Image.LANCZOS + RESIZE_METHOD = Image.Resampling.LANCZOS STORAGE_DIR = "avatars" PATH_HANDLER = "avatar.models.avatar_path_handler" GRAVATAR_BASE_URL = "https://www.gravatar.com/avatar/" diff --git a/docs/index.txt b/docs/index.txt index 4309714..3de6484 100644 --- a/docs/index.txt +++ b/docs/index.txt @@ -211,7 +211,7 @@ appear on the site. Listed below are those settings: .. py:data:: AVATAR_RESIZE_METHOD The method to use when resizing images, based on the options available in - Pillow. Defaults to ``Image.LANCZOS``. + Pillow. Defaults to ``Image.Resampling.LANCZOS``. .. py:data:: AVATAR_STORAGE_DIR diff --git a/pyproject.toml b/pyproject.toml index 66bcc54..4a34c61 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,16 +17,16 @@ classifiers=[ "Intended Audience :: Developers", "Framework :: Django", "Framework :: Django :: 3.2", - "Framework :: Django :: 4.0", "Framework :: Django :: 4.1", + "Framework :: Django :: 4.2", "License :: OSI Approved :: BSD License", "Operating System :: OS Independent", "Programming Language :: Python", - "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", ] dynamic = ["version", "dependencies"] diff --git a/requirements.txt b/requirements.txt index ff2aef2..9752ac4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -Pillow>=8.4.0 +Pillow>=9.3.0 django-appconf>=1.0.5 dnspython>=2.3.0 diff --git a/tests/requirements.txt b/tests/requirements.txt index c326a12..f13bf22 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,3 +1,3 @@ -coverage==7.1.0 +coverage~=7.1.0 django python-magic