Skip to content

Commit

Permalink
Merge pull request #502 from UW-GAC/combined-prs-branch
Browse files Browse the repository at this point in the history
Combined PRs
  • Loading branch information
amstilp authored Feb 28, 2024
2 parents 2c0d759 + ba2bbe2 commit 9cbb007
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 29 deletions.
6 changes: 3 additions & 3 deletions requirements/dev-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ asgiref==3.7.2
# via
# -c requirements/requirements.txt
# django
astroid==3.0.3
astroid==3.1.0
# via pylint
asttokens==2.4.1
# via stack-data
Expand Down Expand Up @@ -154,7 +154,7 @@ pygments==2.17.2
# via
# ipython
# sphinx
pylint==3.0.3
pylint==3.1.0
# via
# pylint-django
# pylint-plugin-utils
Expand Down Expand Up @@ -246,7 +246,7 @@ urllib3==2.1.0
# -c requirements/requirements.txt
# -c requirements/test-requirements.txt
# requests
virtualenv==20.25.0
virtualenv==20.25.1
# via pre-commit
wcwidth==0.2.13
# via prompt-toolkit
Expand Down
47 changes: 24 additions & 23 deletions requirements/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@
# pip-compile requirements/requirements.in
#
argon2-cffi==23.1.0
# via -r requirements.in
# via -r requirements/requirements.in
argon2-cffi-bindings==21.2.0
# via argon2-cffi
asgiref==3.7.2
# via
# -r requirements.in
# -r requirements/requirements.in
# django
# django-simple-history
backports-zoneinfo==0.2.1
# via django
build==1.0.3
Expand All @@ -20,7 +21,7 @@ cachetools==5.3.2
# via google-auth
certifi==2023.7.22
# via
# -r requirements.in
# -r requirements/requirements.in
# requests
cffi==1.16.0
# via
Expand All @@ -32,15 +33,15 @@ click==8.1.7
# via pip-tools
crispy-bootstrap5==2023.10
# via
# -r requirements.in
# -r requirements/requirements.in
# django-anvil-consortium-manager
cryptography==42.0.4
# via pyjwt
defusedxml==0.7.1
# via python3-openid
django==4.2.10
# via
# -r requirements.in
# -r requirements/requirements.in
# crispy-bootstrap5
# django-allauth
# django-anvil-consortium-manager
Expand All @@ -51,35 +52,35 @@ django==4.2.10
# django-model-utils
# django-tables2
django-allauth==0.54.0
# via -r requirements.in
# via -r requirements/requirements.in
django-anvil-consortium-manager @ git+https://github.com/UW-GAC/[email protected]
# via -r requirements.in
# via -r requirements/requirements.in
django-autocomplete-light==3.9.4
# via django-anvil-consortium-manager
django-crispy-forms==2.1
# via
# -r requirements.in
# -r requirements/requirements.in
# crispy-bootstrap5
# django-anvil-consortium-manager
django-dbbackup==4.1.0
# via -r requirements.in
# via -r requirements/requirements.in
django-environ==0.10.0
# via -r requirements.in
# via -r requirements/requirements.in
django-extensions==3.2.1
# via
# -r requirements.in
# -r requirements/requirements.in
# django-anvil-consortium-manager
django-filter==23.5
# via django-anvil-consortium-manager
django-login-required-middleware==0.9.0
# via -r requirements.in
# via -r requirements/requirements.in
django-maintenance-mode==0.21.1
# via -r requirements.in
# via -r requirements/requirements.in
django-model-utils==4.4.0
# via -r requirements.in
django-simple-history==3.4.0
# via -r requirements/requirements.in
django-simple-history==3.5.0
# via
# -r requirements.in
# -r requirements/requirements.in
# django-anvil-consortium-manager
django-tables2==2.7.0
# via django-anvil-consortium-manager
Expand All @@ -94,21 +95,21 @@ idna==3.6
importlib-metadata==6.8.0
# via build
mysqlclient==2.2.4
# via -r requirements.in
# via -r requirements/requirements.in
networkx==3.1
# via django-anvil-consortium-manager
numpy==1.24.4
# via django-anvil-consortium-manager
oauthlib==3.2.2
# via
# -r requirements.in
# -r requirements/requirements.in
# requests-oauthlib
packaging==23.2
# via
# build
# plotly
pip-tools==7.4.0
# via -r requirements.in
# via -r requirements/requirements.in
plotly==5.19.0
# via django-anvil-consortium-manager
pyasn1==0.4.8
Expand All @@ -121,7 +122,7 @@ pycparser==2.21
# via cffi
pyjwt[crypto]==2.8.0
# via
# -r requirements.in
# -r requirements/requirements.in
# django-allauth
pyproject-hooks==1.0.0
# via
Expand Down Expand Up @@ -149,7 +150,7 @@ six==1.16.0
# google-auth
sqlparse==0.4.4
# via
# -r requirements.in
# -r requirements/requirements.in
# django
tenacity==8.2.3
# via plotly
Expand All @@ -162,12 +163,12 @@ typing-extensions==4.8.0
# via asgiref
urllib3==2.1.0
# via
# -r requirements.in
# -r requirements/requirements.in
# requests
wheel==0.42.0
# via pip-tools
whitenoise==6.6.0
# via -r requirements.in
# via -r requirements/requirements.in
zipp==3.17.0
# via importlib-metadata

Expand Down
6 changes: 3 additions & 3 deletions requirements/test-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ charset-normalizer==3.3.2
# via
# -c requirements/requirements.txt
# requests
coverage==7.4.1
coverage==7.4.3
# via
# -r requirements/test-requirements.in
# django-coverage-plugin
Expand All @@ -39,7 +39,7 @@ packaging==23.2
# pytest-sugar
pluggy==1.4.0
# via pytest
pytest==8.0.1
pytest==8.0.2
# via
# -r requirements/test-requirements.in
# pytest-django
Expand All @@ -56,7 +56,7 @@ requests==2.31.0
# via
# -c requirements/requirements.txt
# responses
responses==0.24.1
responses==0.25.0
# via -r requirements/test-requirements.in
six==1.16.0
# via
Expand Down

0 comments on commit 9cbb007

Please sign in to comment.