Skip to content

Commit

Permalink
Merge pull request #693 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 724d824 + 809c0b6 commit 345964f
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 12 deletions.
40 changes: 31 additions & 9 deletions requirements/dev-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
#
alabaster==0.7.13
# via sphinx
anyio==4.4.0
# via
# starlette
# watchfiles
asgiref==3.7.2
# via
# -c requirements/requirements.txt
Expand All @@ -28,6 +32,10 @@ charset-normalizer==3.3.2
# -c requirements/requirements.txt
# -c requirements/test-requirements.txt
# requests
click==8.1.3
# via
# -c requirements/requirements.txt
# uvicorn
colorama==0.4.6
# via sphinx-autobuild
decorator==5.1.1
Expand All @@ -50,16 +58,23 @@ django-stubs-ext==4.2.7
# 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.34
# 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 @@ -71,15 +86,13 @@ 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
# werkzeug
matplotlib-inline==0.1.6
# via ipython
mypy==1.11.0
mypy==1.11.1
# via -r requirements/dev-requirements.in
mypy-extensions==1.0.0
# via mypy
Expand All @@ -98,7 +111,7 @@ pickleshare==0.7.5
# via ipython
platformdirs==4.1.0
# via 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 All @@ -124,21 +137,22 @@ requests==2.32.3
# -c requirements/requirements.txt
# -c requirements/test-requirements.txt
# sphinx
ruff==0.5.5
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
# 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 @@ -159,15 +173,15 @@ 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
# -c requirements/test-requirements.txt
# django-stubs
# ipdb
# mypy
tornado==6.4.1
# via livereload
traitlets==5.14.1
# via
# ipython
Expand All @@ -182,20 +196,28 @@ typing-extensions==4.8.0
# via
# -c requirements/requirements.txt
# -c requirements/test-requirements.txt
# anyio
# asgiref
# django-stubs
# django-stubs-ext
# mypy
# uvicorn
urllib3==2.2.2
# via
# -c requirements/requirements.txt
# -c requirements/test-requirements.txt
# requests
# types-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/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ google-auth==2.28.1
# via django-anvil-consortium-manager
idna==3.7
# via requests
jsonapi-requests==0.7.0
jsonapi-requests==0.8.0
# via -r requirements/requirements.in
jsonschema==4.23.0
# via -r requirements/requirements.in
Expand All @@ -131,7 +131,7 @@ packaging==21.3
# via
# build
# plotly
pandas==2.0.3
pandas==2.2.2
# via -r requirements/requirements.in
pip-tools==7.4.1
# via -r requirements/requirements.in
Expand Down
2 changes: 1 addition & 1 deletion requirements/test-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ coverage[toml]==7.5.1
# 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 Down

0 comments on commit 345964f

Please sign in to comment.