Merge branch 'master' into remove-flake8

spiral-project · Dec 23, 2024 · 65290aa · 65290aa
2 parents c59e8de + 299c384
commit 65290aa
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 5 deletions.
diff --git a/docs/configuration.md b/docs/configuration.md
@@ -173,6 +173,14 @@ URL you want.
 -   **Default value:** `""` (empty string)
 -   **Production value:** The URL of your chosing.
 
+## SITE_NAME
+
+It is possible to change the name of the site to something at your liking.
+
+-   **Default value:** `"I Hate Money"` (empty string)
+-   **Production value:** The name of your choosing
+
+
 ## Configuring email sending
 
 By default, Ihatemoney sends emails using a local SMTP server, but it's

diff --git a/ihatemoney/default_settings.py b/ihatemoney/default_settings.py
@@ -3,6 +3,7 @@
 SQLALCHEMY_DATABASE_URI = "sqlite:////tmp/ihatemoney.db"
 SQLALCHEMY_TRACK_MODIFICATIONS = False
 SECRET_KEY = "tralala"
+SITE_NAME = "I Hate Money"
 MAIL_DEFAULT_SENDER = "Budget manager <admin@example.com>"
 SHOW_ADMIN_EMAIL = True
 ACTIVATE_DEMO_PROJECT = True

diff --git a/ihatemoney/templates/layout.html b/ihatemoney/templates/layout.html
@@ -20,7 +20,7 @@
 <!DOCTYPE html>
 <html class="h-100">
 <head>
-    <title>{{ _("Account manager") }}{% block title %}{% endblock %}</title>
+    <title>{{ SITE_NAME }} — {{ _("Account manager") }}{% block title %}{% endblock %}</title>
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel=stylesheet type=text/css href="{{ url_for("static", filename='css/main.css') }}">

diff --git a/ihatemoney/tests/budget_test.py b/ihatemoney/tests/budget_test.py
@@ -238,7 +238,10 @@ def test_password_reset(self):
             url, data={"password": "pass", "password_confirmation": "pass"}
         )
         resp = self.login("raclette", password="pass")
-        assert "<title>Account manager - raclette</title>" in resp.data.decode("utf-8")
+        assert (
+            "<title>I Hate Money — Account manager - raclette</title>"
+            in resp.data.decode("utf-8")
+        )
         # Test empty and null tokens
         resp = self.client.get("/reset-password")
         assert "No token provided" in resp.data.decode("utf-8")

diff --git a/ihatemoney/tests/ihatemoney.cfg b/ihatemoney/tests/ihatemoney.cfg
@@ -3,6 +3,7 @@
 DEBUG = False
 SQLALCHEMY_DATABASE_URI = 'sqlite:///budget.db'
 SQLACHEMY_ECHO = DEBUG
+SITE_NAME = "I Hate Money"
 
 SECRET_KEY = "supersecret"
 

diff --git a/ihatemoney/web.py b/ihatemoney/web.py
@@ -137,6 +137,11 @@ def set_show_admin_dashboard_link(endpoint, values):
     g.logout_form = LogoutForm()
 
 
+@main.context_processor
+def add_template_variables():
+    return {"SITE_NAME": current_app.config.get("SITE_NAME")}
+
+
 @main.url_value_preprocessor
 def pull_project(endpoint, values):
     """When a request contains a project_id value, transform it directly

diff --git a/pyproject.toml b/pyproject.toml
@@ -27,7 +27,7 @@ classifiers = [
 
 dependencies = [
     "blinker>=1.4,<2",
-    "cachetools>=4.1,<5",
+    "cachetools>=4.1,<6",
     "debts>=0.5,<1",
     "email_validator>=1.0,<3",
     "Flask>=2,<4",
@@ -43,7 +43,7 @@ dependencies = [
     "itsdangerous>=2,<3",
     "Jinja2>=3,<4",
     "python-dateutil",
-    "qrcode>=7.1,<8",
+    "qrcode>=7.1,<9",
     "requests>=2.25,<3",
     "SQLAlchemy>=1.3.0,<1.5",
     "SQLAlchemy-Continuum>=1.3.12,<2", # New 1.4 changes API, see #728
@@ -57,7 +57,8 @@ database = [
     "PyMySQL>=0.9,<1.2",
 ]
 dev = [
-    "ruff==0.6.8",
+    "ruff==0.8.4",
+    "flake8==5.0.4",
     "isort==5.11.5",
     "vermin==1.6.0",
     "pytest>=6.2.5",