Merge branch '3.1.x'

Author: davidism

.github/dependabot.yml

@@ -5,14 +5,14 @@ updates:
     schedule:
       interval: monthly
     groups:
-      GitHub Actions:
+      github-actions:
         patterns:
           - "*"
   - package-ecosystem: pip
     directory: /requirements/
     schedule:
       interval: monthly
     groups:
-      Python requirements:
+      python-requirements:
         patterns:
           - "*"

.pre-commit-config.yaml

@@ -1,5 +1,4 @@
 ci:
-  autoupdate_branch: "3.0.x"
   autoupdate_schedule: monthly
 repos:
   - repo: https://github.com/asottile/pyupgrade

requirements/dev.txt

@@ -2,14 +2,14 @@
 # This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
-#    pip-compile requirements/dev.in
+#    pip-compile dev.in
 #
 alabaster==0.7.13
     # via sphinx
 babel==2.12.1
     # via sphinx
 blinker==1.6.2
-    # via -r requirements/tests.in
+    # via -r tests.in
 build==1.0.3
     # via pip-tools
 cachetools==5.3.1
@@ -28,7 +28,7 @@ colorama==0.4.6
     # via tox
 coverage[toml]==7.3.1
     # via
-    #   -r requirements/tests.in
+    #   -r tests.in
     #   pytest-cov
 distlib==0.3.7
     # via virtualenv
@@ -53,7 +53,7 @@ jinja2==3.1.2
 markupsafe==2.1.3
     # via jinja2
 mypy==1.5.1
-    # via -r requirements/mypy.in
+    # via -r mypy.in
 mypy-extensions==1.0.0
     # via mypy
 nodeenv==1.8.0
@@ -67,9 +67,9 @@ packaging==23.1
     #   sphinx
     #   tox
 pallets-sphinx-themes==2.1.1
-    # via -r requirements/docs.in
+    # via -r docs.in
 pip-tools==7.3.0
-    # via -r requirements/dev.in
+    # via -r dev.in
 platformdirs==3.10.0
     # via
     #   tox
@@ -79,7 +79,7 @@ pluggy==1.3.0
     #   pytest
     #   tox
 pre-commit==3.4.0
-    # via -r requirements/dev.in
+    # via -r dev.in
 pygments==2.16.1
     # via sphinx
 pyproject-api==1.6.1
@@ -88,11 +88,11 @@ pyproject-hooks==1.0.0
     # via build
 pytest==7.4.2
     # via
-    #   -r requirements/mypy.in
-    #   -r requirements/tests.in
+    #   -r mypy.in
+    #   -r tests.in
     #   pytest-cov
 pytest-cov==4.1.0
-    # via -r requirements/tests.in
+    # via -r tests.in
 pyyaml==6.0.1
     # via pre-commit
 requests==2.31.0
@@ -101,7 +101,7 @@ snowballstemmer==2.2.0
     # via sphinx
 sphinx==7.2.5
     # via
-    #   -r requirements/docs.in
+    #   -r docs.in
     #   pallets-sphinx-themes
     #   sphinx-issues
     #   sphinxcontrib-applehelp
@@ -111,7 +111,7 @@ sphinx==7.2.5
     #   sphinxcontrib-qthelp
     #   sphinxcontrib-serializinghtml
 sphinx-issues==3.0.1
-    # via -r requirements/docs.in
+    # via -r docs.in
 sphinxcontrib-applehelp==1.0.7
     # via sphinx
 sphinxcontrib-devhelp==1.0.5
@@ -121,15 +121,15 @@ sphinxcontrib-htmlhelp==2.0.4
 sphinxcontrib-jsmath==1.0.1
     # via sphinx
 sphinxcontrib-log-cabinet==1.0.1
-    # via -r requirements/docs.in
+    # via -r docs.in
 sphinxcontrib-qthelp==1.0.6
     # via sphinx
 sphinxcontrib-serializinghtml==1.1.9
     # via sphinx
 sqlalchemy==2.0.20
