Skip to content

Commit

Permalink
Merge branch '2.2.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
davidism committed Aug 24, 2024
2 parents e962051 + 2b4057a commit d408c5e
Show file tree
Hide file tree
Showing 11 changed files with 82 additions and 93 deletions.
18 changes: 0 additions & 18 deletions .github/dependabot.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: generate hash
id: hash
run: cd dist && echo "hash=$(sha256sum * | base64 -w0)" >> $GITHUB_OUTPUT
- uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
- uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
with:
path: ./dist
provenance:
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ci:
autoupdate_schedule: monthly
repos:
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.5.6
rev: v0.6.2
hooks:
- id: ruff
- id: ruff-format
Expand Down
6 changes: 5 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,12 @@ select = [
"UP", # pyupgrade
"W", # pycodestyle warning
]
ignore-init-module-imports = true

[tool.ruff.lint.isort]
force-single-line = true
order-by-type = false

[tool.gha-update]
tag-only = [
"slsa-framework/slsa-github-generator",
]
4 changes: 2 additions & 2 deletions requirements/build.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
build==1.2.1
# via -r build.in
packaging==24.0
packaging==24.1
# via build
pyproject-hooks==1.0.0
pyproject-hooks==1.1.0
# via build
63 changes: 30 additions & 33 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
#
# pip-compile dev.in
#
alabaster==0.7.16
alabaster==1.0.0
# via
# -r docs.txt
# sphinx
babel==2.14.0
babel==2.16.0
# via
# -r docs.txt
# sphinx
cachetools==5.3.3
cachetools==5.5.0
# via tox
certifi==2024.2.2
certifi==2024.7.4
# via
# -r docs.txt
# requests
Expand All @@ -30,19 +30,19 @@ colorama==0.4.6
# via tox
distlib==0.3.8
# via virtualenv
docutils==0.20.1
docutils==0.21.2
# via
# -r docs.txt
# sphinx
filelock==3.13.4
filelock==3.15.4
# via
# tox
# virtualenv
freezegun==1.5.1
# via -r tests.txt
identify==2.5.35
identify==2.6.0
# via pre-commit
idna==3.7
idna==3.8
# via
# -r docs.txt
# requests
Expand All @@ -55,26 +55,26 @@ iniconfig==2.0.0
# -r tests.txt
# -r typing.txt
# pytest
jinja2==3.1.3
jinja2==3.1.4
# via
# -r docs.txt
# sphinx
markupsafe==2.1.5
# via
# -r docs.txt
# jinja2
mypy==1.10.1
mypy==1.11.1
# via -r typing.txt
mypy-extensions==1.0.0
# via
# -r typing.txt
# mypy
nodeenv==1.8.0
nodeenv==1.9.1
# via
# -r typing.txt
# pre-commit
# pyright
packaging==24.0
packaging==24.1
# via
# -r docs.txt
# -r tests.txt
Expand All @@ -86,7 +86,7 @@ packaging==24.0
# tox
pallets-sphinx-themes==2.1.3
# via -r docs.txt
platformdirs==4.2.0
platformdirs==4.2.2
# via
# tox
# virtualenv
Expand All @@ -96,27 +96,27 @@ pluggy==1.5.0
# -r typing.txt
# pytest
# tox
pre-commit==3.7.1
pre-commit==3.8.0
# via -r dev.in
pygments==2.17.2
pygments==2.18.0
# via
# -r docs.txt
# sphinx
pyproject-api==1.6.1
pyproject-api==1.7.1
# via tox
pyright==1.1.369
pyright==1.1.377
# via -r typing.txt
pytest==8.2.2
pytest==8.3.2
# via
# -r tests.txt
# -r typing.txt
python-dateutil==2.9.0.post0
# via
# -r tests.txt
# freezegun
pyyaml==6.0.1
pyyaml==6.0.2
# via pre-commit
requests==2.31.0
requests==2.32.3
# via
# -r docs.txt
# sphinx
Expand All @@ -128,20 +128,20 @@ snowballstemmer==2.2.0
# via
# -r docs.txt
# sphinx
sphinx==7.3.7
sphinx==8.0.2
# via
# -r docs.txt
# pallets-sphinx-themes
# sphinxcontrib-log-cabinet
sphinxcontrib-applehelp==1.0.8
sphinxcontrib-applehelp==2.0.0
# via
# -r docs.txt
# sphinx
sphinxcontrib-devhelp==1.0.6
sphinxcontrib-devhelp==2.0.0
# via
# -r docs.txt
# sphinx
sphinxcontrib-htmlhelp==2.0.5
sphinxcontrib-htmlhelp==2.1.0
# via
# -r docs.txt
# sphinx
Expand All @@ -151,28 +151,25 @@ sphinxcontrib-jsmath==1.0.1
# sphinx
sphinxcontrib-log-cabinet==1.0.1
# via -r docs.txt
sphinxcontrib-qthelp==1.0.7
sphinxcontrib-qthelp==2.0.0
# via
# -r docs.txt
# sphinx
sphinxcontrib-serializinghtml==1.1.10
sphinxcontrib-serializinghtml==2.0.0
# via
# -r docs.txt
# sphinx
tox==4.15.1
tox==4.18.0
# via -r dev.in
typing-extensions==4.11.0
typing-extensions==4.12.2
# via
# -r typing.txt
# mypy
urllib3==2.2.1
urllib3==2.2.2
# via
# -r docs.txt
# requests
virtualenv==20.25.1
virtualenv==20.26.3
# via
# pre-commit
# tox

