Skip to content

Commit

Permalink
Merge branch 'master' of github.com:mwallschlaeger/geonode into issue…
Browse files Browse the repository at this point in the history
…_#12167_providing_multiple_openid_connect_django_allauth_socialproviders_fails_when_loading_login_page
  • Loading branch information
mwallschlaeger committed Apr 24, 2024
2 parents e4c6364 + 3d6ab6e commit 6f5a2ca
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 14 deletions.
15 changes: 8 additions & 7 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ urllib3==1.26.18
Paver==1.3.4
python-slugify==8.0.4
decorator==5.1.1
celery==5.3.6
kombu==5.3.6
celery==5.4.0
kombu==5.3.7
vine==5.1.0
tqdm==4.66.2
Deprecated==1.2.14
Expand All @@ -25,7 +25,7 @@ zipstream-new==1.1.8
schema==0.7.5
rdflib==6.3.2
smart_open==7.0.4
PyMuPDF==1.24.1
PyMuPDF==1.24.2

# Django Apps
django-allauth==0.61.1
Expand Down Expand Up @@ -106,7 +106,7 @@ django-storages==1.14.2
dropbox==11.36.2
google-cloud-storage==2.16.0
google-cloud-core==2.4.1
boto3==1.34.79
boto3==1.34.88

# Django Caches
whitenoise==6.6.0
Expand All @@ -130,13 +130,13 @@ django-cors-headers==4.3.1
user-agents
django-user-agents
xmljson
django-ipware<6.1
django-ipware<7.1
# no version here, use latest one with fresh data
pycountry

# production
uWSGI==2.0.25
gunicorn==21.2.0
uWSGI==2.0.25.1
gunicorn==22.0.0
ipython==8.23.0
docker==7.0.0
invoke==2.2.0
Expand Down Expand Up @@ -172,3 +172,4 @@ cryptography>=41.0.0 # not directly required, pinned by Snyk to avoid a vulnerab
aiohttp>=3.9.0 # not directly required, pinned by Snyk to avoid a vulnerability
dnspython>=2.6.0rc1 # not directly required, pinned by Snyk to avoid a vulnerability
nh3==0.2.17
sqlparse>=0.5.0 # not directly required, pinned by Snyk to avoid a vulnerability
15 changes: 8 additions & 7 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ install_requires =
Paver==1.3.4
python-slugify==8.0.4
decorator==5.1.1
celery==5.3.6
kombu==5.3.6
celery==5.4.0
kombu==5.3.7
vine==5.1.0
tqdm==4.66.2
Deprecated==1.2.14
Expand All @@ -51,7 +51,7 @@ install_requires =
schema==0.7.5
rdflib==6.3.2
smart_open==7.0.4
PyMuPDF==1.24.1
PyMuPDF==1.24.2

# Django Apps
django-allauth==0.61.1
Expand Down Expand Up @@ -131,7 +131,7 @@ install_requires =
dropbox==11.36.2
google-cloud-storage==2.16.0
google-cloud-core==2.4.1
boto3==1.34.79
boto3==1.34.88

# Django Caches
whitenoise==6.6.0
Expand All @@ -155,13 +155,13 @@ install_requires =
user-agents
django-user-agents
xmljson
django-ipware<6.1
django-ipware<7.1
# no version here, use latest one with fresh data
pycountry

# production
uWSGI==2.0.25
gunicorn==21.2.0
uWSGI==2.0.25.1
gunicorn==22.0.0
ipython==8.23.0
docker==7.0.0
invoke==2.2.0
Expand Down Expand Up @@ -197,6 +197,7 @@ install_requires =
aiohttp>=3.9.0 # not directly required, pinned by Snyk to avoid a vulnerability
dnspython>=2.6.0rc1 # not directly required, pinned by Snyk to avoid a vulnerability
nh3==0.2.17
sqlparse>=0.5.0 # not directly required, pinned by Snyk to avoid a vulnerability

[options.packages.find]
exclude = tests
Expand Down

0 comments on commit 6f5a2ca

Please sign in to comment.