From 1e47fbecb170e82289dcf808b63e70c7a655359c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Fr=C3=B6ssman?= <thomasf@jossystem.se>
Date: Tue, 11 Jul 2023 22:56:36 +0200
Subject: [PATCH] enable a bunch of ruff rules

---
 minio_storage/storage.py                     |  4 ++--
 pyproject.toml                               | 18 +++++++++++++++---
 tests/django_minio_storage_tests/settings.py |  6 +++---
 tox.ini                                      |  4 ++--
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/minio_storage/storage.py b/minio_storage/storage.py
index a05a276..ffa22c3 100644
--- a/minio_storage/storage.py
+++ b/minio_storage/storage.py
@@ -144,7 +144,7 @@ def _open(self, name, mode="rb"):
         try:
             f = self.file_class(self._sanitize_path(name), mode, self)
         except merr.MinioException as e:
-            raise minio_error(f"File {name} could not be saved: {str(e)}", e) from e
+            raise minio_error(f"File {name} could not be saved: {e!s}", e) from e
         return f
 
     def _save(self, name: str, content: T.BinaryIO) -> str:
@@ -170,7 +170,7 @@ def delete(self, name: str) -> None:
                 obj = self.client.get_object(self.bucket_name, name)
             except merr.InvalidResponseError as error:
                 raise minio_error(
-                    "Could not obtain file {} " "to make a copy of it".format(name),
+                    f"Could not obtain file {name} to make a copy of it",
                     error,
                 ) from error
 
diff --git a/pyproject.toml b/pyproject.toml
index 3506126..2e05f19 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -48,15 +48,27 @@ profile = "black"
 skip = [".tox", "migrations", "node_modules", ".git", ".eggs"]
 
 [tool.ruff]
+target-version = 'py38'
 line-length = 88
 select = [
+    "B",
+    "C4",
+    "C9",
+    "DJ",
     "E",
     "F",
-    "W",
     "I",
-    "B",
+    "ISC",
+    "NPY",
+    "PLC",
+    "PLE",
+    "PLW",
+    "RUF010",
+    "RUF013",
+    "S5",
+    "S6",
     "UP",
-    "DJ",
+    "W",
 ]
 ignore = ["E203"]
 exclude = [
diff --git a/tests/django_minio_storage_tests/settings.py b/tests/django_minio_storage_tests/settings.py
index 55eab35..a0e4d4b 100644
--- a/tests/django_minio_storage_tests/settings.py
+++ b/tests/django_minio_storage_tests/settings.py
@@ -115,9 +115,9 @@
         "NAME": "django.contrib.auth.password_validation"
         ".UserAttributeSimilarityValidator"
     },
-    {"NAME": "django.contrib.auth.password_validation" ".MinimumLengthValidator"},
-    {"NAME": "django.contrib.auth.password_validation" ".CommonPasswordValidator"},
-    {"NAME": "django.contrib.auth.password_validation" ".NumericPasswordValidator"},
+    {"NAME": "django.contrib.auth.password_validation.MinimumLengthValidator"},
+    {"NAME": "django.contrib.auth.password_validation.CommonPasswordValidator"},
+    {"NAME": "django.contrib.auth.password_validation.NumericPasswordValidator"},
 ]
 
 
diff --git a/tox.ini b/tox.ini
index 4b27545..8388df6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -65,7 +65,7 @@ setenv=
     PYTHONWARNINGS=ignore
 basepython = python3
 deps =
-        ruff==0.0.270
+        ruff==0.0.277
         black==22.3.0
 commands =
         ruff check .
@@ -77,7 +77,7 @@ setenv=
 basepython = python3
 deps =
         pyupgrade-directories
-        ruff==0.0.270
+        ruff==0.0.277
         isort==5.12.0
         black==23.3.0
 commands =