-    # via -r requirements/mypy.in
+    # via -r mypy.in
 tox==4.11.3
-    # via -r requirements/dev.in
+    # via -r dev.in
 typing-extensions==4.7.1
     # via
     #   mypy

requirements/docs.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
-#    pip-compile requirements/docs.in
+#    pip-compile docs.in
 #
 alabaster==0.7.13
     # via sphinx
@@ -27,7 +27,7 @@ packaging==23.1
     #   pallets-sphinx-themes
     #   sphinx
 pallets-sphinx-themes==2.1.1
-    # via -r requirements/docs.in
+    # via -r docs.in
 pygments==2.16.1
     # via sphinx
 requests==2.31.0
@@ -36,7 +36,7 @@ snowballstemmer==2.2.0
     # via sphinx
 sphinx==7.2.5
     # via
-    #   -r requirements/docs.in
+    #   -r docs.in
     #   pallets-sphinx-themes
     #   sphinx-issues
     #   sphinxcontrib-applehelp
@@ -46,7 +46,7 @@ sphinx==7.2.5
     #   sphinxcontrib-qthelp
     #   sphinxcontrib-serializinghtml
 sphinx-issues==3.0.1
-    # via -r requirements/docs.in
+    # via -r docs.in
 sphinxcontrib-applehelp==1.0.7
     # via sphinx
 sphinxcontrib-devhelp==1.0.5
@@ -56,7 +56,7 @@ sphinxcontrib-htmlhelp==2.0.4
 sphinxcontrib-jsmath==1.0.1
     # via sphinx
 sphinxcontrib-log-cabinet==1.0.1
-    # via -r requirements/docs.in
+    # via -r docs.in
 sphinxcontrib-qthelp==1.0.6
     # via sphinx
 sphinxcontrib-serializinghtml==1.1.9

requirements/mypy.txt

@@ -2,24 +2,24 @@
 # This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
-#    pip-compile requirements/mypy.in
+#    pip-compile mypy.in
 #
 greenlet==2.0.2
     # via sqlalchemy
 iniconfig==2.0.0
     # via pytest
 mypy==1.5.1
-    # via -r requirements/mypy.in
+    # via -r mypy.in
 mypy-extensions==1.0.0
     # via mypy
 packaging==23.1
     # via pytest
 pluggy==1.3.0
     # via pytest
 pytest==7.4.2
-    # via -r requirements/mypy.in
+    # via -r mypy.in
 sqlalchemy==2.0.20
-    # via -r requirements/mypy.in
+    # via -r mypy.in
 typing-extensions==4.7.1
     # via
     #   mypy

requirements/tests-min.in

@@ -2,13 +2,13 @@
 # This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
-#    pip-compile requirements/tests.in
+#    pip-compile tests.in
 #
 blinker==1.6.2
-    # via -r requirements/tests.in
+    # via -r tests.in
 coverage[toml]==7.3.1
     # via
-    #   -r requirements/tests.in
+    #   -r tests.in
     #   pytest-cov
 iniconfig==2.0.0
     # via pytest
@@ -18,7 +18,7 @@ pluggy==1.3.0
     # via pytest
 pytest==7.4.2
     # via
-    #   -r requirements/tests.in
+    #   -r tests.in
     #   pytest-cov
 pytest-cov==4.1.0
-    # via -r requirements/tests.in
+    # via -r tests.in

requirements/tests-min.txt

@@ -14,7 +14,9 @@ constrain_package_deps = true
 use_frozen_constraints = true
 deps =
     -r requirements/tests.txt
-    min: -r requirements/tests-min.txt
+    min: flask==2.2.5
+    min: werkzeug<2.3
+    min: sqlalchemy==2.0.16
 commands = pytest -v --tb=short --basetemp={envtmpdir} {posargs}
 
 [testenv:style]