updates

dimbleby · Sep 4, 2023 · a35d6cf · a35d6cf
1 parent 731e0ad
commit a35d6cf
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 31 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -15,7 +15,7 @@ RUN --mount=type=cache,target=/var/cache/apt \
       --output install-poetry.py \
       https://install.python-poetry.org && \
     python3 install-poetry.py && \
-    python3 -m venv /opt/venv
+    python3 -m venv --without-pip /opt/venv
 
 ENV VIRTUAL_ENV=/opt/venv \
     PATH="/opt/venv/bin:$PATH"

diff --git a/hunt/models.py b/hunt/models.py
@@ -135,8 +135,7 @@ def __str__(self) -> str:
             HuntEvent.CLUE_ADV: "progressed to",
         }
         user = self.user.get_username()
-        text = f"At {self.time} {user} {actions[self.type]} level {self.level}"
-        return text
+        return f"At {self.time} {user} {actions[self.type]} level {self.level}"
 
 
 class ChatMessage(models.Model):
@@ -151,12 +150,11 @@ class Meta:
 
     @override
     def __str__(self) -> str:
-        text = ", ".join(
+        return ", ".join(
             [
                 f"{self.team.get_username()}",
                 f"{self.level}",
                 f"User: {self.name}",
                 f"Message: {self.content}",
             ]
         )
-        return text
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -20,7 +20,7 @@ django = "^4.2"
 django-storages = { version = "^1.13.1", extras = ["azure"] }
 djangorestframework = "^3.14.0"
 geopy = "^2.4.0"
-holidays = "^0.31"
+holidays = "^0.32"
 pillow = "^10.0.0"
 typing-extensions = "^4.7.1"
 whitenoise = "^6.4.0"
@@ -101,6 +101,7 @@ select = [
   "PLE", # pylint errors
   "PLW", # pylint warnings
   "PTH", # flake8-use-pathlib
+  "RET", # flake8-return
   "RUF", # ruff
   "SIM", # flake8-simplify
   "TCH", # flake8-type-checking