Skip to content

Commit 03dfbaf

Browse files
Merge pull request #1055 from guzman-raphael/docs-styling
Update docs styling and update getting started
2 parents e7dc65a + d456d3c commit 03dfbaf

File tree

10 files changed

+347
-63
lines changed

10 files changed

+347
-63
lines changed

datajoint/table.py

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
UnknownAttributeError,
2323
IntegrityError,
2424
)
25+
from typing import Union
2526
from .version import __version__ as version
2627

2728
logger = logging.getLogger(__name__.split(".")[0])
@@ -459,15 +460,30 @@ def delete_quick(self, get_count=False):
459460
self._log(query[:255])
460461
return count
461462

462-
def delete(self, transaction=True, safemode=None, force_parts=False):
463+
def delete(
464+
self,
465+
transaction: bool = True,
466+
safemode: Union[bool, None] = None,
467+
force_parts: bool = False,
468+
) -> int:
463469
"""
464470
Deletes the contents of the table and its dependent tables, recursively.
465471
466-
:param transaction: if True, use the entire delete becomes an atomic transaction. This is the default and
467-
recommended behavior. Set to False if this delete is nested within another transaction.
468-
:param safemode: If True, prohibit nested transactions and prompt to confirm. Default is dj.config['safemode'].
469-
:param force_parts: Delete from parts even when not deleting from their masters.
470-
:return: number of deleted rows (excluding those from dependent tables)
472+
Args:
473+
transaction: If `True`, use of the entire delete becomes an atomic transaction.
474+
This is the default and recommended behavior. Set to `False` if this delete is
475+
nested within another transaction.
476+
safemode: If `True`, prohibit nested transactions and prompt to confirm. Default
477+
is `dj.config['safemode']`.
478+
force_parts: Delete from parts even when not deleting from their masters.
479+
480+
Returns:
481+
Number of deleted rows (excluding those from dependent tables).
482+
483+
Raises:
484+
DataJointError: Delete exceeds maximum number of delete attempts.
485+
DataJointError: When deleting within an existing transaction.
486+
DataJointError: Deleting a part table before its master.
471487
"""
472488
deleted = set()
473489

docs/mkdocs.yaml

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ site_name: DataJoint Python
44
repo_url: https://github.com/datajoint/datajoint-python
55
repo_name: datajoint/datajoint-python
66
nav:
7-
- DataJoint Python: getting_started.md
8-
- Getting Started: getting_started.md
7+
- DataJoint Python: getting_started/index.md
8+
- Getting Started: getting_started/index.md
99
- Concepts: concepts.md
1010
- Tutorials: tutorials.md
1111
- About:
@@ -17,9 +17,13 @@ nav:
1717
edit_uri: ./edit/master/docs/src
1818
docs_dir: ./src
1919
theme:
20+
font:
21+
text: Roboto Slab
22+
code: Source Code Pro
2023
name: material
2124
custom_dir: src/.overrides
22-
logo: assets/images/project-logo-black.png
25+
icon:
26+
logo: main/project-logo-black
2327
favicon: assets/images/project-logo-color.png
2428
features:
2529
- toc.integrate
@@ -38,9 +42,14 @@ plugins:
3842
- search
3943
- redirects:
4044
redirect_maps:
41-
"index.md": "getting_started.md"
45+
"index.md": "getting_started/index.md"
4246
- mkdocstrings:
4347
default_handler: python
48+
handlers:
49+
python:
50+
selection:
51+
filters:
52+
- "!^_"
4453
- gen-files:
4554
scripts:
4655
- ./src/api/make_pages.py
@@ -54,10 +63,16 @@ markdown_extensions:
5463
- toc:
5564
permalink: true
5665
- pymdownx.emoji:
66+
emoji_index: !!python/name:materialx.emoji.twemoji
67+
emoji_generator: !!python/name:materialx.emoji.to_svg
5768
options:
5869
custom_icons:
5970
- .overrides/.icons
6071
- mdx_truly_sane_lists
72+
- pymdownx.tabbed:
73+
alternate_style: true
74+
- admonition
75+
- pymdownx.details
6176
- pymdownx.superfences:
6277
custom_fences:
6378
- name: mermaid
@@ -68,8 +83,10 @@ extra:
6883
version:
6984
provider: mike
7085
social:
71-
- icon: datajoint/company-logo
86+
- icon: main/company-logo
7287
link: https://www.datajoint.com/
88+
- icon: fontawesome/solid/ticket
89+
link: https://support.djneuro.io/portal/en/home
7390
- icon: fontawesome/brands/slack
7491
link: https://datajoint.slack.com
7592
- icon: fontawesome/brands/linkedin
@@ -78,6 +95,10 @@ extra:
7895
link: https://twitter.com/DataJointIO
7996
- icon: fontawesome/brands/github
8097
link: https://github.com/datajoint
98+
- icon: fontawesome/brands/docker
99+
link: https://hub.docker.com/u/datajoint
100+
- icon: fontawesome/brands/python
101+
link: https://pypi.org/user/datajointbot
81102
- icon: fontawesome/brands/stack-overflow
82103
link: https://stackoverflow.com/questions/tagged/datajoint
83104
- icon: fontawesome/brands/youtube

