Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Docker success *if detatched*
  • Loading branch information
CBroz1 committed May 23, 2022
commit 39d252d607252152e3db5646d90d204144e7ff9e
2 changes: 1 addition & 1 deletion docker/Dockerfile.test
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ WORKDIR /main
RUN git clone --branch master https://github.com/kabilar/CaImAn
WORKDIR /main/CaImAn
RUN conda install -n base -c conda-forge -y mamba
RUN /bin/bash -c 'mamba env update --n base --file environment.yml'
RUN /bin/bash -c 'mamba env update --n base --file environment-minimal.yml'
RUN pip install .
RUN python caimanmanager.py install --inplace

Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose-test.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# docker-compose -f ./docker/docker-compose-test.yaml up --build --force-recreate --detach
# docker-compose -f ./docker/docker-compose-test.yaml up --build --force-recreate
# docker-compose -f ./docker/docker-compose-test.yaml down --volumes

version: "2.4"
Expand Down
6 changes: 5 additions & 1 deletion tests/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,11 @@ def caiman2D_paramset(pipeline):
yield params_caiman_2d

if _tear_down:
(miniscope.ProcessingParamSet & 'paramset_id = 0').delete()
if verbose:
(miniscope.ProcessingParamSet & 'paramset_id = 0').delete()
else:
with QuietStdOut():
(miniscope.ProcessingParamSet & 'paramset_id = 0').delete()


@pytest.fixture
Expand Down