Skip to content

Commit b9a0f14

Browse files
authored
Rework of docs before v0.4.0 (#367)
* Remove old pages. * Reduce number of build warnings. * Tidying up the docs * Tidying up getting started. * Update password entry for TTY terminal. * Finished checking all docs. * Apply feedback from #362.
1 parent eeea6cb commit b9a0f14

17 files changed

+444
-1585
lines changed

datashuttle/datashuttle.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1431,7 +1431,7 @@ def _load_persistent_settings(self) -> Dict:
14311431

14321432
def _update_settings_with_new_canonical_keys(self, settings: Dict):
14331433
"""
1434-
Perform a check on the top-level keys within persistent settings.
1434+
Perform a check on the keys within persistent settings.
14351435
If they do not exist, persistent settings is from older version
14361436
and the new keys need adding.
14371437
If changing keys within the top level (e.g. a dict entry in

datashuttle/utils/ssh.py

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -128,19 +128,25 @@ def setup_ssh_key(
128128
log : log if True, logger must already be initialised.
129129
"""
130130
if not sys.stdin.isatty():
131-
utils.log_and_raise_error(
132-
"Attempting to run outside of a TTY terminal. "
133-
"This may happen if attempting to run in an IDE console. "
134-
"`getpass` (used for ssh password input) cannot run. "
135-
"Try using Python from the operating system "
136-
"terminal to run this function.",
137-
RuntimeError,
131+
proceed = input(
132+
"\nWARNING!\nThe next step is to enter a password, but it is not possible\n"
133+
"to hide your password while entering it in the current terminal.\n"
134+
"This can occur if running the command in an IDE.\n\n"
135+
"Press 'y' to proceed to password entry. "
136+
"The characters will not be hidden!\n"
137+
"Alternatively, run ssh setup after starting Python in your "
138+
"system terminal \nrather than through an IDE: "
139+
)
140+
if proceed != "y":
141+
return
142+
password = input(
143+
"Please enter your password. Characters will not be hidden: "
144+
)
145+
else:
146+
password = getpass.getpass(
147+
"Please enter password to your central host to add the public key. "
148+
"You will not have to enter your password again."
138149
)
139-
140-
password = getpass.getpass(
141-
"Please enter password to your central host to add the public key. "
142-
"You will not have to enter your password again."
143-
)
144150

145151
add_public_key_to_central_authorized_keys(cfg, password)
146152

docs/source/conf.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,6 @@
7777
#toc_object_entries_show_parents = "all"
7878
html_show_sourcelink = False
7979

80-
#html_sidebars = { this is not working...
81-
# "index": [],
82-
# "**": [],
83-
#}
84-
8580
# Ignore links that do not work with github actions link checking
8681
# https://github.com/neuroinformatics-unit/actions/pull/24#issue-1978966182
8782
linkcheck_anchors_ignore_for_url = [
@@ -125,6 +120,10 @@
125120

126121
html_favicon = "_static/logo_light.png"
127122

123+
html_sidebars = {
124+
"**": []
125+
}
126+
128127
# Customize the theme
129128
html_theme_options = {
130129
"icon_links": [
@@ -148,7 +147,7 @@
148147
},
149148
],
150149
"logo": {
151-
"text": f"Datashuttle v{release}",
150+
"text": f"datashuttle v{release}",
152151
"image_light": "_static/logo_light.png",
153152
"image_dark": "_static/logo_dark.png",
154153
},

docs/source/index.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{.center}
44
# **datashuttle**
55

6-
<p style="text-align: center; font-size: 22px;">The tool to automate neuroscience project folder creation and transfer.</p>
6+
<p style="text-align: center; font-size: 22px;">The tool to automate neuroscience project folder creation, validation and transfer.</p>
77

88
```{image} _static/datashuttle-overview-light.png
99
:alt: My Logo
@@ -40,17 +40,18 @@ Short guides on specific actions.
4040
:link: pages/api_index
4141
:link-type: doc
4242

43-
Full Python API reference.
43+
Full Python reference.
4444
:::
4545
::::
4646

47-
Datashuttle creates and validates projects standardised to the
47+
**datashuttle** creates and validates projects standardised to the
4848
[NeuroBlueprint](https://neuroblueprint.neuroinformatics.dev)
4949
specification.
5050

5151
Dive right into **datashuttle** with our
52-
[Getting Started Tutorial]((tutorial-getting-started)=)
53-
or targeted [How-To Guides](how-tos).
52+
[Getting Started Tutorial](tutorial-getting-started)
53+
or targeted [How-To Guides](how-tos). \
54+
It can be used through a graphical interface or Python API.
5455

5556
Don't hesitate to get in contact through our
5657
[GitHub Issues](https://github.com/neuroinformatics-unit/datashuttle/issues)

docs/source/pages/cli_index.rst

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)