Skip to content

Commit 14d815b

Browse files
Merge pull request #417 from CBroz1/master
mkdocs deployment
2 parents 42804e9 + 0b63dd8 commit 14d815b

File tree

97 files changed

+1369
-1289
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+1369
-1289
lines changed

.github/workflows/development.yaml

+19
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,22 @@ jobs:
3737
COMPOSE_HTTP_TIMEOUT: "120"
3838
run: |
3939
docker-compose -f LNX-docker-compose.yaml up --build --exit-code-from app
40+
publish-docs:
41+
if: |
42+
github.event_name == 'push' &&
43+
startsWith(github.ref, 'refs/tags')
44+
needs: test
45+
runs-on: ubuntu-latest
46+
env:
47+
DOCKER_CLIENT_TIMEOUT: "120"
48+
COMPOSE_HTTP_TIMEOUT: "120"
49+
steps:
50+
- uses: actions/checkout@v2
51+
- name: Deploy docs
52+
run: |
53+
export MODE=BUILD
54+
export PACKAGE=datajoint
55+
export UPSTREAM_REPO=https://github.com/${GITHUB_REPOSITORY}.git
56+
export HOST_UID=$(id -u)
57+
docker compose -f docs/docker-compose.yaml up --exit-code-from docs --build
58+
git push origin gh-pages

.github/workflows/publish-docs.yaml

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Publish Docs
2+
on:
3+
push:
4+
tags:
5+
- 'test*.*.*'
6+
workflow_dispatch:
7+
jobs:
8+
publish-docs:
9+
runs-on: ubuntu-latest
10+
env:
11+
DOCKER_CLIENT_TIMEOUT: "120"
12+
COMPOSE_HTTP_TIMEOUT: "120"
13+
steps:
14+
- uses: actions/checkout@v2
15+
- name: Deploy docs
16+
run: |
17+
export MODE=BUILD
18+
export PACKAGE=datajoint
19+
export UPSTREAM_REPO=https://github.com/${GITHUB_REPOSITORY}.git
20+
export HOST_UID=$(id -u)
21+
docker compose -f docs/docker-compose.yaml up --exit-code-from docs --build
22+
git push origin gh-pages

