Skip to content

Commit

Permalink
Merge branch '3.1.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
davidism committed Aug 24, 2024
2 parents 9ecc1d1 + 2e1f46b commit cb2cf1d
Show file tree
Hide file tree
Showing 11 changed files with 55 additions and 71 deletions.
18 changes: 0 additions & 18 deletions .github/dependabot.yml

This file was deleted.

6 changes: 3 additions & 3 deletions .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@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
- uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
with:
path: ./dist
provenance:
Expand All @@ -44,7 +44,7 @@ jobs:
permissions:
contents: write
steps:
- uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
- uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
- name: create release
run: >
gh release create --draft --repo ${{ github.repository }}
Expand All @@ -63,7 +63,7 @@ jobs:
permissions:
id-token: write
steps:
- uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
- uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
- uses: pypa/gh-action-pypi-publish@ec4db0b4ddc65acdf4bff5fa45ac92d78b56bdf0 # v1.9.0
with:
repository-url: https://test.pypi.org/legacy/
Expand Down
4 changes: 1 addition & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
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
5 changes: 5 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -97,3 +97,8 @@ 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",
]
2 changes: 1 addition & 1 deletion requirements-skip/tests-min.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ markupsafe==2.1.5
# werkzeug
sqlalchemy==2.0.16
# via -r tests-min.in
typing-extensions==4.11.0
typing-extensions==4.12.2
# via sqlalchemy
werkzeug==2.2.3
# via
Expand Down
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
47 changes: 22 additions & 25 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
#
# 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.7.4
# via
Expand All @@ -34,13 +34,13 @@ docutils==0.21.2
# via
# -r docs.txt
# sphinx
filelock==3.13.4
filelock==3.15.4
# via
# tox
# virtualenv
identify==2.5.36
identify==2.6.0
# via pre-commit
idna==3.7
idna==3.8
# via
# -r docs.txt
# requests
Expand All @@ -67,12 +67,12 @@ 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 @@ -84,7 +84,7 @@ packaging==24.0
# tox
pallets-sphinx-themes==2.1.3
# via -r docs.txt
platformdirs==4.2.1
platformdirs==4.2.2
# via
# tox
# virtualenv
Expand All @@ -96,21 +96,21 @@ pluggy==1.5.0
# tox
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.374
pyright==1.1.377
# via -r typing.txt
pytest==8.3.2
# via
# -r tests.txt
# -r typing.txt
pyyaml==6.0.1
pyyaml==6.0.2
# via pre-commit
requests==2.32.0
requests==2.32.3
# via
# -r docs.txt
# sphinx
Expand All @@ -123,15 +123,15 @@ sphinx==8.0.2
# -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 @@ -141,28 +141,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.2
# via
# -r docs.txt
# requests
virtualenv==20.26.0
virtualenv==20.26.3
# via
# pre-commit
# tox

# The following packages are considered to be unsafe in a requirements file:
# setuptools
22 changes: 11 additions & 11 deletions requirements/docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,33 +4,33 @@
#
# 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.7.4
# via requests
charset-normalizer==3.3.2
# via requests
docutils==0.21.2
# via sphinx
idna==3.7
idna==3.8
# via requests
imagesize==1.4.1
# via sphinx
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.32.0
requests==2.32.3
# via sphinx
snowballstemmer==2.2.0
# via sphinx
Expand All @@ -39,19 +39,19 @@ sphinx==8.0.2
# -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.2
# via requests
2 changes: 1 addition & 1 deletion requirements/tests.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
iniconfig==2.0.0
# via pytest
packaging==24.0
packaging==24.1
# via pytest
pluggy==1.5.0
# via pytest
Expand Down
11 changes: 4 additions & 7 deletions requirements/typing.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,15 @@ 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.374
pyright==1.1.377
# via -r typing.in
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
5 changes: 5 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ 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
Expand Down

0 comments on commit cb2cf1d

Please sign in to comment.