Skip to content

Commit

Permalink
Merge pull request #672 from UW-GAC/combined-prs-branch
Browse files Browse the repository at this point in the history
Combined PRs
  • Loading branch information
amstilp authored Aug 5, 2024
2 parents 08cdd81 + 588bb6f commit 85a39be
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 14 deletions.
47 changes: 35 additions & 12 deletions requirements/dev-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@
#
# pip-compile requirements/dev-requirements.in
#
alabaster==0.7.13
alabaster==1.0.0
# via sphinx
anyio==4.4.0
# via
# starlette
# watchfiles
asgiref==3.8.1
# via
# -c requirements/requirements.txt
Expand All @@ -30,6 +34,10 @@ charset-normalizer==3.3.2
# -c requirements/requirements.txt
# -c requirements/test-requirements.txt
# requests
click==8.1.7
# via
# -c requirements/requirements.txt
# uvicorn
colorama==0.4.6
# via sphinx-autobuild
decorator==5.1.1
Expand All @@ -54,16 +62,23 @@ django-stubs-ext==5.0.0
# via django-stubs
docutils==0.20.1
# via sphinx
exceptiongroup==1.2.0
# via
# -c requirements/test-requirements.txt
# anyio
executing==2.0.1
# via stack-data
filelock==3.13.1
# via virtualenv
h11==0.14.0
# via uvicorn
identify==2.5.35
# via pre-commit
idna==3.7
# via
# -c requirements/requirements.txt
# -c requirements/test-requirements.txt
# anyio
# requests
imagesize==1.4.1
# via sphinx
Expand All @@ -77,8 +92,6 @@ jedi==0.19.1
# via ipython
jinja2==3.1.4
# via sphinx
livereload==2.6.3
# via sphinx-autobuild
markupsafe==2.1.5
# via
# jinja2
Expand All @@ -87,7 +100,7 @@ matplotlib-inline==0.1.6
# via ipython
mccabe==0.7.0
# via pylint
mypy==1.11.0
mypy==1.11.1
# via -r requirements/dev-requirements.in
mypy-extensions==1.0.0
# via mypy
Expand All @@ -108,7 +121,7 @@ platformdirs==4.2.0
# via
# pylint
# virtualenv
pre-commit==3.5.0
pre-commit==3.8.0
# via -r requirements/dev-requirements.in
prompt-toolkit==3.0.43
# via ipython
Expand Down Expand Up @@ -137,21 +150,22 @@ requests==2.32.3
# -c requirements/requirements.txt
# -c requirements/test-requirements.txt
# sphinx
ruff==0.5.4
ruff==0.5.6
# via -r requirements/dev-requirements.in
six==1.16.0
# via
# -c requirements/requirements.txt
# -c requirements/test-requirements.txt
# asttokens
# livereload
sniffio==1.3.1
# via anyio
snowballstemmer==2.2.0
# via sphinx
sphinx==7.1.2
sphinx==8.0.2
# via
# -r requirements/dev-requirements.in
# sphinx-autobuild
sphinx-autobuild==2021.3.14
sphinx-autobuild==2024.4.16
# via -r requirements/dev-requirements.in
sphinxcontrib-applehelp==1.0.4
# via sphinx
Expand All @@ -163,7 +177,7 @@ sphinxcontrib-jsmath==1.0.1
# via sphinx
sphinxcontrib-qthelp==1.0.3
# via sphinx
sphinxcontrib-serializinghtml==1.1.5
sphinxcontrib-serializinghtml==2.0.0
# via sphinx
sqlparse==0.5.1
# via
Expand All @@ -172,6 +186,8 @@ sqlparse==0.5.1
# django-debug-toolbar
stack-data==0.6.3
# via ipython
starlette==0.38.2
# via sphinx-autobuild
tomli==2.0.1
# via
# -c requirements/requirements.txt
Expand All @@ -180,10 +196,9 @@ tomli==2.0.1
# ipdb
# mypy
# pylint
# sphinx
tomlkit==0.12.3
# via pylint
tornado==6.4.1
# via livereload
traitlets==5.14.1
# via
# ipython
Expand All @@ -196,20 +211,28 @@ typing-extensions==4.8.0
# via
# -c requirements/requirements.txt
# -c requirements/test-requirements.txt
# anyio
# asgiref
# astroid
# django-stubs
# django-stubs-ext
# mypy
# uvicorn
urllib3==2.2.2
# via
# -c requirements/requirements.txt
# -c requirements/test-requirements.txt
# requests
uvicorn==0.30.5
# via sphinx-autobuild
virtualenv==20.25.1
# via pre-commit
watchfiles==0.22.0
# via sphinx-autobuild
wcwidth==0.2.13
# via prompt-toolkit
websockets==12.0
# via sphinx-autobuild
werkzeug==3.0.3
# via -r requirements/dev-requirements.in

Expand Down
4 changes: 2 additions & 2 deletions requirements/test-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ coverage[toml]==7.5.2
# pytest-cov
django-coverage-plugin==3.1.0
# via -r requirements/test-requirements.in
django-test-migrations==1.3.0
django-test-migrations==1.4.0
# via -r requirements/test-requirements.in
exceptiongroup==1.2.0
# via pytest
Expand All @@ -42,7 +42,7 @@ packaging==23.2
# pytest-sugar
pluggy==1.5.0
# via pytest
pytest==8.3.1
pytest==8.3.2
# via
# -r requirements/test-requirements.in
# pytest-cov
Expand Down

0 comments on commit 85a39be

Please sign in to comment.