Skip to content

Commit c061f8a

Browse files
authored
Merge branch 'datajoint:master' into populate_success_count
2 parents 02127a0 + 9c12891 commit c061f8a

File tree

146 files changed

+6371
-1799
lines changed

Some content is hidden

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

146 files changed

+6371
-1799
lines changed

.codespellrc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[codespell]
2+
skip = .git,*.pdf,*.svg,*.csv,*.ipynb,*.drawio
3+
# Rever -- nobody knows
4+
# numer -- numerator variable
5+
ignore-words-list = rever,numer

.github/workflows/development.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,16 @@ jobs:
9393
black datajoint --check -v
9494
black tests --check -v
9595
black tests_old --check -v
96+
codespell:
97+
name: Check for spelling errors
98+
permissions:
99+
contents: read
100+
runs-on: ubuntu-latest
101+
steps:
102+
- name: Checkout
103+
uses: actions/checkout@v3
104+
- name: Codespell
105+
uses: codespell-project/actions-codespell@v2
96106
publish-docs:
97107
if: |
98108
github.event_name == 'push' &&

.github/workflows/docs.yaml

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

CHANGELOG.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
## Release notes
22

3+
### Upcoming
4+
- Added - Codespell GitHub Actions workflow
5+
- Added - GitHub Actions workflow to manually release docs
6+
- Changed - Update `datajoint/nginx` to `v0.2.6`
7+
- Changed - Migrate docs from `https://docs.datajoint.org/python` to `https://datajoint.com/docs/core/datajoint-python`
8+
39
### 0.14.1 -- Jun 02, 2023
410
- Fixed - Fix altering a part table that uses the "master" keyword - PR [#991](https://github.com/datajoint/datajoint-python/pull/991)
511
- Fixed - `.ipynb` output in tutorials is not visible in dark mode ([#1078](https://github.com/datajoint/datajoint-python/issues/1078)) PR [#1080](https://github.com/datajoint/datajoint-python/pull/1080)
@@ -31,7 +37,7 @@
3137
- Fixed - Fix queries with backslashes ([#999](https://github.com/datajoint/datajoint-python/issues/999)) PR [#1052](https://github.com/datajoint/datajoint-python/pull/1052)
3238

3339
### 0.13.7 -- Jul 13, 2022
34-
- Fixed - Fix networkx incompatable change by version pinning to 2.6.3 (#1035) PR #1036
40+
- Fixed - Fix networkx incompatible change by version pinning to 2.6.3 (#1035) PR #1036
3541
- Added - Support for serializing numpy datetime64 types (#1022) PR #1036
3642
- Changed - Add traceback to default logging PR #1036
3743

@@ -83,7 +89,7 @@
8389
- Fixed - `schema.list_tables()` is not topologically sorted (#838) PR #893
8490
- Fixed - Diagram part tables do not show proper class name (#882) PR #893
8591
- Fixed - Error in complex restrictions (#892) PR #893
86-
- Fixed - WHERE and GROUP BY clases are dropped on joins with aggregation (#898, #899) PR #893
92+
- Fixed - WHERE and GROUP BY classes are dropped on joins with aggregation (#898, #899) PR #893
8793

8894
### 0.13.0 -- Mar 24, 2021
8995
- Re-implement query transpilation into SQL, fixing issues (#386, #449, #450, #484, #558). PR #754

LNX-docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ services:
4444
interval: 15s
4545
fakeservices.datajoint.io:
4646
<<: *net
47-
image: datajoint/nginx:v0.2.5
47+
image: datajoint/nginx:v0.2.6
4848
environment:
4949
- ADD_db_TYPE=DATABASE
5050
- ADD_db_ENDPOINT=db:3306

README.md

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,18 @@
55

66
# Welcome to DataJoint for Python!
77

8-
DataJoint for Python is a framework for scientific workflow management based on relational principles. DataJoint is built on the foundation of the relational data model and prescribes a consistent method for organizing, populating, computing, and querying data.
9-
10-
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.
11-
Presently, the primary developer of DataJoint open-source software is the company DataJoint (https://datajoint.com).
8+
DataJoint for Python is a framework for scientific workflow management based on
9+
relational principles. DataJoint is built on the foundation of the relational data
10+
model and prescribes a consistent method for organizing, populating, computing, and
11+
querying data.
12+
13+
DataJoint was initially developed in 2009 by Dimitri Yatsenko in Andreas Tolias' Lab at
14+
Baylor College of Medicine for the distributed processing and management of large
15+
volumes of data streaming from regular experiments. Starting in 2011, DataJoint has
16+
been available as an open-source project adopted by other labs and improved through
17+
contributions from several developers.
18+
Presently, the primary developer of DataJoint open-source software is the company
19+
DataJoint (https://datajoint.com).
1220

1321
## Data Pipeline Example
1422

@@ -18,7 +26,13 @@ Presently, the primary developer of DataJoint open-source software is the compan
1826

1927
## Getting Started
2028

21-
- Install from PyPI
29+
- Install with Conda
30+
31+
```bash
32+
conda install -c conda-forge datajoint
33+
```
34+
35+
- Install with pip
2236

2337
```bash
2438
pip install datajoint
@@ -33,9 +47,4 @@ Presently, the primary developer of DataJoint open-source software is the compan
3347
- Contribute
3448
- [Development Environment](https://datajoint.com/docs/core/datajoint-python/latest/develop/)
3549

36-
- [Guidelines](https://datajoint.com/docs/community/contribute/)
37-
38-
- Legacy Resources (To be replaced by above)
39-
- [Documentation](https://docs.datajoint.org)
40-
41-
- [Tutorials](https://tutorials.datajoint.org)
50+
- [Guidelines](https://datajoint.com/docs/about/contribute/)

datajoint/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""
2-
DataJoint for Python is a framework for building data piplines using MySQL databases
2+
DataJoint for Python is a framework for building data pipelines using MySQL databases
33
to represent pipeline structure and bulk storage systems for large objects.
44
DataJoint is built on the foundation of the relational data model and prescribes a
55
consistent method for organizing, populating, and querying data.

datajoint/autopopulate.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ def _job_key(self, key):
118118

119119
def _jobs_to_do(self, restrictions):
120120
"""
121-
:return: the query yeilding the keys to be computed (derived from self.key_source)
121+
:return: the query yielding the keys to be computed (derived from self.key_source)
122122
"""
123123
if self.restriction:
124124
raise DataJointError(

datajoint/blob.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ def pack_dict(self, d):
449449
)
450450

451451
def read_struct(self):
452-
"""deserialize matlab stuct"""
452+
"""deserialize matlab struct"""
453453
n_dims = self.read_value()
454454
shape = self.read_value(count=n_dims)
455455
n_elem = np.prod(shape, dtype=int)

datajoint/connection.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ def conn(
113113
:param init_fun: initialization function
114114
:param reset: whether the connection should be reset or not
115115
:param use_tls: TLS encryption option. Valid options are: True (required), False
116-
(required no TLS), None (TLS prefered, default), dict (Manually specify values per
116+
(required no TLS), None (TLS preferred, default), dict (Manually specify values per
117117
https://dev.mysql.com/doc/refman/5.7/en/connection-options.html#encrypted-connection-options).
118118
"""
119119
if not hasattr(conn, "connection") or reset:

0 commit comments

Comments
 (0)