Merge branch 'master' into cmc/fix-quickstart-import

pallets-eco · Sep 28, 2023 · f8775b6 · f8775b6
2 parents 8bf78e5 + 6b696d7
commit f8775b6
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 15 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -14,23 +14,23 @@ repos:
     -   id: check-merge-conflict
     -   id: fix-byte-order-marker
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v3.9.0
+    rev: v3.13.0
     hooks:
     -   id: pyupgrade
         args: [--py38-plus]
 -   repo: https://github.com/psf/black
-    rev: 23.7.0
+    rev: 23.9.1
     hooks:
     -   id: black
 -   repo: https://github.com/pycqa/flake8
-    rev: 6.0.0
+    rev: 6.1.0
     hooks:
       - id: flake8
         additional_dependencies:
           - flake8-bugbear
           - flake8-implicit-str-concat
 -   repo: https://github.com/Riverside-Healthcare/djLint
-    rev: v1.32.1
+    rev: v1.34.0
     hooks:
       - id: djlint-jinja
         files: "\\.html"

diff --git a/docs/_static/openapi_view.html b/docs/_static/openapi_view.html
@@ -1,7 +1,9 @@
  <!doctype html> <!-- Important: must specify -->
-  <html>
+  <html lang="en">
   <head>
-    <meta charset="utf-8"> <!-- Important: rapi-doc uses utf8 charecters -->
+    <meta charset="utf-8"><!-- Important: rapi-doc uses utf8 charecters -->
+    <meta name="description" content="Flask-Security API">
+    <meta name="keywords" content="JSON, Flask-Security, API">
     <title>API</title>
     <script src="https://unpkg.com/rapidoc/dist/rapidoc-min.js"></script>
   </head>
@@ -19,6 +21,8 @@
         slot="logo"
         src="logo-owl-68.png"
         alt="logo"
+        width="68"
+        height="100"
       />
     </rapi-doc>
   </body>

diff --git a/flask_security/templates/security/_menu.html b/flask_security/templates/security/_menu.html
@@ -9,22 +9,22 @@ <h2>{{ _fsdomain('Menu') }}</h2>
       </li>
       {% if security.changeable %}
         <li>
-          <a href="{{ url_for_security('change_password') }}">{{ _fsdomain("Change Password") }}
+          <a href="{{ url_for_security('change_password') }}">{{ _fsdomain("Change Password") }}</a>
         </li>
       {% endif %}
       {% if security.two_factor %}
         <li>
-          <a href="{{ url_for_security('two_factor_setup') }}">{{ _fsdomain("Two Factor Setup") }}
+          <a href="{{ url_for_security('two_factor_setup') }}">{{ _fsdomain("Two Factor Setup") }}</a>
         </li>
       {% endif %}
       {% if security.unified_signin %}
         <li>
-          <a href="{{ url_for_security('us_setup') }}">{{ _fsdomain("Unified Signin Setup") }}
+          <a href="{{ url_for_security('us_setup') }}">{{ _fsdomain("Unified Signin Setup") }}</a>
         </li>
       {% endif %}
       {% if security.webauthn %}
         <li>
-          <a href="{{ url_for_security('wan_register') }}">{{ _fsdomain("WebAuthn Setup") }}
+          <a href="{{ url_for_security('wan_register') }}">{{ _fsdomain("WebAuthn Setup") }}</a>
         </li>
       {% endif %}
     {% else %}

diff --git a/flask_security/templates/security/base.html b/flask_security/templates/security/base.html
@@ -1,3 +1,4 @@
+{# djlint:off H030,H031 #}
 {% block doc -%}
 <!DOCTYPE html>
 <html{% block html_attribs %}{% endblock html_attribs %}>

diff --git a/pyproject.toml b/pyproject.toml
@@ -54,7 +54,7 @@ dependencies = [
 babel = ["babel>=2.12.1", "flask_babel>=3.1.0"]
 fsqla = ["flask_sqlalchemy>=3.0.3", "sqlalchemy>=2.0.12", "sqlalchemy-utils>=0.41.1"]
 common = ["bcrypt>=4.0.1", "flask_mailman>=0.3.0", "bleach>=6.0.0"]
-mfa = ["cryptography>=40.0.2", "qrcode>=7.4.2", "phonenumberslite>=8.13.11", "webauthn>=1.9.0"]
+mfa = ["cryptography>=40.0.2", "qrcode>=7.4.2", "phonenumberslite>=8.13.11", "webauthn==1.9.0"]
 low = [
     # Lowest supported versions
     "Flask==2.3.2",
@@ -89,3 +89,6 @@ low = [
 
 [tool.setuptools.dynamic]
 version = {attr = "flask_security.__version__"}
+
+[tool.djlint]
+    ignore="H005,H006"  # lang, img height/width
diff --git a/pytest.ini b/pytest.ini
@@ -22,8 +22,6 @@ filterwarnings =
     ignore::DeprecationWarning:mongoengine:
     ignore::DeprecationWarning:flask_login:0
     ignore:.*passwordless feature.*:DeprecationWarning:flask_security:0
-    ignore:.*passing settings to bcrypt.*:DeprecationWarning:passlib:0
-    ignore:.*'crypt' is deprecated.*:DeprecationWarning:passlib:0
-    ignore:pkg_resources is deprecated:DeprecationWarning:passlib:0
+    ignore::DeprecationWarning:passlib:0
     ignore:.*'sms' was enabled in SECURITY_US_ENABLED_METHODS;.*:UserWarning:flask_security:0
     ignore:.*'get_token_status' is deprecated.*:DeprecationWarning:flask_security:0
diff --git a/requirements/tests.txt b/requirements/tests.txt
@@ -29,6 +29,6 @@ qrcode
 requests
 sqlalchemy
 sqlalchemy-utils
-webauthn
+webauthn==1.9.0
 werkzeug
 zxcvbn