diff --git a/.idea/atdb-ldv.iml b/.idea/atdb-ldv.iml index d73f30cf8f36380161231049866d3ef140477fa1..c5bb47a1a1a1d8c0039b4f576ed3937c8f73ed81 100644 --- a/.idea/atdb-ldv.iml +++ b/.idea/atdb-ldv.iml @@ -2,7 +2,7 @@ <module type="PYTHON_MODULE" version="4"> <component name="NewModuleRootManager"> <content url="file://$MODULE_DIR$" /> - <orderEntry type="jdk" jdkName="Python 3.5 (env_ldv)" jdkType="Python SDK" /> + <orderEntry type="jdk" jdkName="Python 3.7 (atdb-ldv)" jdkType="Python SDK" /> <orderEntry type="sourceFolder" forTests="false" /> </component> <component name="PyDocumentationSettings"> diff --git a/.idea/misc.xml b/.idea/misc.xml index 0d30e0b887d473b88567413a3b8e16651c9ba619..1a05b2d07f9d11e19baeef94a071df4617accd44 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> - <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.5 (env_ldv)" project-jdk-type="Python SDK" /> + <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7 (atdb-ldv)" project-jdk-type="Python SDK" /> <component name="PyCharmProfessionalAdvertiser"> <option name="shown" value="true" /> </component> diff --git a/atdb/Dockerfile b/atdb/Dockerfile index 533285e34ec832b7f586f126fd65715ec08313eb..d82909750244726df4688a39d8636faa4e66e6b5 100644 --- a/atdb/Dockerfile +++ b/atdb/Dockerfile @@ -13,7 +13,7 @@ RUN \ apk --purge del .build-deps # collect static files -RUN exec python manage.py collectstatic --settings=atdb.settings.docker_sdc --noinput +# RUN exec python manage.py collectstatic --settings=atdb.settings.docker_sdc --noinput # run gunicorn CMD exec gunicorn atdb.wsgi_docker_sdc:application --bind 0.0.0.0:8000 --workers 3 diff --git a/atdb/requirements/base.txt b/atdb/requirements/base.txt index 2d095e26bb65262c07ed6997199cf6a0f324b671..1f1472aa4750ac24961049ebd37503988b0883c4 100644 --- a/atdb/requirements/base.txt +++ b/atdb/requirements/base.txt @@ -1,15 +1,9 @@ -certifi==2018.8.13 -chardet==3.0.4 Django==3.1.4 -django-filter==2.0.0 -djangorestframework==3.11.1 -idna==2.7 -Markdown==2.6.11 -psycopg2==2.7.5 -pytz==2018.5 -requests==2.19.1 -urllib3==1.23 -django-cors-headers==2.4.0 -django-extensions==2.1.4 +djangorestframework==3.12.2 +django-filter==2.3.0 +psycopg2==2.8.6 +django-cors-headers==3.6.0 +django-extensions==3.1.0 django-bootstrap-pagination==1.7.0 -whitenoise==5.0.1 \ No newline at end of file +whitenoise==5.0.1 +six==1.15.0 diff --git a/atdb/taskdatabase/views.py b/atdb/taskdatabase/views.py index 0e027fc3620f424942b25ce26af359a50c38cac4..15a3be694255fd765a6a022d4c2a2f44cb3326c9 100644 --- a/atdb/taskdatabase/views.py +++ b/atdb/taskdatabase/views.py @@ -73,7 +73,7 @@ class DataProductFilter(filters.FilterSet): class StatusFilter(filters.FilterSet): # A direct filter on a @property field is not possible, this simulates that behaviour - taskID = filters.Filter(field_name="taskObject__taskID",lookup_expr='exact') + # taskID = filters.Filter(field_name="taskObject__taskID",lookup_expr='exact') class Meta: model = Status @@ -84,7 +84,7 @@ class StatusFilter(filters.FilterSet): 'name': ['exact', 'in'], 'timestamp': ['gt', 'lt', 'gte', 'lte', 'contains', 'exact'], 'taskObject__taskID': ['exact', 'in'], - 'taskID': ['exact', 'in'], + # 'taskID': ['exact', 'in'], #'derived_taskid' : ['exact', 'in'] }