docs/src/.overrides/.icons/datajoint/company-logo.svg

Lines changed: 0 additions & 20 deletions
This file was deleted.
Lines changed: 21 additions & 0 deletions
Loading
Lines changed: 22 additions & 0 deletions
Loading
Binary file not shown.
Lines changed: 54 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,59 @@
1-
[data-md-color-scheme="datajoint"] {
2-
3-
--dj-yellow: #fcb954;
4-
5-
--md-primary-fg-color: var(--dj-yellow);
6-
--md-primary-bg-color: #000000;
7-
--md-primary-fg-color--dark: var(--dj-yellow);
8-
9-
--md-accent-fg-color: var(--dj-yellow);
10-
11-
--md-code-bg-color: #e4f3f6;
1+
:root {
2+
--dj-primary: #00a0df;
3+
--dj-secondary: #ff5113;
4+
--dj-background: #808285;
5+
--dj-black: #000000;
6+
--dj-white: #ffffff;
7+
}
128

13-
--md-footer-fg-color: var(--dj-yellow);
9+
[data-md-color-scheme="datajoint"] {
10+
/* ribbon */
11+
/* ribbon + markdown heading expansion */
12+
--md-primary-fg-color: var(--dj-black);
13+
/* ribbon text */
14+
--md-primary-bg-color: var(--dj-primary);
15+
16+
/* navigation */
17+
/* navigation header + links */
18+
--md-typeset-a-color: var(--dj-primary);
19+
/* navigation on hover + diagram outline */
20+
--md-accent-fg-color: var(--dj-secondary);
21+
22+
/* main */
23+
/* main header + already viewed*/
24+
--md-default-fg-color--light: var(--dj-background);
25+
/* primary text */
26+
--md-typeset-color: var(--dj-black);
27+
/* code comments + diagram text */
28+
--md-code-fg-color: var(--dj-secondary);
29+
30+
/* footer */
31+
/* previous/next text */
32+
--md-footer-fg-color: var(--dj-primary);
1433
}
1534

1635
[data-md-color-scheme="slate"] {
17-
18-
--dj-yellow: #fcb954;
19-
20-
--md-typeset-color: #e4f3f6;
21-
--md-typeset-a-color: #17b2ff;
22-
23-
--md-default-fg-color: #e4f3f6;
24-
--md-default-fg-color--light: var(--dj-yellow);
25-
26-
--md-primary-fg-color: var(--dj-yellow);
27-
--md-primary-bg-color: #000000;
28-
--md-primary-fg-color--dark: var(--dj-yellow);
29-
30-
--md-accent-fg-color: var(--dj-yellow);
31-
32-
--md-code-fg-color: #76c9e9;
33-
--md-code-hl-comment-color: #ffd28d;
34-
35-
--md-footer-fg-color: var(--dj-yellow);
36+
/* ribbon */
37+
/* ribbon + markdown heading expansion */
38+
--md-primary-fg-color: var(--dj-primary);
39+
/* ribbon text */
40+
--md-primary-bg-color: var(--dj-white);
41+
42+
/* navigation */
43+
/* navigation header + links */
44+
--md-typeset-a-color: var(--dj-primary);
45+
/* navigation on hover + diagram outline */
46+
--md-accent-fg-color: var(--dj-secondary);
47+
48+
/* main */
49+
/* main header + already viewed*/
50+
--md-default-fg-color--light: var(--dj-background);
51+
/* primary text */
52+
--md-typeset-color: var(--dj-white);
53+
/* code comments + diagram text */
54+
--md-code-fg-color: var(--dj-secondary);
55+
56+
/* footer */
57+
/* previous/next text */
58+
--md-footer-fg-color: var(--dj-white);
3659
}

docs/src/getting_started.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)