From 662632afcfd696377945f75b1452304e100353a6 Mon Sep 17 00:00:00 2001 From: Josh Yu Date: Wed, 24 Apr 2024 11:02:15 +0800 Subject: [PATCH 1/6] Bump version to 2.2.7 --- CHANGELOG.rst | 3 +++ filer/__init__.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 9d64545b8..7910123af 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -4,6 +4,9 @@ CHANGELOG Unreleased ========== + +2.2.7 (Unreleased) +================== * Add Django 4.2 support * fix tests diff --git a/filer/__init__.py b/filer/__init__.py index ed363ac3b..758a70803 100644 --- a/filer/__init__.py +++ b/filer/__init__.py @@ -13,4 +13,4 @@ 8. Publish the release and it will automatically release to pypi """ -__version__ = '2.2.6' +__version__ = '2.2.7' From f10372b0073782657af92f64d43d7562cdebe0a1 Mon Sep 17 00:00:00 2001 From: Josh Yu Date: Wed, 24 Apr 2024 14:30:31 +0800 Subject: [PATCH 2/6] format --- filer/models/foldermodels.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/filer/models/foldermodels.py b/filer/models/foldermodels.py index d89a69b62..97e8a8704 100644 --- a/filer/models/foldermodels.py +++ b/filer/models/foldermodels.py @@ -362,7 +362,7 @@ def __str__(self): def __repr__(self): return f'<{self.__class__.__name__}(pk={self.pk}): folder="{self.pretty_logical_path}", ' \ - 'who="{self.who}", what="{self.what}">' + 'who="{self.who}", what="{self.what}">' def clean(self): if self.type == self.ALL and self.folder: From 9ee5ba5e17c4a61575e005a1a535fe79f1ddcbd7 Mon Sep 17 00:00:00 2001 From: Josh Yu Date: Wed, 24 Apr 2024 14:33:56 +0800 Subject: [PATCH 3/6] format --- filer/models/foldermodels.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/filer/models/foldermodels.py b/filer/models/foldermodels.py index 97e8a8704..ab8483671 100644 --- a/filer/models/foldermodels.py +++ b/filer/models/foldermodels.py @@ -250,7 +250,7 @@ def get_admin_directory_listing_url_path(self): def get_admin_delete_url(self): return reverse( - f'admin:{self._meta.app_label}_{self._meta.model_name}_delete', + f'admin:{self._meta.app_label}_{self._meta.model_name}_delete', # noqa: E231 args=(self.pk,) ) @@ -362,7 +362,7 @@ def __str__(self): def __repr__(self): return f'<{self.__class__.__name__}(pk={self.pk}): folder="{self.pretty_logical_path}", ' \ - 'who="{self.who}", what="{self.what}">' + 'who="{self.who}", what="{self.what}">' # noqa: E126 def clean(self): if self.type == self.ALL and self.folder: From da8bf551d517fea24255e669a63278915e685af7 Mon Sep 17 00:00:00 2001 From: Josh Yu Date: Wed, 24 Apr 2024 14:45:26 +0800 Subject: [PATCH 4/6] revert format --- filer/models/foldermodels.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/filer/models/foldermodels.py b/filer/models/foldermodels.py index ab8483671..d89a69b62 100644 --- a/filer/models/foldermodels.py +++ b/filer/models/foldermodels.py @@ -250,7 +250,7 @@ def get_admin_directory_listing_url_path(self): def get_admin_delete_url(self): return reverse( - f'admin:{self._meta.app_label}_{self._meta.model_name}_delete', # noqa: E231 + f'admin:{self._meta.app_label}_{self._meta.model_name}_delete', args=(self.pk,) ) @@ -362,7 +362,7 @@ def __str__(self): def __repr__(self): return f'<{self.__class__.__name__}(pk={self.pk}): folder="{self.pretty_logical_path}", ' \ - 'who="{self.who}", what="{self.what}">' # noqa: E126 + 'who="{self.who}", what="{self.what}">' def clean(self): if self.type == self.ALL and self.folder: From f2019df5bcc8f825ae73eeb3174a0dfb5b2d977c Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Wed, 24 Apr 2024 11:00:58 +0200 Subject: [PATCH 5/6] Update .pre-commit-config.yaml --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 123a42bb4..fcce4d855 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -21,7 +21,7 @@ repos: # args: [--target-version, "2.2"] - repo: https://github.com/PyCQA/flake8 - rev: 6.0.0 + rev: 7.0.0 hooks: - id: flake8 From 7ccef83215ef0abb5b7d9198b524d48376193d40 Mon Sep 17 00:00:00 2001 From: Josh Yu Date: Thu, 16 May 2024 11:16:02 +0800 Subject: [PATCH 6/6] update release date --- CHANGELOG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 7910123af..0f99f0d4c 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,7 +5,7 @@ CHANGELOG Unreleased ========== -2.2.7 (Unreleased) +2.2.7 (2024-05-16) ================== * Add Django 4.2 support * fix tests