Skip to content
Snippets Groups Projects
Commit d8118470 authored by Nico Vermaas's avatar Nico Vermaas
Browse files

to Django 3.1.4

parent b5c82b22
Branches
No related tags found
No related merge requests found
Pipeline #7014 passed
......@@ -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">
......
<?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>
......
......@@ -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
......
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
six==1.15.0
......@@ -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']
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment