Skip to content

Commit

Permalink
Merge pull request #665 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 854f241 + a63916d commit 3155909
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 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
10 changes: 5 additions & 5 deletions requirements/dev-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,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 @@ -87,7 +87,7 @@ markupsafe==2.1.5
# werkzeug
matplotlib-inline==0.1.6
# via ipython
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 @@ -136,7 +136,7 @@ requests==2.32.3
# -c requirements/requirements.txt
# -c requirements/test-requirements.txt
# sphinx
ruff==0.5.1
ruff==0.5.4
# via -r requirements/dev-requirements.in
six==1.16.0
# via
Expand Down Expand Up @@ -164,7 +164,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 All @@ -188,7 +188,7 @@ types-pytz==2024.1.0.20240203
# via django-stubs
types-pyyaml==6.0.12.12
# via django-stubs
types-requests==2.32.0.20240622
types-requests==2.32.0.20240712
# via -r requirements/dev-requirements.in
typing-extensions==4.8.0
# via
Expand Down
6 changes: 3 additions & 3 deletions requirements/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,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 @@ -121,7 +121,7 @@ importlib-resources==6.1.1
# jsonschema-specifications
jsonapi-requests==0.7.0
# via -r requirements/requirements.in
jsonschema==4.22.0
jsonschema==4.23.0
# via -r requirements/requirements.in
jsonschema-specifications==2023.12.1
# via jsonschema
Expand Down Expand Up @@ -203,7 +203,7 @@ rsa==4.9
# via google-auth
six==1.16.0
# via python-dateutil
sqlparse==0.5.0
sqlparse==0.5.1
# via
# -r requirements/requirements.in
# django
Expand Down
2 changes: 1 addition & 1 deletion requirements/test-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ pyparsing==3.1.1
# via
# -c requirements/requirements.txt
# packaging
pytest==8.2.2
pytest==8.3.1
# via
# -r requirements/test-requirements.in
# pytest-cov
Expand Down

0 comments on commit 3155909

Please sign in to comment.