Merge branch 'main' into issue-1806/pr-1511-additional-test-coverage

pallets · Jul 8, 2024 · 5f0f2e9 · 5f0f2e9
2 parents 9506181 + d7225e6
commit 5f0f2e9
Show file tree

Hide file tree

Showing 7 changed files with 95 additions and 76 deletions.
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -9,7 +9,7 @@ jobs:
     outputs:
       hash: ${{ steps.hash.outputs.hash }}
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         with:
           python-version: '3.x'
@@ -64,10 +64,10 @@ jobs:
       id-token: write
     steps:
       - uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
-      - uses: pypa/gh-action-pypi-publish@81e9d935c883d0b210363ab89cf05f3894778450 # v1.8.14
+      - uses: pypa/gh-action-pypi-publish@ec4db0b4ddc65acdf4bff5fa45ac92d78b56bdf0 # v1.9.0
         with:
           repository-url: https://test.pypi.org/legacy/
           packages-dir: artifact/
-      - uses: pypa/gh-action-pypi-publish@81e9d935c883d0b210363ab89cf05f3894778450 # v1.8.14
+      - uses: pypa/gh-action-pypi-publish@ec4db0b4ddc65acdf4bff5fa45ac92d78b56bdf0 # v1.9.0
         with:
           packages-dir: artifact/
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -31,7 +31,7 @@ jobs:
           - {python: '3.8'}
           - {name: PyPy, python: 'pypy-3.10', tox: pypy310}
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         with:
           python-version: ${{ matrix.python }}
@@ -43,7 +43,7 @@ jobs:
   typing:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         with:
           python-version: '3.x'

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -2,7 +2,7 @@ ci:
   autoupdate_schedule: monthly
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.4.7
+    rev: v0.5.0
     hooks:
       - id: ruff
       - id: ruff-format

diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -5,35 +5,40 @@
 #    pip-compile dev.in
 #
 alabaster==0.7.16
-    # via sphinx
+    # via
+    #   -r docs.txt
+    #   sphinx
 attrs==23.2.0
     # via
+    #   -r tests.txt
     #   outcome
     #   trio
 babel==2.15.0
-    # via sphinx
-build==1.2.1
-    # via pip-tools
+    # via
+    #   -r docs.txt
+    #   sphinx
 cachetools==5.3.3
     # via tox
 certifi==2024.2.2
-    # via requests
+    # via
+    #   -r docs.txt
+    #   requests
 cfgv==3.4.0
     # via pre-commit
 chardet==5.2.0
     # via tox
 charset-normalizer==3.3.2
-    # via requests
-click==8.1.7
     # via
-    #   pip-compile-multi
-    #   pip-tools
+    #   -r docs.txt
+    #   requests
 colorama==0.4.6
     # via tox
 distlib==0.3.8
     # via virtualenv
 docutils==0.21.2
-    # via sphinx
+    # via
+    #   -r docs.txt
+    #   sphinx
 filelock==3.14.0
     # via
     #   tox
@@ -42,107 +47,136 @@ identify==2.5.36
     # via pre-commit
 idna==3.7
     # via
+    #   -r docs.txt
+    #   -r tests.txt
     #   requests
     #   trio
 imagesize==1.4.1
-    # via sphinx
+    # via
+    #   -r docs.txt
+    #   sphinx
 iniconfig==2.0.0
-    # via pytest
+    # via
+    #   -r tests.txt
+    #   pytest
 jinja2==3.1.4
-    # via sphinx
+    # via
+    #   -r docs.txt
+    #   sphinx
 markupsafe==2.1.5
-    # via jinja2
+    # via
+    #   -r docs.txt
+    #   jinja2
 mypy==1.10.0
-    # via -r typing.in
+    # via -r typing.txt
 mypy-extensions==1.0.0
-    # via mypy
+    # via
+    #   -r typing.txt
+    #   mypy
 nodeenv==1.8.0
     # via pre-commit
 outcome==1.3.0.post0
-    # via trio
+    # via
+    #   -r tests.txt
+    #   trio
 packaging==24.0
     # via
-    #   build
+    #   -r docs.txt
+    #   -r tests.txt
     #   pallets-sphinx-themes
     #   pyproject-api
     #   pytest
     #   sphinx
     #   tox
 pallets-sphinx-themes==2.1.3
