Merge branch 'main' into markdown

.pre-commit-config.yaml

@@ -12,7 +12,7 @@ repos:
     hooks:
       - id: check-pre-commit-ci-config
   - repo: https://github.com/jazzband/pip-tools
-    rev: 6.10.0
+    rev: 6.11.0
     hooks:
       - id: pip-compile
         name: pip-compile requirements.in
@@ -39,7 +39,7 @@ repos:
             '--remove-duplicate-keys',
           ]
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.2.2
+    rev: v3.3.0
     hooks:
       - id: pyupgrade
         args:
@@ -94,7 +94,7 @@ repos:
       - id: flake8
         additional_dependencies: *flake8deps
   - repo: https://github.com/PyCQA/pylint
-    rev: v2.15.6
+    rev: v2.15.8
     hooks:
       - id: pylint
         args: [

requirements.txt

@@ -1,6 +1,6 @@
 #
-# This file is autogenerated by pip-compile with python 3.9
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.9
+# by the following command:
 #
 #    pip-compile requirements.in
 #
@@ -105,7 +105,7 @@ emoji==2.2.0
     # via baseframe
 fabric3==1.14.post1
     # via -r requirements.in
-filelock==3.8.0
+filelock==3.8.1
     # via tldextract
 flask==2.2.2
     # via
@@ -252,13 +252,13 @@ marshmallow-enum==1.5.1
     # via dataclasses-json
 maxminddb==2.2.0
     # via geoip2
-mdit-py-plugins==0.3.1
+mdit-py-plugins==0.3.2
     # via -r requirements.in
 mdurl==0.1.2
     # via markdown-it-py
 mkdocs-material-extensions==1.1.1
     # via flask-mailman
-multidict==6.0.2
+multidict==6.0.3
     # via
     #   aiohttp
     #   yarl
@@ -281,9 +281,7 @@ oauthlib==3.2.2
 orderedmultidict==1.0.1
     # via furl
 packaging==21.3
-    # via
-    #   marshmallow
-    #   redis
+    # via marshmallow
 paramiko==2.12.0
     # via fabric3
 passlib==1.7.4
@@ -373,7 +371,7 @@ pyyaml==6.0
     #   flask-flatpages
 qrcode==7.3.1
     # via -r requirements.in
-redis==4.3.5
+redis==4.4.0
     # via
     #   baseframe
     #   flask-redis
@@ -516,7 +514,7 @@ wtforms==3.0.1
     #   wtforms-sqlalchemy
 wtforms-sqlalchemy==0.3
     # via baseframe
-yarl==1.8.1
+yarl==1.8.2
     # via aiohttp
 zipp==3.11.0
     # via importlib-metadata

requirements_dev.txt

@@ -1,6 +1,6 @@
 #
-# This file is autogenerated by pip-compile with python 3.9
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.9
+# by the following command:
 #
 #    pip-compile requirements_dev.in
 #
@@ -47,7 +47,7 @@ exceptiongroup==1.0.4
     # via
     #   cattrs
     #   pytest
-filelock==3.8.0
+filelock==3.8.1
     # via virtualenv
 flake8==6.0.0
     # via
@@ -158,7 +158,7 @@ pep517==0.13.0
     # via build
 pep8-naming==0.13.2
     # via -r requirements_dev.in
-pip-tools==6.10.0
+pip-tools==6.11.0
     # via -r requirements_dev.in
 platformdirs==2.5.4
     # via
@@ -177,7 +177,7 @@ pydocstyle==6.1.1
     # via flake8-docstrings
 pyflakes==3.0.1
     # via flake8
-pylint==2.15.7
+pylint==2.15.8
     # via
     #   -r requirements_dev.in
     #   pylint-flask-sqlalchemy
@@ -190,7 +190,7 @@ pyparsing==3.0.9
     # via packaging
 pytest==7.2.0
     # via pylint-pytest
-pyupgrade==3.2.3
+pyupgrade==3.3.0
     # via -r requirements_dev.in
 pyyaml==6.0
     # via
@@ -284,7 +284,7 @@ typing-extensions==4.4.0
     #   sqlalchemy-stubs
 virtualenv==20.17.0
     # via pre-commit
-watchdog==2.1.9
+watchdog==2.2.0
     # via -r requirements_dev.in
 wcwidth==0.2.5
     # via reformat-gherkin

requirements_test.txt

@@ -1,6 +1,6 @@
 #
-# This file is autogenerated by pip-compile with python 3.9
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.9
+# by the following command:
 #
 #    pip-compile requirements_test.in
 #
@@ -101,7 +101,7 @@ requests==2.28.1
     #   requests-mock
 requests-mock==1.10.0
     # via -r requirements_test.in
-selenium==4.6.1
+selenium==4.7.2
     # via pytest-splinter
 six==1.16.0
     # via

tests/integration/views/test_label_views.py

@@ -26,7 +26,7 @@ def test_edit_option_label_view(app, client, login, new_user, new_main_label) ->
     assert "Only main labels can be edited" in resp.data.decode('utf-8')
 
 
-@pytest.mark.dbcommit()
+@pytest.mark.xfail(reason="Broken by Flask-SQLAlchemy 3.0, unclear why")  # FIXME
 def test_main_label_delete(client, login, new_user, new_label) -> None:
     login.as_(new_user)
     resp = client.post(new_label.url_for('delete'), follow_redirects=True)
@@ -36,7 +36,7 @@ def test_main_label_delete(client, login, new_user, new_label) -> None:
     assert label is None
 
 
-@pytest.mark.dbcommit()
+@pytest.mark.xfail(reason="Broken after Flask-SQLAlchemy 3.0, unclear why")  # FIXME
 def test_optioned_label_delete(client, login, new_user, new_main_label) -> None:
     login.as_(new_user)
     label_a1 = new_main_label.options[0]