Skip to content

Commit

Permalink
Merge branch 'main' into maint/allauth-upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
jmcarson committed Oct 16, 2024
2 parents f06f15d + a4323a8 commit 81a878c
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ jobs:
run: ls -lhta

- name: Upload coverage data
uses: actions/[email protected].0
uses: actions/[email protected].3
with:
name: coverage-data-${{ strategy.job-index }}
path: coverage-${{ strategy.job-index }}
Expand Down Expand Up @@ -140,6 +140,6 @@ jobs:
python -m coverage report
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v4.5.0
uses: codecov/codecov-action@v4.6.0
with:
token: ${{ secrets.CODECOV_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/combine-prs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
steps:
- name: combine-prs
id: combine-prs
uses: github/combine-prs@v5.1.0
uses: github/combine-prs@v5.2.0
with:
labels: combined-pr # Optional: add a label to the combined PR
ci_required: true # require all checks to pass before combining
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gitleaks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- uses: actions/[email protected]
with:
fetch-depth: 0
- uses: gitleaks/[email protected].6
- uses: gitleaks/[email protected].7
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITLEAKS_LICENSE: ${{ secrets.GITLEAKS_LICENSE}} # Only required for Organizations, not personal accounts.
18 changes: 9 additions & 9 deletions requirements/dev-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ matplotlib-inline==0.1.6
# via ipython
mccabe==0.7.0
# via pylint
mypy==1.11.2
mypy==1.12.0
# via -r requirements/dev-requirements.in
mypy-extensions==1.0.0
# via mypy
Expand All @@ -121,7 +121,7 @@ platformdirs==4.2.0
# via
# pylint
# virtualenv
pre-commit==3.8.0
pre-commit==4.0.1
# via -r requirements/dev-requirements.in
prompt-toolkit==3.0.43
# via ipython
Expand All @@ -137,7 +137,7 @@ pylint==3.1.0
# via
# pylint-django
# pylint-plugin-utils
pylint-django==2.5.5
pylint-django==2.6.1
# via -r requirements/dev-requirements.in
pylint-plugin-utils==0.8.2
# via pylint-django
Expand All @@ -161,21 +161,21 @@ sniffio==1.3.1
# via anyio
snowballstemmer==2.2.0
# via sphinx
sphinx==8.0.2
sphinx==8.1.3
# via
# -r requirements/dev-requirements.in
# sphinx-autobuild
sphinx-autobuild==2024.10.3
# via -r requirements/dev-requirements.in
sphinxcontrib-applehelp==1.0.4
sphinxcontrib-applehelp==2.0.0
# via sphinx
sphinxcontrib-devhelp==1.0.2
sphinxcontrib-devhelp==2.0.0
# via sphinx
sphinxcontrib-htmlhelp==2.0.1
sphinxcontrib-htmlhelp==2.1.0
# via sphinx
sphinxcontrib-jsmath==1.0.1
# via sphinx
sphinxcontrib-qthelp==1.0.3
sphinxcontrib-qthelp==2.0.0
# via sphinx
sphinxcontrib-serializinghtml==2.0.0
# via sphinx
Expand All @@ -186,7 +186,7 @@ sqlparse==0.5.1
# django-debug-toolbar
stack-data==0.6.3
# via ipython
starlette==0.38.2
starlette==0.40.0
# via sphinx-autobuild
tomli==2.0.1
# via
Expand Down
4 changes: 2 additions & 2 deletions requirements/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ charset-normalizer==3.3.2
# via requests
click==8.1.7
# via pip-tools
crispy-bootstrap5==2024.2
crispy-bootstrap5==2024.10
# via
# -r requirements/requirements.in
# django-anvil-consortium-manager
Expand Down Expand Up @@ -147,7 +147,7 @@ six==1.16.0
# via google-auth
sqlparse==0.5.1
# via django
tablib==3.6.1
tablib==3.7.0
# via -r requirements/requirements.in
tenacity==8.2.3
# via
Expand Down

0 comments on commit 81a878c

Please sign in to comment.