chore(sync) Syncing changes from dev to alpha

migrations/env.py

@@ -22,20 +22,20 @@
 
 
 def get_engine():
-     try:
-         # this works with Flask-SQLAlchemy<3 and Alchemical
-         return current_app.extensions['migrate'].db.get_engine()
-     except TypeError:
-         # this works with Flask-SQLAlchemy>=3
-         return current_app.extensions['migrate'].db.engine
-
-
- def get_engine_url():
-     try:
-         return get_engine().url.render_as_string(hide_password=False).replace(
-             '%', '%%')
-     except AttributeError:
-         return str(get_engine().url).replace('%', '%%')
+    try:
+        # this works with Flask-SQLAlchemy<3 and Alchemical
+        return current_app.extensions['migrate'].db.get_engine()
+    except TypeError:
+        # this works with Flask-SQLAlchemy>=3
+        return current_app.extensions['migrate'].db.engine
+
+
+def get_engine_url():
+    try:
+        return get_engine().url.render_as_string(hide_password=False).replace(
+            '%', '%%')
+    except AttributeError:
+        return str(get_engine().url).replace('%', '%%')
 
 config.set_main_option('sqlalchemy.url', get_engine_url())
 target_db = current_app.extensions['migrate'].db

pyproject.toml

@@ -135,6 +135,7 @@ python-dateutil = "^2.8.2"
 python-gnupg = "^0.5.0"
 python-ldap = "^3.3.1"
 python3-saml = "^1.12.0"
+pytz-deprecation-shim = "^0.1.0.post0"
 rcssmin = "^1.0.6"
 redis = "^4.0.0"
 regex = "^2023.0.0"