# The following packages are considered to be unsafe in a requirements file:
# setuptools
32 changes: 16 additions & 16 deletions requirements/docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,54 +4,54 @@
#
# pip-compile docs.in
#
alabaster==0.7.16
alabaster==1.0.0
# via sphinx
babel==2.14.0
babel==2.16.0
# via sphinx
certifi==2024.2.2
certifi==2024.7.4
# via requests
charset-normalizer==3.3.2
# via requests
docutils==0.20.1
docutils==0.21.2
# via sphinx
idna==3.7
idna==3.8
# via requests
imagesize==1.4.1
# via sphinx
jinja2==3.1.3
jinja2==3.1.4
# via sphinx
markupsafe==2.1.5
# via jinja2
packaging==24.0
packaging==24.1
# via
# pallets-sphinx-themes
# sphinx
pallets-sphinx-themes==2.1.3
# via -r docs.in
pygments==2.17.2
pygments==2.18.0
# via sphinx
requests==2.31.0
requests==2.32.3
# via sphinx
snowballstemmer==2.2.0
# via sphinx
sphinx==7.3.7
sphinx==8.0.2
# via
# -r docs.in
# pallets-sphinx-themes
# sphinxcontrib-log-cabinet
sphinxcontrib-applehelp==1.0.8
sphinxcontrib-applehelp==2.0.0
# via sphinx
sphinxcontrib-devhelp==1.0.6
sphinxcontrib-devhelp==2.0.0
# via sphinx
sphinxcontrib-htmlhelp==2.0.5
sphinxcontrib-htmlhelp==2.1.0
# via sphinx
sphinxcontrib-jsmath==1.0.1
# via sphinx
sphinxcontrib-log-cabinet==1.0.1
# via -r docs.in
sphinxcontrib-qthelp==1.0.7
sphinxcontrib-qthelp==2.0.0
# via sphinx
sphinxcontrib-serializinghtml==1.1.10
sphinxcontrib-serializinghtml==2.0.0
# via sphinx
urllib3==2.2.1
urllib3==2.2.2
# via requests
4 changes: 2 additions & 2 deletions requirements/tests.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ freezegun==1.5.1
# via -r tests.in
iniconfig==2.0.0
# via pytest
packaging==24.0
packaging==24.1
# via pytest
pluggy==1.5.0
# via pytest
pytest==8.2.2
pytest==8.3.2
# via -r tests.in
python-dateutil==2.9.0.post0
# via freezegun
Expand Down
15 changes: 6 additions & 9 deletions requirements/typing.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,19 @@
#
iniconfig==2.0.0
# via pytest
mypy==1.10.1
mypy==1.11.1
# via -r typing.in
mypy-extensions==1.0.0
# via mypy
nodeenv==1.8.0
nodeenv==1.9.1
# via pyright
packaging==24.0
packaging==24.1
# via pytest
pluggy==1.5.0
# via pytest
pyright==1.1.369
pyright==1.1.377
# via -r typing.in
pytest==8.2.2
pytest==8.3.2
# via -r typing.in
typing-extensions==4.11.0
typing-extensions==4.12.2
# via mypy

# The following packages are considered to be unsafe in a requirements file:
# setuptools
2 changes: 1 addition & 1 deletion src/itsdangerous/timed.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def sign(self, value: str | bytes) -> bytes:
# parameter that affects the return type.

@t.overload
def unsign( # type: ignore[overload-overlap]
def unsign(
self,
signed_value: str | bytes,
max_age: int | None = None,
Expand Down
27 changes: 18 additions & 9 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,25 @@ commands =
deps = -r requirements/docs.txt
commands = sphinx-build -E -W -b dirhtml docs docs/_build/dirhtml

[testenv:update-actions]
labels = update
deps = gha-update
commands = gha-update

[testenv:update-pre_commit]
labels = update
deps = pre-commit
skip_install = true
commands = pre-commit autoupdate -j4

[testenv:update-requirements]
deps =
pip-tools
pre-commit
labels = update
deps = pip-tools
skip_install = true
change_dir = requirements
commands =
pre-commit autoupdate -j4
pip-compile -U build.in
pip-compile -U docs.in
pip-compile -U tests.in
pip-compile -U typing.in
pip-compile -U dev.in
pip-compile build.in -q {posargs:-U}
pip-compile docs.in -q {posargs:-U}
pip-compile tests.in -q {posargs:-U}
pip-compile typing.in -q {posargs:-U}
pip-compile dev.in -q {posargs:-U}

0 comments on commit d408c5e

Please sign in to comment.