WIP docker edits

CHANGELOG.md

@@ -0,0 +1,8 @@
+# Changelog
+
+Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and 
+[Keep a Changelog](https://keepachangelog.com/en/1.0.0/) convention.
+
+## [0.1.0] - 2021-05-04
+### Added
++ Added version

docker/Dockerfile.test

@@ -31,28 +31,29 @@ WORKDIR /main
 RUN mkdir /main/element-lab \
           /main/element-animal \
           /main/element-session \
+          /main/element-event \
           /main/element-interface \
           /main/element-miniscope \
           /main/workflow-miniscope
 
 COPY --chown=anaconda:anaconda ./element-lab /main/element-lab
 COPY --chown=anaconda:anaconda ./element-animal /main/element-animal
 COPY --chown=anaconda:anaconda ./element-session /main/element-session
+COPY --chown=anaconda:anaconda ./element-event /main/element-event
 COPY --chown=anaconda:anaconda ./element-interface /main/element-interface
 COPY --chown=anaconda:anaconda ./element-miniscope /main/element-miniscope
 COPY --chown=anaconda:anaconda ./workflow-miniscope /main/workflow-miniscope
 
 RUN pip install -e /main/element-lab
 RUN pip install -e /main/element-animal
 RUN pip install -e /main/element-session
+RUN pip install -e /main/element-event
 RUN pip install -e /main/element-interface
 RUN pip install -e /main/element-miniscope
-RUN rm -f /main/workflow-miniscope/dj_local_conf.json
+# RUN rm -f /main/workflow-miniscope/dj_local_conf.json
 
 # Install the workflow
 RUN pip install /main/workflow-miniscope
 RUN pip install -r /main/workflow-miniscope/requirements_test.txt
 
-RUN pip uninstall datajoint
-RUN pip install git+
 WORKDIR /main/workflow-miniscope

docker/apt_requirements.txt

@@ -5,4 +5,4 @@ ffmpeg
 libsm6
 libxext6
 libhdf5-dev
-pkg-config
+pkg-config

docker/docker-compose-test.yaml

@@ -17,7 +17,7 @@ services:
     build:
       context: ../../
       dockerfile: ./workflow-miniscope/docker/Dockerfile.test
-    env_file: .env
+    env_file: .env # TEST_DATA_DIR
     image: workflow-miniscope-test:0.1.0
     container_name: workflow-miniscope-test
     environment:
@@ -39,11 +39,12 @@ services:
       - ../../element-lab:/main/element-lab
       - ../../element-animal:/main/element-animal
       - ../../element-session:/main/element-session
+      - ../../element-event:/main/element-event
       - ../../element-interface:/main/element-interface
       - ../../element-miniscope:/main/element-miniscope
       - ..:/main/workflow-miniscope
     depends_on:
       db:
         condition: service_healthy
 networks:
-  main:
+  main:

tests/__init__.py

@@ -17,7 +17,7 @@
 
 # ------------------- SOME CONSTANTS -------------------
 
-_tear_down = False
+_tear_down = True
 verbose = False
 
 test_user_data_dir = pathlib.Path('./tests/user_data')

tests/test_ingest.py

@@ -36,7 +36,7 @@ def test_paramset_insert(caiman2D_paramset, pipeline):
     miniscope = pipeline['miniscope']
     from element_interface.utils import dict_to_uuid
 
-    method, desc, paramset_hash = (miniscope.ProcessingParamSet & {'paramset_idx': 1}
+    method, desc, paramset_hash = (miniscope.ProcessingParamSet & {'paramset_idx': 0}
                                    ).fetch1('processing_method', 'paramset_desc',
                                             'param_set_hash')
     assert method == 'caiman'