Merge pull request #197 from hubmapconsortium/development

1.6.0 - Shared Workspaces

Author: jpuerto-psc

VERSION

@@ -1 +1 @@
-1.5.0
+1.6.0

docker/Dockerfile

@@ -2,11 +2,13 @@ FROM python:3.10-buster
 WORKDIR /code
 ENV PYTHONUNBUFFERED=1
 COPY requirements/requirements.txt /tmp/
-RUN pip install --upgrade pip
-RUN pip install -r /tmp/requirements.txt
 RUN apt-get update && \
     apt-get install -y sudo && \
     apt-get install -y sssd && \
     apt-get install -y virtualenv && \
     apt-get install -y postgresql-client && \
+    apt-get install -y libsasl2-dev && \
+    apt-get install -y libldap2-dev && \
     rm -rf /var/lib/apt/lists/*
+RUN pip install --upgrade pip
+RUN pip install -r /tmp/requirements.txt

requirements/requirements.txt

@@ -21,7 +21,7 @@ Django==5.1.3
 django-cors-headers==3.13.0
 django-picklefield==3.1
 django-q2==1.7.3
-djangorestframework==3.14.0
+djangorestframework==3.15.2
 Flask==2.2.2
 globus-sdk==3.12.0
 h11==0.14.0
@@ -57,6 +57,7 @@ pyparsing==3.0.9
 pyrsistent==0.18.1
 python-dateutil==2.8.2
 python-dotenv==0.21.0
+python-ldap==3.4.4
 pytz==2022.4
 PyYAML==6.0
 rdflib==6.2.0

src/tests/unittests/test_models.py

@@ -1,6 +1,6 @@
 from django.test import TestCase
 
-from user_workspaces_server.models import Job, Workspace
+from user_workspaces_server.models import Job, SharedWorkspaceMapping, Workspace
 
 
 class WorkspaceModelTests(TestCase):
@@ -16,6 +16,8 @@ def test_get_workspace_dict_fields(self):
             "description",
             "disk_space",
             "datetime_created",
+            "datetime_last_modified",
+            "datetime_last_job_launch",
             "workspace_details",
             "status",
             "default_job_type",
@@ -46,3 +48,16 @@ def test_get_job_dict_fields(self):
             "core_hours",
             "job_details",
         ]
+
+
+class SharedWorkspaceModelTests(TestCase):
+    def test_get_shared_workspace_query_param_fields(self):
+        """Check Workspace query parameters"""
+        assert SharedWorkspaceMapping.get_query_param_fields() == ["is_accepted"]
+
+    def test_get_shared_workspace_dict_fields(self):
+        assert SharedWorkspaceMapping.get_dict_fields() == [
+            "is_accepted",
+            "last_resource_options",
+            "last_job_type",
+        ]