This repository was archived by the owner on Jan 21, 2026. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 6
Shift to workflow-session
#9
Merged
Merged
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 19cd362
Merge branch 'datajoint:main' into patch-1
CBroz1 2559e83
Merge PR, minor alt branch formatting edits
CBroz1 bfa2bc1
initial commit migrate wf-anim->wf-sess
CBroz1 8ab4908
partial revision, fake data, ingest functs
CBroz1 6cbecd3
Adding NB for export example
CBroz1 544db35
more detail in NB output
CBroz1 7fc3a3a
Update to reflect sess not depend on lab
CBroz1 cb59750
update readme/diagrams, add activate(genotyping)
CBroz1 fd6ff4f
fixing readme typos
CBroz1 7688006
start integration test add, WIP
CBroz1 c73dcf6
coverage tests: ingest & pipeline
CBroz1 fb0f7b1
remove pynwb version fix
CBroz1 c76a6dd
Remove notes file
CBroz1 0a30e46
reverting folder name before gitmv; for git comparisons
CBroz1 c676788
folder rename w/gitmv; for git comparisons
CBroz1 f02a8d9
rm numpy/pandas; PEP8 full eng words
CBroz1 ffda577
PEP8 E501,F401; Diagram aspect ration & new tables
CBroz1 13e73fe
Update README subject->experiment subject
CBroz1 3cea936
minor: remove redundant import
CBroz1 0e4a3d9
Merge branch, resolve conflict
CBroz1 e55af5b
Fixed link formatting, adding parens
CBroz1 beaa591
Adding NB for export example
CBroz1 4b4b3a6
merging branch conflicts
CBroz1 3bd08af
Merge branch 'main' of https://github.com/CBroz1/workflow-session
CBroz1 7fffc41
Minor; resolve conflicts, same notebooks
CBroz1 292a692
remove old diagrams, update README links
CBroz1 2005243
Removed lab.Project refs to slices, viruses, etc. - see details
CBroz1 2ac483a
Removed lab.Project refs to slices, etc. from integration test
CBroz1 836390e
Version. Update CHANGELOG. notebook: remove specifics
CBroz1 6147795
Docker integration test successful. See details.
CBroz1 2966000
Remove diagrams, link to elements in readme
CBroz1 ab50c0c
Apply suggestions from @kabilar's code review
CBroz1 ac52192
pin requirements
CBroz1 d851649
Move diagrams to element. Revise table names per elem-lab change
CBroz1 c7ae137
add integration tests for Subject part tables
CBroz1 32df6bc
Fix coverage output, Add verbosity option. See details
CBroz1 3409ded
Apply suggestions from code review
CBroz1 9b613b0
rename apt_requirements.txt
CBroz1 c48bdf6
rename apt_requirements
CBroz1 38749c1
rename typo
CBroz1 223d8b9
Apply suggestions from code review
CBroz1 ab6720e
Apply suggestions from code review: revise import formatting
CBroz1 51e3f7a
Apply suggestions from code review: activate genotyping shema
CBroz1 c10c702
Apply suggestions from code review
CBroz1 18f5a19
Apply suggestions from code review
CBroz1 4542ed5
Apply all suggestions from code review
CBroz1 a471eaf
Apply suggestions from code review
CBroz1 8d1654e
Apply suggestions from code review
CBroz1 f79f3e4
Apply suggestions from code review
CBroz1 967502d
Update notebooks/1_Explore_Workflow.ipynb
CBroz1 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,119 +1,74 @@ | ||
| # vscode | ||
| .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 | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| FROM datajoint/djlab:py3.8-debian | ||
|
|
||
| USER anaconda:anaconda | ||
|
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"] | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| FROM datajoint/djlab:py3.8-debian | ||
|
|
||
| USER anaconda:anaconda | ||
|
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 | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.