diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e6abfe7..eb0d735 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -12,12 +12,12 @@ repos: exclude: ".*(galleria|photoswipe|jquery|leaflet).*$" - repo: https://github.com/psf/black - rev: 23.3.0 + rev: 23.9.1 hooks: - id: black - repo: https://github.com/charliermarsh/ruff-pre-commit - rev: v0.0.270 + rev: v0.0.291 hooks: - id: ruff args: [ --fix, --show-fixes, --exit-non-zero-on-fix ] diff --git a/pyproject.toml b/pyproject.toml index 964e08f..7ed1575 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,7 +29,7 @@ dependencies = [ "click", "Jinja2>=2.7", "Markdown", - "Pillow>=8.0.0,<10.0.0", + "Pillow>=8.0.0", "pilkit", "natsort", ] diff --git a/src/sigal/gallery.py b/src/sigal/gallery.py index 6684f53..a3d6b08 100644 --- a/src/sigal/gallery.py +++ b/src/sigal/gallery.py @@ -418,9 +418,7 @@ class Album: signals.album_initialized.send(self) def __repr__(self): - return "<{}>(path={!r}, title={!r})".format( - self.__class__.__name__, self.path, self.title - ) + return f"<{self.__class__.__name__}>(path={self.path!r}, title={self.title!r})" def __str__(self): return f"{self.path} : " + ", ".join( diff --git a/src/sigal/plugins/feeds.py b/src/sigal/plugins/feeds.py index f3625ba..e93acc9 100644 --- a/src/sigal/plugins/feeds.py +++ b/src/sigal/plugins/feeds.py @@ -73,9 +73,7 @@ def generate_feed(gallery, medias, feed_type=None, feed_url="", nb_items=0): # unique_id='tag:%s,%s:%s' % (urlparse(link).netloc, # item.date.date(), # urlparse(link).path.lstrip('/')), - description=''.format( - base_url, item.path, item.thumbnail - ), + description=f'', # categories=item.tags if hasattr(item, 'tags') else None, author_name=getattr(item, "author", ""), pubdate=item.date or datetime.now(), diff --git a/tests/test_compress_assets_plugin.py b/tests/test_compress_assets_plugin.py index 161904b..653b98e 100644 --- a/tests/test_compress_assets_plugin.py +++ b/tests/test_compress_assets_plugin.py @@ -36,9 +36,7 @@ def walk_destination(destination, suffixes, compress_suffix): for path, dirs, files in os.walk(destination): for file in files: original_filename = os.path.join(path, file) - compressed_filename = "{}.{}".format( - os.path.join(path, file), compress_suffix - ) + compressed_filename = f"{os.path.join(path, file)}.{compress_suffix}" path_exists = os.path.exists(compressed_filename) file_ext = os.path.splitext(file)[1][1:] if file_ext in suffixes: diff --git a/tox.ini b/tox.ini index 02be03a..726124b 100644 --- a/tox.ini +++ b/tox.ini @@ -1,12 +1,12 @@ [tox] -envlist = py{38,39,310,311}-pillow{80,90,-latest},pypy3,check +envlist = py{38,39,310,311}-pillow{80,90,100,-latest},pypy3,check skip_missing_interpreters = true [gh-actions] python = 3.8: py38-pillow80, check 3.9: py39-pillow90 - 3.10: py310-pillow-latest + 3.10: py310-pillow100 3.11: py310-pillow-latest pypy3: pypy3 @@ -16,6 +16,7 @@ wheel_build_env = .pkg deps = pillow80: Pillow==8.0.1 pillow90: Pillow==9.0.1 + pillow100: Pillow==10.0.1 extras = all tests