diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index b1b29ec1..3f8d56c3 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -9,8 +9,8 @@ jobs: outputs: hash: ${{ steps.hash.outputs.hash }} steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - - uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 + - uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0 with: python-version: '3.x' cache: pip @@ -23,7 +23,7 @@ jobs: - name: generate hash id: hash run: cd dist && echo "hash=$(sha256sum * | base64 -w0)" >> $GITHUB_OUTPUT - - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6 + - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 with: path: ./dist provenance: @@ -64,10 +64,10 @@ jobs: id-token: write steps: - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 - - uses: pypa/gh-action-pypi-publish@ec4db0b4ddc65acdf4bff5fa45ac92d78b56bdf0 # v1.9.0 + - uses: pypa/gh-action-pypi-publish@f7600683efdcb7656dec5b29656edb7bc586e597 # v1.10.3 with: repository-url: https://test.pypi.org/legacy/ packages-dir: artifact/ - - uses: pypa/gh-action-pypi-publish@ec4db0b4ddc65acdf4bff5fa45ac92d78b56bdf0 # v1.9.0 + - uses: pypa/gh-action-pypi-publish@f7600683efdcb7656dec5b29656edb7bc586e597 # v1.10.3 with: packages-dir: artifact/ diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 8e3e553e..d6e88372 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -33,8 +33,8 @@ jobs: - {name: Minimum Versions, python: '3.12', tox: py-min} - {name: Development Versions, python: '3.8', tox: py-dev} steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - - uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 + - uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0 with: python-version: ${{ matrix.python }} allow-prereleases: true @@ -45,14 +45,14 @@ jobs: typing: runs-on: ubuntu-latest steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - - uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 + - uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0 with: python-version: '3.x' cache: pip cache-dependency-path: requirements*/*.txt - name: cache mypy - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 + uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1 with: path: ./.mypy_cache key: mypy|${{ hashFiles('pyproject.toml') }} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5bee1ca4..031f3014 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,12 +2,12 @@ ci: autoupdate_schedule: monthly repos: - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.6.2 + rev: v0.7.0 hooks: - id: ruff - id: ruff-format - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.6.0 + rev: v5.0.0 hooks: - id: check-merge-conflict - id: debug-statements diff --git a/requirements/build.txt b/requirements/build.txt index 4b289ca7..1b13b055 100644 --- a/requirements/build.txt +++ b/requirements/build.txt @@ -1,12 +1,12 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.13 # by the following command: # # pip-compile build.in # -build==1.2.1 +build==1.2.2.post1 # via -r build.in packaging==24.1 # via build -pyproject-hooks==1.1.0 +pyproject-hooks==1.2.0 # via build diff --git a/requirements/dev.txt b/requirements/dev.txt index cb7a407c..6077ec03 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.13 # by the following command: # # pip-compile dev.in @@ -18,11 +18,11 @@ babel==2.16.0 # sphinx cachetools==5.5.0 # via tox -certifi==2024.7.4 +certifi==2024.8.30 # via # -r docs.txt # requests -cffi==1.17.0 +cffi==1.17.1 # via # -r typing.txt # cryptography @@ -30,28 +30,28 @@ cfgv==3.4.0 # via pre-commit chardet==5.2.0 # via tox -charset-normalizer==3.3.2 +charset-normalizer==3.4.0 # via # -r docs.txt # requests colorama==0.4.6 # via tox -cryptography==43.0.0 +cryptography==43.0.3 # via -r typing.txt -distlib==0.3.8 +distlib==0.3.9 # via virtualenv docutils==0.21.2 # via # -r docs.txt # sphinx # sphinx-tabs -filelock==3.15.4 +filelock==3.16.1 # via # tox # virtualenv -identify==2.6.0 +identify==2.6.1 # via pre-commit -idna==3.8 +idna==3.10 # via # -r docs.txt # requests @@ -68,11 +68,11 @@ jinja2==3.1.4 # via # -r docs.txt # sphinx -markupsafe==2.1.5 +markupsafe==3.0.2 # via # -r docs.txt # jinja2 -mypy==1.11.1 +mypy==1.12.0 # via -r typing.txt mypy-extensions==1.0.0 # via @@ -93,9 +93,9 @@ packaging==24.1 # pytest # sphinx # tox -pallets-sphinx-themes==2.1.3 +pallets-sphinx-themes==2.2.0 # via -r docs.txt -platformdirs==4.2.2 +platformdirs==4.3.6 # via # tox # virtualenv @@ -105,7 +105,7 @@ pluggy==1.5.0 # -r typing.txt # pytest # tox -pre-commit==3.8.0 +pre-commit==4.0.1 # via -r dev.in pycparser==2.22 # via @@ -116,11 +116,11 @@ pygments==2.18.0 # -r docs.txt # sphinx # sphinx-tabs -pyproject-api==1.7.1 +pyproject-api==1.8.0 # via tox -pyright==1.1.377 +pyright==1.1.385 # via -r typing.txt -pytest==8.3.2 +pytest==8.3.3 # via # -r tests.txt # -r typing.txt @@ -138,13 +138,18 @@ snowballstemmer==2.2.0 # via # -r docs.txt # sphinx -sphinx==8.0.2 +sphinx==8.1.3 # via # -r docs.txt # pallets-sphinx-themes + # sphinx-notfound-page # sphinx-tabs # sphinxcontrib-log-cabinet -sphinx-tabs==3.4.5 +sphinx-notfound-page==1.0.4 + # via + # -r docs.txt + # pallets-sphinx-themes +sphinx-tabs==3.4.7 # via -r docs.txt sphinxcontrib-applehelp==2.0.0 # via @@ -172,7 +177,7 @@ sphinxcontrib-serializinghtml==2.0.0 # via # -r docs.txt # sphinx -tox==4.18.0 +tox==4.23.0 # via -r dev.in types-contextvars==2.4.7.3 # via -r typing.txt @@ -182,11 +187,12 @@ typing-extensions==4.12.2 # via # -r typing.txt # mypy -urllib3==2.2.2 + # pyright +urllib3==2.2.3 # via # -r docs.txt # requests -virtualenv==20.26.3 +virtualenv==20.27.0 # via # pre-commit # tox diff --git a/requirements/docs.txt b/requirements/docs.txt index 651e9b2d..bc79f2a0 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.13 # by the following command: # # pip-compile docs.in @@ -8,27 +8,27 @@ alabaster==1.0.0 # via sphinx babel==2.16.0 # via sphinx -certifi==2024.7.4 +certifi==2024.8.30 # via requests -charset-normalizer==3.3.2 +charset-normalizer==3.4.0 # via requests docutils==0.21.2 # via # sphinx # sphinx-tabs -idna==3.8 +idna==3.10 # via requests imagesize==1.4.1 # via sphinx jinja2==3.1.4 # via sphinx -markupsafe==2.1.5 +markupsafe==3.0.2 # via jinja2 packaging==24.1 # via # pallets-sphinx-themes # sphinx -pallets-sphinx-themes==2.1.3 +pallets-sphinx-themes==2.2.0 # via -r docs.in pygments==2.18.0 # via @@ -38,13 +38,16 @@ requests==2.32.3 # via sphinx snowballstemmer==2.2.0 # via sphinx -sphinx==8.0.2 +sphinx==8.1.3 # via # -r docs.in # pallets-sphinx-themes + # sphinx-notfound-page # sphinx-tabs # sphinxcontrib-log-cabinet -sphinx-tabs==3.4.5 +sphinx-notfound-page==1.0.4 + # via pallets-sphinx-themes +sphinx-tabs==3.4.7 # via -r docs.in sphinxcontrib-applehelp==2.0.0 # via sphinx @@ -60,5 +63,5 @@ sphinxcontrib-qthelp==2.0.0 # via sphinx sphinxcontrib-serializinghtml==2.0.0 # via sphinx -urllib3==2.2.2 +urllib3==2.2.3 # via requests diff --git a/requirements/tests.txt b/requirements/tests.txt index 3a24fc51..2c67487f 100644 --- a/requirements/tests.txt +++ b/requirements/tests.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.13 # by the following command: # # pip-compile tests.in @@ -12,7 +12,7 @@ packaging==24.1 # via pytest pluggy==1.5.0 # via pytest -pytest==8.3.2 +pytest==8.3.3 # via -r tests.in python-dotenv==1.0.1 # via -r tests.in diff --git a/requirements/typing.txt b/requirements/typing.txt index 99753c70..83e75deb 100644 --- a/requirements/typing.txt +++ b/requirements/typing.txt @@ -1,18 +1,18 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.13 # by the following command: # # pip-compile typing.in # asgiref==3.8.1 # via -r typing.in -cffi==1.17.0 +cffi==1.17.1 # via cryptography -cryptography==43.0.0 +cryptography==43.0.3 # via -r typing.in iniconfig==2.0.0 # via pytest -mypy==1.11.1 +mypy==1.12.0 # via -r typing.in mypy-extensions==1.0.0 # via mypy @@ -24,9 +24,9 @@ pluggy==1.5.0 # via pytest pycparser==2.22 # via cffi -pyright==1.1.377 +pyright==1.1.385 # via -r typing.in -pytest==8.3.2 +pytest==8.3.3 # via -r typing.in python-dotenv==1.0.1 # via -r typing.in @@ -35,4 +35,6 @@ types-contextvars==2.4.7.3 types-dataclasses==0.6.6 # via -r typing.in typing-extensions==4.12.2 - # via mypy + # via + # mypy + # pyright diff --git a/src/flask/json/provider.py b/src/flask/json/provider.py index b086e668..ea7e4753 100644 --- a/src/flask/json/provider.py +++ b/src/flask/json/provider.py @@ -113,7 +113,7 @@ def _default(o: t.Any) -> t.Any: return str(o) if dataclasses and dataclasses.is_dataclass(o): - return dataclasses.asdict(o) # type: ignore[call-overload] + return dataclasses.asdict(o) # type: ignore[arg-type] if hasattr(o, "__html__"): return str(o.__html__())