Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OED fixes for platform2 #744

Merged
merged 10 commits into from
Feb 3, 2023
Merged

OED fixes for platform2 #744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
689b5e7
fix loading location data in worker
sambles Feb 3, 2023
02ce031
replace package updates
sambles Feb 3, 2023
ef5ddcd
Update server - python requ and ods-tools>3.0.1
sambles Feb 3, 2023
8454ed0
Added OED validation on file upload, and updated ods-tools package to…
sambles Jan 30, 2023
c1cbce7
Add migrations + fix swagger schema
sambles Feb 3, 2023
c9d108f
Fix pep8 and flake issues
sambles Feb 3, 2023
c3b7047
Fix issues with merge
sambles Feb 3, 2023
0d7e611
flake8
sambles Feb 3, 2023
1ac628b
Fix location file loading for oasislmf==1.27
sambles Feb 3, 2023
d4db3ad
Fix
sambles Feb 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
151 changes: 78 additions & 73 deletions requirements-server.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,52 +1,56 @@
#
# This file is autogenerated by pip-compile with python 3.9
# To update, run:
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
# pip-compile requirements-server.in
#
aioredis==1.3.1
# via channels-redis
amqp==5.1.0
amqp==5.1.1
# via kombu
asgiref==3.4.1
asgiref==3.6.0
# via
# channels
# channels-redis
# daphne
# django
async-timeout==3.0.1
# via aioredis
attrs==21.2.0
async-timeout==4.0.2
# via
# aioredis
# redis
attrs==22.2.0
# via
# automat
# jsonschema
# service-identity
# twisted
autobahn==21.3.1
autobahn==23.1.1
# via daphne
automat==20.2.0
automat==22.10.0
# via twisted
azure-core==1.26.0
# via azure-storage-blob
azure-storage-blob==12.13.1
azure-core==1.26.3
# via
# azure-storage-blob
# msrest
azure-storage-blob==12.14.1
# via django-storages
billiard==3.6.4.0
# via celery
boto3==1.18.48
boto3==1.26.63
# via -r requirements-server.in
botocore==1.21.48
botocore==1.29.63
# via
# boto3
# s3transfer
celery==5.2.7
# via
# -r requirements-server.in
# django-celery-results
certifi==2021.5.30
certifi==2022.12.7
# via
# msrest
# requests
cffi==1.15.0
cffi==1.15.1
# via cryptography
chainmap==1.0.3
# via -r requirements-server.in
Expand All @@ -56,15 +60,17 @@ channels==2.4.0
# channels-redis
channels-redis==2.4.2
# via -r requirements-server.in
charset-normalizer==2.0.6
chardet==5.1.0
# via ods-tools
charset-normalizer==3.0.1
# via requests
click==8.1.3
# via
# celery
# click-didyoumean
# click-plugins
# click-repl
click-didyoumean==0.0.3
click-didyoumean==0.3.0
# via celery
click-plugins==1.1.1
# via celery
Expand All @@ -80,7 +86,7 @@ coreschema==0.0.4
# via
# coreapi
# drf-yasg
cryptography==3.4.8
cryptography==39.0.0
# via
# autobahn
# azure-storage-blob
Expand All @@ -90,7 +96,7 @@ cryptography==3.4.8
# service-identity
daphne==2.5.0
# via channels
django==3.2.16
django==3.2.17
# via
# channels
# django-debug-toolbar
Expand All @@ -105,100 +111,102 @@ django==3.2.16
# mozilla-django-oidc
django-celery-results==2.4.0
# via -r requirements-server.in
django-cleanup==5.2.0
django-cleanup==6.0.0
# via -r requirements-server.in
django-debug-toolbar==3.2.2
django-debug-toolbar==3.8.1
# via -r requirements-server.in
django-filter==21.1
django-filter==22.1
# via -r requirements-server.in
django-model-utils==4.1.1
django-model-utils==4.3.1
# via -r requirements-server.in
django-request-logging==0.7.5
# via -r requirements-server.in
django-storages[azure]==1.12.3
django-storages[azure]==1.13.2
# via -r requirements-server.in
djangorestframework==3.12.4
djangorestframework==3.14.0
# via
# -r requirements-server.in
# djangorestframework-simplejwt
# drf-nested-routers
# drf-yasg
djangorestframework-simplejwt==4.8.0
djangorestframework-simplejwt==5.2.2
# via -r requirements-server.in
drf-nested-routers==0.93.4
# via -r requirements-server.in
drf-yasg==1.21.4
# via -r requirements-server.in
greenlet==1.1.2
greenlet==2.0.2
# via sqlalchemy
gunicorn==20.1.0
# via -r requirements-server.in
hiredis==2.0.0
hiredis==2.2.1
# via aioredis
httplib2==0.19.1
httplib2==0.21.0
# via pyrabbit
hyperlink==21.0.0
# via
# autobahn
# twisted
idna==3.2
idna==3.4
# via
# hyperlink
# requests
# twisted
incremental==21.3.0
incremental==22.10.0
# via twisted
inflection==0.5.1
# via drf-yasg
isodate==0.6.1
# via msrest
itypes==1.2.0
# via coreapi
jinja2==3.0.1
jinja2==3.1.2
# via coreschema
jmespath==0.10.0
jmespath==1.0.1
# via
# boto3
# botocore
joblib==1.2.0
# via -r requirements-server.in
josepy==1.9.0
josepy==1.13.0
# via mozilla-django-oidc
jsonpickle==2.0.0
jsonpickle==3.0.1
# via -r requirements-server.in
jsonschema==3.2.0
jsonschema==4.17.3
# via -r requirements-server.in
kombu==5.2.4
# via celery
markdown==3.3.4
markdown==3.4.1
# via -r requirements-server.in
markupsafe==2.0.1
markupsafe==2.1.2
# via jinja2
mozilla-django-oidc==2.0.0
mozilla-django-oidc==3.0.0
# via -r requirements-server.in
msgpack==0.6.2
# via channels-redis
msrest==0.6.21
msrest==0.7.1
# via azure-storage-blob
numpy==1.23.3
numpy==1.24.1
# via
# pandas
# pyarrow
oauthlib==3.2.1
oauthlib==3.2.2
# via requests-oauthlib
ods-tools==2.3.2
ods-tools==3.0.1
# via -r requirements-server.in
packaging==21.0
packaging==23.0
# via drf-yasg
pandas==1.5.0
# via -r requirements-server.in
pandas==1.5.3
# via
# -r requirements-server.in
# ods-tools
pathlib2==2.3.7.post1
# via -r requirements-server.in
prompt-toolkit==3.0.20
prompt-toolkit==3.0.36
# via click-repl
psycopg2-binary==2.9.4
psycopg2-binary==2.9.5
# via -r requirements-server.in
pyarrow==8.0.0
pyarrow==11.0.0
# via -r requirements-server.in
pyasn1==0.4.8
# via
Expand All @@ -208,35 +216,34 @@ pyasn1-modules==0.2.8
# via service-identity
pycparser==2.21
# via cffi
pyjwt==2.4.0
pyjwt==2.6.0
# via djangorestframework-simplejwt
pymysql==1.0.2
# via -r requirements-server.in
pyopenssl==20.0.1
pyopenssl==23.0.0
# via
# josepy
# twisted
pyparsing==2.4.7
# via
# httplib2
# packaging
pyparsing==3.0.9
# via httplib2
pyrabbit==1.1.0
# via -r requirements-server.in
pyrsistent==0.18.0
pyrsistent==0.19.3
# via jsonschema
python-dateutil==2.8.2
# via
# botocore
# pandas
pytz==2022.4
pytz==2022.7.1
# via
# celery
# django
# djangorestframework
# drf-yasg
# pandas
redis==3.5.3
redis==4.4.2
# via -r requirements-server.in
requests==2.26.0
requests==2.28.2
# via
# azure-core
# coreapi
Expand All @@ -247,9 +254,9 @@ requests-oauthlib==1.3.1
# via msrest
ruamel-yaml==0.17.21
# via drf-yasg
ruamel-yaml-clib==0.2.6
ruamel-yaml-clib==0.2.7
# via ruamel-yaml
s3transfer==0.5.0
s3transfer==0.6.0
# via boto3
service-identity==21.1.0
# via twisted
Expand All @@ -259,30 +266,28 @@ six==1.16.0
# azure-core
# click-repl
# isodate
# jsonschema
# pathlib2
# pyopenssl
# python-dateutil
# service-identity
sqlalchemy==1.4.41
sqlalchemy==1.4.46
# via -r requirements-server.in
sqlparse==0.4.2
sqlparse==0.4.3
# via
# django
# django-debug-toolbar
twisted[tls]==22.4.0
twisted[tls]==22.10.0
# via daphne
txaio==21.2.1
txaio==23.1.1
# via autobahn
typing-extensions==4.4.0
# via
# azure-core
# twisted
uritemplate==3.0.1
uritemplate==4.1.1
# via
# coreapi
# drf-yasg
urllib3==1.26.7
urllib3==1.26.14
# via
# botocore
# requests
Expand All @@ -291,11 +296,11 @@ vine==5.0.0
# amqp
# celery
# kombu
wcwidth==0.2.5
wcwidth==0.2.6
# via prompt-toolkit
whitenoise==5.3.0
whitenoise==6.3.0
# via -r requirements-server.in
zope-interface==5.4.0
zope-interface==5.5.2
# via twisted

# The following packages are considered to be unsafe in a requirements file:
Expand Down
Loading