CHANGELOG.md

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Changelog
2+
3+
Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and
4+
[Keep a Changelog](https://keepachangelog.com/en/1.0.0/) convention.
5+
6+
## [3.5.0] - 2022-03-21
7+
8+
+ Bugfix: Cascading delete for renamed foreign keys (#379) PR #386
9+
+ Minor: Add renaming the same attribute multiple times within a single projection PR #386
10+
+ Minor: Add config for reading values with 32-bit dimensions (datajoint/mym#86) PR #395
11+
12+
[3.5.0]: https://github.com/datajoint/element-deeplabcut/releases/tag/3.5.0

README.md

+23-65
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,28 @@
11
[![View DataJoint on File Exchange](https://www.mathworks.com/matlabcentral/images/matlab-file-exchange.svg)](https://www.mathworks.com/matlabcentral/fileexchange/63218-datajoint)
22

33
# Welcome to DataJoint for MATLAB!
4-
DataJoint for MATLAB is a high-level programming interface for relational databases designed to support data processing chains in science labs. DataJoint is built on the foundation of the relational data model and prescribes a consistent method for organizing, populating, and querying data.
5-
6-
DataJoint was initially developed in 2009 by Dimitri Yatsenko in Andreas Tolias' Lab at Baylor College of Medicine for the distributed processing and management of large volumes of data streaming from regular experiments. Starting in 2011, DataJoint has been available as an open-source project adopted by other labs and improved through contributions from several developers.
7-
Presently, the primary developer of DataJoint open-source software is the company DataJoint (https://datajoint.com). Related resources are listed at https://datajoint.org.
8-
9-
## Installation
10-
<details>
11-
<summary>Click to expand details</summary>
12-
13-
### (Recommended) Greater than R2016b
14-
15-
1. Utilize MATLAB built-in GUI i.e. *Top Ribbon -> Add-Ons -> Get Add-Ons*
16-
2. Search and Select `DataJoint`
17-
3. Select *Add from GitHub*
18-
19-
### Using GHToolbox (FileExchange Community Toolbox)
20-
21-
1. Install *GHToolbox* using using an appropriate method in https://github.com/datajoint/GHToolbox
22-
2. run: `ghtb.install('datajoint/datajoint-matlab')`
23-
24-
### Less than R2016b
25-
26-
1. Utilize MATLAB built-in GUI i.e. *Top Ribbon -> Add-Ons -> Get Add-Ons*
27-
2. Search and Select `DataJoint`
28-
3. Select *Download from GitHub*
29-
4. Save `DataJoint.mltbx` locally
30-
5. Navigate in MATLAB tree browser to saved toolbox file
31-
6. Right-Click and Select *Install*
32-
7. Select *Install*
33-
34-
### From Source
35-
36-
1. Download `DataJoint.mltbx` locally
37-
2. Navigate in MATLAB tree browser to saved toolbox file
38-
3. Right-Click and Select *Install*
39-
4. Select *Install*
404

41-
</details>
42-
43-
## Config
44-
For help in utilizing `dj.config` (added in `3.4.0`), you may access the help via `help('dj.config')` or review it online [here](https://github.com/datajoint/datajoint-matlab/blob/c2bd6b3e195dfeef773d4e12bad5573c461193b0/%2Bdj/config.m#L2-L27). Formal documentation to follow.
45-
46-
## Documentation and Tutorials
5+
DataJoint for MATLAB is a high-level programming interface for relational databases designed to support data processing chains in science labs. DataJoint is built on the foundation of the relational data model and prescribes a consistent method for organizing, populating, and querying data.
476

48-
* https://datajoint.org -- start page
49-
* https://docs.datajoint.org -- up-to-date documentation
50-
* https://tutorials.datajoint.io -- step-by-step tutorials
51-
* https://elements.datajoint.org -- catalog of example pipelines
52-
* https://codebook.datajoint.io -- interactive online tutorials
7+
For more information, see our
8+
[general](https://datajoint.com/docs/welcome/) and
9+
[MATLAB](https://datajoint.com/docs/core/datajoint-matlab/) documentation pages.
5310

5411
## Citation
12+
5513
+ If your work uses DataJoint for MATLAB, please cite the following Research Resource Identifier (RRID) and manuscript.
5614

5715
+ DataJoint ([RRID:SCR_014543](https://scicrunch.org/resolver/SCR_014543)) - DataJoint for MATLAB (version `<Enter version number>`)
5816

5917
+ Yatsenko D, Reimer J, Ecker AS, Walker EY, Sinz F, Berens P, Hoenselaar A, Cotton RJ, Siapas AS, Tolias AS. DataJoint: managing big scientific data using MATLAB or Python. bioRxiv. 2015 Jan 1:031658. doi: https://doi.org/10.1101/031658
6018

61-
## Running Tests Locally
19+
## For Developers: Running Tests Locally
20+
6221
<details>
6322
<summary>Click to expand details</summary>
6423

65-
* Create an `.env` with desired development environment values e.g.
24+
+ Create an `.env` with desired development environment values e.g.
25+
6626
``` sh
6727
MATLAB_USER=rguzman
6828
MATLAB_LICENSE=IyBCRUd... # For image usage instructions see https://github.com/guzman-raphael/matlab, https://hub.docker.com/r/raphaelguzman/matlab
@@ -73,11 +33,12 @@ MATLAB_GID=1000
7333
MYSQL_TAG=5.7
7434
MINIO_VER=RELEASE.2022-01-03T18-22-58Z
7535
```
76-
* `cp local-docker-compose.yaml docker-compose.yaml`
77-
* `docker-compose up` (Note configured `JUPYTER_PASSWORD`)
78-
* Select a means of running MATLAB e.g. Jupyter Notebook, GUI, or Terminal (see bottom)
79-
* Add `tests` directory to path e.g. in MATLAB, `addpath('tests')`
80-
* Run desired tests. Some examples are as follows:
36+
37+
+ `cp local-docker-compose.yaml docker-compose.yaml`
38+
+ `docker-compose up` (Note configured `JUPYTER_PASSWORD`)
39+
+ Select a means of running MATLAB e.g. Jupyter Notebook, GUI, or Terminal (see bottom)
40+
+ Add `tests` directory to path e.g. in MATLAB, `addpath('tests')`
41+
+ Run desired tests. Some examples are as follows:
8142

8243
| Use Case | MATLAB Code |
8344
| ---------------------------- | ------------------------------------------------------------------------------ |
@@ -86,23 +47,20 @@ MINIO_VER=RELEASE.2022-01-03T18-22-58Z
8647
| Run one specific test | `runtests('TestTls/TestTls_testInsecureConn')` |
8748
| Run tests based on test name | `import matlab.unittest.TestSuite;`<br>`import matlab.unittest.selectors.HasName;`<br>`import matlab.unittest.constraints.ContainsSubstring;`<br>`suite = TestSuite.fromClass(?Main, ... `<br><code>&nbsp;&nbsp;&nbsp;&nbsp;</code>`HasName(ContainsSubstring('Conn')));`<br>`run(suite)`|
8849

89-
9050
### Launch Jupyter Notebook
9151

92-
* Navigate to `localhost:8888`
93-
* Input Jupyter password
94-
* Launch a notebook i.e. `New > MATLAB`
95-
52+
+ Navigate to `localhost:8888`
53+
+ Input Jupyter password
54+
+ Launch a notebook i.e. `New > MATLAB`
9655

9756
### Launch MATLAB GUI (supports remote interactive debugger)
9857

99-
* Shell into `datajoint-matlab_app_1` i.e. `docker exec -it datajoint-matlab_app_1 bash`
100-
* Launch Matlab by runnning command `matlab`
101-
58+
+ Shell into `datajoint-matlab_app_1` i.e. `docker exec -it datajoint-matlab_app_1 bash`
59+
+ Launch Matlab by running command `matlab`
10260

10361
### Launch MATLAB Terminal
10462

105-
* Shell into `datajoint-matlab_app_1` i.e. `docker exec -it datajoint-matlab_app_1 bash`
106-
* Launch Matlab with no GUI by runnning command `matlab -nodisplay`
63+
+ Shell into `datajoint-matlab_app_1` i.e. `docker exec -it datajoint-matlab_app_1 bash`
64+
+ Launch Matlab with no GUI by running command `matlab -nodisplay`
10765

108-
</details>
66+
</details>

docs-parts/admin/5-blob-config_lang1.rst

-4
This file was deleted.

docs-parts/admin/5-blob-config_lang2.rst

-1
This file was deleted.

docs-parts/admin/5-blob-config_lang3.rst

-4
This file was deleted.

docs-parts/admin/5-blob-config_lang4.rst

-4
This file was deleted.

docs-parts/admin/5-blob-config_lang5.rst

-4
This file was deleted.

docs-parts/computation/01-autopopulate_lang1.rst

-23
This file was deleted.

docs-parts/computation/01-autopopulate_lang2.rst

-4
This file was deleted.

docs-parts/computation/01-autopopulate_lang3.rst

-3
This file was deleted.

docs-parts/computation/01-autopopulate_lang4.rst

-28
This file was deleted.

docs-parts/computation/02-keysource_lang1.rst

-1
This file was deleted.

docs-parts/computation/02-keysource_lang2.rst

-17
This file was deleted.

docs-parts/computation/04-master-part_lang1.rst

-52
This file was deleted.

docs-parts/computation/04-master-part_lang2.rst

-4
This file was deleted.

0 commit comments

Comments
 (0)