Skip to content
This repository was archived by the owner on Jan 21, 2026. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
be9576b
Fixed link formatting, adding parens
CBroz1 Oct 27, 2021
19cd362
Merge branch 'datajoint:main' into patch-1
CBroz1 Nov 30, 2021
2559e83
Merge PR, minor alt branch formatting edits
CBroz1 Nov 30, 2021
bfa2bc1
initial commit migrate wf-anim->wf-sess
CBroz1 Dec 1, 2021
8ab4908
partial revision, fake data, ingest functs
CBroz1 Dec 1, 2021
6cbecd3
Adding NB for export example
CBroz1 Dec 1, 2021
544db35
more detail in NB output
CBroz1 Dec 1, 2021
7fc3a3a
Update to reflect sess not depend on lab
CBroz1 Dec 6, 2021
cb59750
update readme/diagrams, add activate(genotyping)
CBroz1 Dec 14, 2021
fd6ff4f
fixing readme typos
CBroz1 Dec 16, 2021
7688006
start integration test add, WIP
CBroz1 Dec 23, 2021
c73dcf6
coverage tests: ingest & pipeline
CBroz1 Dec 23, 2021
fb0f7b1
remove pynwb version fix
CBroz1 Dec 23, 2021
c76a6dd
Remove notes file
CBroz1 Dec 23, 2021
0a30e46
reverting folder name before gitmv; for git comparisons
CBroz1 Dec 28, 2021
c676788
folder rename w/gitmv; for git comparisons
CBroz1 Dec 28, 2021
f02a8d9
rm numpy/pandas; PEP8 full eng words
CBroz1 Dec 30, 2021
ffda577
PEP8 E501,F401; Diagram aspect ration & new tables
CBroz1 Dec 30, 2021
13e73fe
Update README subject->experiment subject
CBroz1 Dec 30, 2021
3cea936
minor: remove redundant import
CBroz1 Dec 30, 2021
0e4a3d9
Merge branch, resolve conflict
CBroz1 Jan 3, 2022
e55af5b
Fixed link formatting, adding parens
CBroz1 Oct 27, 2021
beaa591
Adding NB for export example
CBroz1 Dec 1, 2021
4b4b3a6
merging branch conflicts
CBroz1 Jan 3, 2022
3bd08af
Merge branch 'main' of https://github.com/CBroz1/workflow-session
CBroz1 Jan 3, 2022
7fffc41
Minor; resolve conflicts, same notebooks
CBroz1 Jan 3, 2022
292a692
remove old diagrams, update README links
CBroz1 Jan 8, 2022
2005243
Removed lab.Project refs to slices, viruses, etc. - see details
CBroz1 Jan 11, 2022
2ac483a
Removed lab.Project refs to slices, etc. from integration test
CBroz1 Jan 11, 2022
836390e
Version. Update CHANGELOG. notebook: remove specifics
CBroz1 Jan 13, 2022
6147795
Docker integration test successful. See details.
CBroz1 Jan 22, 2022
2966000
Remove diagrams, link to elements in readme
CBroz1 Jan 25, 2022
ab50c0c
Apply suggestions from @kabilar's code review
CBroz1 Jan 28, 2022
ac52192
pin requirements
CBroz1 Jan 28, 2022
d851649
Move diagrams to element. Revise table names per elem-lab change
CBroz1 Jan 28, 2022
c7ae137
add integration tests for Subject part tables
CBroz1 Feb 3, 2022
32df6bc
Fix coverage output, Add verbosity option. See details
CBroz1 Feb 3, 2022
3409ded
Apply suggestions from code review
CBroz1 Feb 28, 2022
9b613b0
rename apt_requirements.txt
CBroz1 Feb 28, 2022
c48bdf6
rename apt_requirements
CBroz1 Feb 28, 2022
38749c1
rename typo
CBroz1 Feb 28, 2022
223d8b9
Apply suggestions from code review
CBroz1 Mar 1, 2022
ab6720e
Apply suggestions from code review: revise import formatting
CBroz1 Mar 1, 2022
51e3f7a
Apply suggestions from code review: activate genotyping shema
CBroz1 Mar 1, 2022
c10c702
Apply suggestions from code review
CBroz1 Mar 3, 2022
18f5a19
Apply suggestions from code review
CBroz1 Mar 3, 2022
4542ed5
Apply all suggestions from code review
CBroz1 Mar 4, 2022
a471eaf
Apply suggestions from code review
CBroz1 Mar 7, 2022
8d1654e
Apply suggestions from code review
CBroz1 Mar 7, 2022
f79f3e4
Apply suggestions from code review
CBroz1 Mar 7, 2022
967502d
Update notebooks/1_Explore_Workflow.ipynb
CBroz1 Mar 7, 2022
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
105 changes: 30 additions & 75 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,119 +1,74 @@
# vscode
Comment thread
CBroz1 marked this conversation as resolved.
.vscode

# User data
.DS_Store

# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
# Distribution, packaging, PyInstaller
.Python
env/
build/
develop-eggs/
dist/
*egg*/
*dist/
downloads/
eggs/
.eggs/
lib/
lib64/
lib*/
parts/
sdist/
var/
wheels/
*.egg-info/
.installed.cfg
*.egg
.idea/

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt
pip-*.txt

# Unit test / coverage reports
htmlcov/
.tox/
.coverage
.coverage.*
*.cov*
.cache
nosetests.xml
coverage.xml
*.cover
.hypothesis/
.pytest_cache/
docker-compose.y*ml

# Translations
# C extension, Translations
# editors: vscode, emacs, Mac
*.so
*.mo
*.pot
.vscode
**/*~
**/#*#
**/.#*
.DS_Store

# Django stuff:
# Django, Flask, Scrapy, Sphinx, mkdocs
# PyBuilder, Jupyter, SageMath, celery beat
*.log
local_settings.py

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy
scratchpaper.*

# Sphinx documentation
docs/_build/

# PyBuilder
/site
target/

# Jupyter Notebook
.ipynb_checkpoints

# pyenv
.python-version

# celery beat schedule file
.*checkpoints
celerybeat-schedule

# SageMath parsed files
*.sage.py

# dotenv
./.env

# virtualenv
.venv
# dotenv, virtualenv, pyenv, mypy
.*env
venv/
ENV/

# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
/site

# mypy
.python-version
.mypy_cache/

# datajoint
dj_local_conf.json
dj_local_conf_old.json
# Spyder/Rope project settings
.spy*project
.ropeproject

# emacs
**/*~
**/#*#
**/.#*
docker-compose.yml
# datajoint, notes, nwb export
dj_local_c*.json
temp*
*nwb
24 changes: 24 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# 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.0.0b2
### Added
+ Integration tests

### Changed
+ Name `workflow-animal` -> `workflow-session`


## [0.0.0b1] - 2021-03-24
### Added
+ First beta release


## [0.0.0a1] - 2021-03-18
### Added
+ Added notebooks

[0.0.0b1]: https://github.com/datajoint/workflow-session/tree/f6d6a3353aae83ca13ff9fcc536017eb34c18f90
[0.0.0a1]: https://github.com/datajoint/workflow-session/tree/0d3d3c970056ff4c243d17cf4f738f48268d80ad
3 changes: 3 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Contribution Guidelines

This project follows the [DataJoint Contribution Guidelines](https://docs.datajoint.org/python/community/02-Contribute.html). Please reference the link for more full details.
28 changes: 28 additions & 0 deletions Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
FROM datajoint/djlab:py3.8-debian

USER anaconda:anaconda
Comment thread
CBroz1 marked this conversation as resolved.

COPY ./workflow-session/apt_requirements.txt /tmp/
RUN /entrypoint.sh echo "Installed dependencies."

RUN mkdir /main/element-lab \
/main/element-animal \
/main/element-session \
/main/workflow-session

# Copy user's local fork of elements and workflow
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 ./workflow-session /main/workflow-session

# Install packages
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/workflow-session
RUN pip install -r /main/workflow-session/requirements_test.txt

WORKDIR /main/workflow-session

ENTRYPOINT ["tail", "-f", "/dev/null"]
34 changes: 34 additions & 0 deletions Dockerfile.test
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
FROM datajoint/djlab:py3.8-debian

USER anaconda:anaconda
Comment thread
CBroz1 marked this conversation as resolved.

COPY ./workflow-session/apt_requirements.txt /tmp/
RUN /entrypoint.sh echo "Installed dependencies."
WORKDIR /main/workflow-session

# Option 1 - Install DataJoint's remote fork of the workflow and elements
# RUN git clone https://github.com/datajoint/workflow-session.git /main/

# Option 2 - Install user's remote fork of element and workflow
# or an unreleased version of the element
# RUN pip install git+https://github.com/<user>/element-lab.git
# RUN pip install git+https://github.com/<user>/element-animal.git
# RUN pip install git+https://github.com/<user>/element-session.git
# RUN git clone https://github.com/<user>/workflow-session.git /main/

# Option 3 - Install user's local fork of element and workflow
RUN mkdir /main/element-lab
COPY --chown=anaconda:anaconda ./element-lab /main/element-lab
RUN pip install -e /main/element-lab
RUN mkdir /main/element-animal
COPY --chown=anaconda:anaconda ./element-animal /main/element-animal
RUN pip install -e /main/element-animal
RUN mkdir /main/element-session
COPY --chown=anaconda:anaconda ./element-session /main/element-session
RUN pip install -e /main/element-session
COPY --chown=anaconda:anaconda ./workflow-session /main/workflow-session
# RUN rm -f /main/workflow-session/dj_local_conf.json

# Install the workflow
RUN pip install -e /main/workflow-session
RUN pip install -r /main/workflow-session/requirements_test.txt
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2020 DataJoint NEURO
Copyright (c) 2022 DataJoint

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
Loading