-    # via -r docs.in
-pip-compile-multi==2.6.3
-    # via -r dev.in
-pip-tools==7.4.1
-    # via pip-compile-multi
+    # via -r docs.txt
 platformdirs==4.2.1
     # via
     #   tox
     #   virtualenv
 pluggy==1.5.0
     # via
+    #   -r tests.txt
     #   pytest
     #   tox
 pre-commit==3.7.1
     # via -r dev.in
 pygments==2.18.0
-    # via sphinx
+    # via
+    #   -r docs.txt
+    #   sphinx
 pyproject-api==1.6.1
     # via tox
-pyproject-hooks==1.1.0
-    # via
-    #   build
-    #   pip-tools
 pytest==8.2.0
-    # via -r tests.in
+    # via -r tests.txt
 pyyaml==6.0.1
     # via pre-commit
 requests==2.31.0
-    # via sphinx
+    # via
+    #   -r docs.txt
+    #   sphinx
 sniffio==1.3.1
-    # via trio
+    # via
+    #   -r tests.txt
+    #   trio
 snowballstemmer==2.2.0
-    # via sphinx
+    # via
+    #   -r docs.txt
+    #   sphinx
 sortedcontainers==2.4.0
-    # via trio
+    # via
+    #   -r tests.txt
+    #   trio
 sphinx==7.3.7
     # via
-    #   -r docs.in
+    #   -r docs.txt
     #   pallets-sphinx-themes
     #   sphinx-issues
     #   sphinxcontrib-log-cabinet
 sphinx-issues==4.1.0
-    # via -r docs.in
+    # via -r docs.txt
 sphinxcontrib-applehelp==1.0.8
-    # via sphinx
+    # via
+    #   -r docs.txt
+    #   sphinx
 sphinxcontrib-devhelp==1.0.6
-    # via sphinx
+    # via
+    #   -r docs.txt
+    #   sphinx
 sphinxcontrib-htmlhelp==2.0.5
-    # via sphinx
+    # via
+    #   -r docs.txt
+    #   sphinx
 sphinxcontrib-jsmath==1.0.1
-    # via sphinx
+    # via
+    #   -r docs.txt
+    #   sphinx
 sphinxcontrib-log-cabinet==1.0.1
-    # via -r docs.in
+    # via -r docs.txt
 sphinxcontrib-qthelp==1.0.7
-    # via sphinx
+    # via
+    #   -r docs.txt
+    #   sphinx
 sphinxcontrib-serializinghtml==1.1.10
-    # via sphinx
-toposort==1.10
-    # via pip-compile-multi
-tox==4.15.0
+    # via
+    #   -r docs.txt
+    #   sphinx
+tox==4.15.1
     # via -r dev.in
-trio==0.25.0
-    # via -r tests.in
+trio==0.25.1
+    # via -r tests.txt
 typing-extensions==4.11.0
-    # via mypy
+    # via
+    #   -r typing.txt
+    #   mypy
 urllib3==2.2.1
-    # via requests
+    # via
+    #   -r docs.txt
+    #   requests
 virtualenv==20.26.1
     # via
     #   pre-commit
     #   tox
-wheel==0.43.0
-    # via pip-tools
 
 # The following packages are considered to be unsafe in a requirements file:
-# pip
 # setuptools
diff --git a/requirements/tests.txt b/requirements/tests.txt
@@ -24,5 +24,5 @@ sniffio==1.3.1
     # via trio
 sortedcontainers==2.4.0
     # via trio
-trio==0.25.0
+trio==0.25.1
     # via -r tests.in
diff --git a/requirements/tests37.in b/requirements/tests37.in
@@ -1,2 +1,2 @@
 pytest
-trio==0.22.2
+trio==0.25.1
diff --git a/requirements/tests37.txt b/requirements/tests37.txt
@@ -8,17 +8,8 @@ attrs==23.2.0
     # via
     #   outcome
     #   trio
-exceptiongroup==1.2.1
-    # via
-    #   pytest
-    #   trio
 idna==3.7
     # via trio
-importlib-metadata==6.7.0
-    # via
-    #   attrs
-    #   pluggy
-    #   pytest
 iniconfig==2.0.0
     # via pytest
 outcome==1.3.0.post0
@@ -33,11 +24,5 @@ sniffio==1.3.1
     # via trio
 sortedcontainers==2.4.0
     # via trio
-tomli==2.0.1
-    # via pytest
-trio==0.22.2
+trio==0.25.1
     # via -r tests37.in
-typing-extensions==4.7.1
-    # via importlib-metadata
-zipp==3.15.0
-    # via importlib-metadata