Skip to content

Commit

Permalink
Merge pull request #641 from UW-GAC/combined-prs-branch
Browse files Browse the repository at this point in the history
Combined PRs
  • Loading branch information
amstilp authored Jul 22, 2024
2 parents cf3ca63 + d73ce34 commit dbe6a06
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/combine-prs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
steps:
- name: combine-prs
id: combine-prs
uses: github/combine-prs@v5.0.0
uses: github/combine-prs@v5.1.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
8 changes: 4 additions & 4 deletions requirements/dev-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ django==4.2.14
# django-debug-toolbar
# django-stubs
# django-stubs-ext
django-debug-toolbar==4.4.5
django-debug-toolbar==4.4.6
# via -r requirements/dev-requirements.in
django-stubs==4.2.7
# via -r requirements/dev-requirements.in
Expand Down Expand Up @@ -95,7 +95,7 @@ matplotlib-inline==0.1.6
# via ipython
mccabe==0.7.0
# via pylint
mypy==1.10.1
mypy==1.11.0
# via -r requirements/dev-requirements.in
mypy-extensions==1.0.0
# via mypy
Expand Down Expand Up @@ -149,7 +149,7 @@ requests==2.32.3
# -c requirements/requirements.txt
# -c requirements/test-requirements.txt
# sphinx
ruff==0.5.1
ruff==0.5.2
# via -r requirements/dev-requirements.in
six==1.16.0
# via
Expand Down Expand Up @@ -177,7 +177,7 @@ sphinxcontrib-qthelp==1.0.3
# via sphinx
sphinxcontrib-serializinghtml==1.1.5
# via sphinx
sqlparse==0.5.0
sqlparse==0.5.1
# via
# -c requirements/requirements.txt
# django
Expand Down
4 changes: 2 additions & 2 deletions requirements/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ django-autocomplete-light==3.11.0
# via django-anvil-consortium-manager
django-constance==3.1.0
# via -r requirements/requirements.in
django-crispy-forms==2.2
django-crispy-forms==2.3
# via
# -r requirements/requirements.in
# crispy-bootstrap5
Expand Down Expand Up @@ -156,7 +156,7 @@ rsa==4.9
# via google-auth
six==1.16.0
# via google-auth
sqlparse==0.5.0
sqlparse==0.5.1
# via
# -r requirements/requirements.in
# django
Expand Down
4 changes: 2 additions & 2 deletions requirements/test-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ packaging==23.2
# pytest-sugar
pluggy==1.5.0
# via pytest
pytest==8.2.2
pytest==8.3.1
# via
# -r requirements/test-requirements.in
# pytest-cov
Expand Down Expand Up @@ -78,7 +78,7 @@ tomli==2.0.1
# -c requirements/requirements.txt
# coverage
# pytest
types-requests==2.32.0.20240622
types-requests==2.32.0.20240712
# via -r requirements/test-requirements.in
typing-extensions==4.8.0
# via
Expand Down

0 comments on commit dbe6a06

Please sign in to comment.