Skip to content

Commit

Permalink
Merge branch 'master' into redux-toolkit-mergedups
Browse files Browse the repository at this point in the history
  • Loading branch information
jmgrady authored Oct 23, 2023
2 parents 0228bdc + 2459886 commit 6c2b208
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 30 deletions.
10 changes: 5 additions & 5 deletions deploy/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
#
# pip-compile requirements.in
#
ansible==8.4.0
ansible==8.5.0
# via -r requirements.in
ansible-core==2.15.4
ansible-core==2.15.5
# via ansible
cachetools==5.3.1
# via google-auth
Expand All @@ -16,13 +16,13 @@ certifi==2023.7.22
# requests
cffi==1.16.0
# via cryptography
charset-normalizer==3.3.0
charset-normalizer==3.3.1
# via requests
cryptography==41.0.4
# via
# ansible-core
# pyopenssl
google-auth==2.23.2
google-auth==2.23.3
# via kubernetes
idna==3.4
# via requests
Expand Down Expand Up @@ -74,7 +74,7 @@ six==1.16.0
# via
# kubernetes
# python-dateutil
urllib3==1.26.17
urllib3==1.26.18
# via
# kubernetes
# requests
Expand Down
38 changes: 21 additions & 17 deletions dev-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.11
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
# pip-compile dev-requirements.in
Expand All @@ -12,7 +12,7 @@ babel==2.13.0
# via mkdocs-material
beautifulsoup4==4.12.2
# via mkdocs-htmlproofer-plugin
black==23.9.1
black==23.10.0
# via -r dev-requirements.in
cachetools==5.3.1
# via
Expand All @@ -26,7 +26,7 @@ cffi==1.16.0
# via cryptography
chardet==5.2.0
# via tox
charset-normalizer==3.3.0
charset-normalizer==3.3.1
# via requests
click==8.1.7
# via
Expand All @@ -35,8 +35,6 @@ click==8.1.7
colorama==0.4.6
# via
# -r dev-requirements.in
# click
# mkdocs
# mkdocs-material
# tox
cryptography==41.0.4
Expand Down Expand Up @@ -110,13 +108,13 @@ mkdocs==1.5.3
# mkdocs-static-i18n
mkdocs-htmlproofer-plugin==1.0.0
# via -r dev-requirements.in
mkdocs-material==9.4.5
mkdocs-material==9.4.6
# via -r dev-requirements.in
mkdocs-material-extensions==1.2
mkdocs-material-extensions==1.3
# via mkdocs-material
mkdocs-static-i18n==1.1.0
mkdocs-static-i18n==1.1.1
# via -r dev-requirements.in
mypy==1.6.0
mypy==1.6.1
# via -r dev-requirements.in
mypy-extensions==1.0.0
# via
Expand Down Expand Up @@ -154,15 +152,15 @@ pyasn1==0.5.0
# rsa
pyasn1-modules==0.3.0
# via google-auth
pycodestyle==2.11.0
pycodestyle==2.11.1
# via flake8
pycparser==2.21
# via cffi
pyflakes==3.1.0
# via flake8
pygments==2.16.1
# via mkdocs-material
pymdown-extensions==10.3
pymdown-extensions==10.3.1
# via mkdocs-material
pymongo==4.5.0
# via -r dev-requirements.in
Expand All @@ -171,9 +169,7 @@ pyopenssl==23.2.0
pyproject-api==1.6.1
# via tox
pyreadline3==3.4.1
# via
# -r dev-requirements.in
# humanfriendly
# via -r dev-requirements.in
python-dateutil==2.8.2
# via
# ghp-import
Expand Down Expand Up @@ -205,6 +201,12 @@ six==1.16.0
# python-dateutil
soupsieve==2.5
# via beautifulsoup4
tomli==2.0.1
# via
# black
# mypy
# pyproject-api
# tox
tox==4.11.3
# via -r dev-requirements.in
types-pyopenssl==23.2.0.2
Expand All @@ -213,11 +215,13 @@ types-python-dateutil==2.8.19.14
# via -r dev-requirements.in
types-pyyaml==6.0.12.12
# via -r dev-requirements.in
types-requests==2.31.0.8
types-requests==2.31.0.10
# via -r dev-requirements.in
typing-extensions==4.8.0
# via mypy
urllib3==2.0.6
# via
# black
# mypy
urllib3==2.0.7
# via
# kubernetes
# requests
Expand Down
6 changes: 3 additions & 3 deletions maintenance/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ certifi==2023.7.22
# requests
cffi==1.16.0
# via cryptography
charset-normalizer==3.3.0
charset-normalizer==3.3.1
# via requests
cryptography==41.0.4
# via pyopenssl
dnspython==2.4.2
# via pymongo
google-auth==2.23.2
google-auth==2.23.3
# via kubernetes
humanfriendly==10.0
# via -r requirements.in
Expand Down Expand Up @@ -58,7 +58,7 @@ six==1.16.0
# via
# kubernetes
# python-dateutil
urllib3==1.26.17
urllib3==1.26.18
# via
# kubernetes
# requests
Expand Down
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"react-beautiful-dnd": "^13.1.1",
"react-chartjs-2": "^5.2.0",
"react-dom": "^17.0.2",
"react-i18next": "^13.2.2",
"react-i18next": "^13.3.1",
"react-modal": "^3.16.1",
"react-redux": "^8.1.3",
"react-router-dom": "^6.16.0",
Expand Down

0 comments on commit 6c2b208

Please sign in to comment.