Skip to content

Commit 19d488b

Browse files
Merge pull request #46 from kabilar/main
Add `Device` table
2 parents 2c75f20 + 1721bfb commit 19d488b

File tree

6 files changed

+34
-16
lines changed

6 files changed

+34
-16
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and
44
[Keep a Changelog](https://keepachangelog.com/en/1.0.0/) convention.
55

6+
## [0.3.0] - 2023-06-02
7+
8+
+ Add - `Device` table to `lab` schema
9+
+ Update - Docs configuration to remove Google Analytics key and add Markdown extensions
10+
611
## [0.2.2] - 2023-05-11
712

813
+ Fix - `.ipynb` dark mode output for all notebooks.
@@ -38,6 +43,7 @@ Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and
3843
+ Add - GitHub Action release process
3944
+ Add - `lab` schema
4045

46+
[0.3.0]: https://github.com/datajoint/element-lab/releases/tag/0.3.0
4147
[0.2.2]: https://github.com/datajoint/element-lab/releases/tag/0.2.2
4248
[0.2.1]: https://github.com/datajoint/element-lab/releases/tag/0.2.1
4349
[0.2.0]: https://github.com/datajoint/element-lab/releases/tag/0.2.0

docs/.docker/pip_requirements.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,6 @@ mdx-truly-sane-lists
77
mkdocs-gen-files
88
mkdocs-literate-nav
99
mkdocs-exclude-search
10-
mkdocs-markdownextradata-plugin
10+
mkdocs-markdownextradata-plugin
11+
mkdocs-jupyter
12+
mkdocs-section-index

docs/docker-compose.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ services:
1313
- PACKAGE
1414
- UPSTREAM_REPO
1515
- MODE
16-
- GOOGLE_ANALYTICS_KEY
1716
- PATCH_VERSION
1817
volumes:
1918
- ../docs:/main/docs

docs/mkdocs.yaml

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,14 @@ nav:
4242
# UPSTREAM_REPO=https://github.com/datajoint/element-{ELEMENT}.git \
4343
# HOST_UID=$(id -u) docker compose -f docs/docker-compose.yaml up --build
4444
# ```
45-
# 02. Site analytics depend on a local environment variable GOOGLE_ANALYTICS_KEY
46-
# You can find this in LastPass or declare with any string to suppress errors
47-
# 03. The API section will pull docstrings.
45+
# 02. The API section will pull docstrings.
4846
# A. Follow google styleguide e.g.,
4947
# https://sphinxcontrib-napoleon.readthedocs.io/en/latest/example_google.html
5048
# With typing suggestions: https://docs.python.org/3/library/typing.html
5149
# B. To pull a specific workflow fork, change ./docs/src/api/make_pages.py#L19
52-
# 04. To see your fork of the workflow-{element} in this render, change the
50+
# 03. To see your fork of the workflow-{element} in this render, change the
5351
# URL in ./docs/src/api/make_pages.py#L19 to your fork.
54-
# 05. For redirecting options For redirect options, see 'redirects' below.
55-
# 06. To deploy this site on your fork,
52+
# 04. To deploy this site on your fork,
5653
# A. declare a branch called gh-pages
5754
# B. go to the your fork > settings > pages
5855
# C. direct pages to render from the gh-pages branch at root
@@ -87,9 +84,6 @@ theme:
8784
plugins:
8885
- markdownextradata: {}
8986
- search
90-
# - redirects: # OPTIONAL REDIRECTS
91-
# redirect_maps:
92-
# "index.md": "getting_started.md"
9387
- mkdocstrings:
9488
default_handler: python
9589
handlers:
@@ -127,13 +121,12 @@ markdown_extensions:
127121
- pymdownx.inlinehilite
128122
- pymdownx.snippets
129123
- footnotes
130-
124+
- pymdownx.magiclink # Displays bare URLs as links
125+
- pymdownx.tasklist: # Renders check boxes in tasks lists
126+
custom_checkbox: true
131127
extra:
132128
PATCH_VERSION: !ENV PATCH_VERSION
133129
generator: false # Disable watermark
134-
analytics:
135-
provider: google
136-
property: !ENV GOOGLE_ANALYTICS_KEY
137130
version:
138131
provider: mike
139132
social:

element_lab/lab.py

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,3 +272,21 @@ class Source(dj.Lookup):
272272
contact_details='' : varchar(255)
273273
source_description='' : varchar(255)
274274
"""
275+
276+
277+
@schema
278+
class Device(dj.Lookup):
279+
"""Devices within the lab.
280+
281+
Attributes:
282+
device ( varchar(32) ): Device short name.
283+
modality ( varchar(64) ): Modality for which this device is used.
284+
description ( varchar(256) ): Optional. Description of the device.
285+
"""
286+
287+
definition = """
288+
device : varchar(32)
289+
---
290+
modality : varchar(64)
291+
description='' : varchar(256)
292+
"""

element_lab/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
"""Package metadata."""
2-
__version__ = "0.2.2"
2+
__version__ = "0.3.0"

0 commit comments

Comments
 (0)