Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DOC: Update docs #12223

Merged
merged 6 commits into from
Nov 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -296,8 +296,14 @@ jobs:
# Build docs
- run:
name: make html
command: | # we have -o pipefail in #BASH_ENV so we should be okay
set -x
PATTERN=$(cat pattern.txt) make -C doc $(cat build.txt) 2>&1 | tee sphinx_log.txt
- run:
name: Check sphinx log for warnings (which are treated as errors)
when: always
command: |
PATTERN=$(cat pattern.txt) make -C doc $(cat build.txt);
! grep "^.* WARNING: .*$" sphinx_log.txt
- run:
name: Show profiling output
when: always
Expand Down
2 changes: 1 addition & 1 deletion mne/_fiff/meas_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -1380,7 +1380,7 @@ class Info(dict, SetChannelsMixin, MontageMixin, ContainsMixin):
The distance limit.
accept : int
Whether or not the fit was accepted.
coord_trans : instance of Transformation
coord_trans : instance of Transform
The resulting MEG<->head transformation.

* ``hpi_subsystem`` dict:
Expand Down
3 changes: 2 additions & 1 deletion mne/commands/mne_browse_raw.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@ def run():
parser.add_option(
"--clipping",
dest="clipping",
help="Enable trace clipping mode, either 'clamp' or " "'transparent'",
help="Enable trace clipping mode. Can be 'clamp', 'transparent', a float, "
"or 'none'.",
default=_RAW_CLIP_DEF,
)
parser.add_option(
Expand Down
4 changes: 2 additions & 2 deletions mne/preprocessing/artifact_detection.py
Original file line number Diff line number Diff line change
Expand Up @@ -304,8 +304,8 @@ def compute_average_dev_head_t(raw, pos):

Returns
-------
dev_head_t : array of shape (4, 4)
New trans matrix using the averaged good head positions.
dev_head_t : instance of Transform
New ``dev_head_t`` transformation using the averaged good head positions.
"""
sfreq = raw.info["sfreq"]
seg_good = np.ones(len(raw.times))
Expand Down
2 changes: 1 addition & 1 deletion mne/preprocessing/maxwell.py
Original file line number Diff line number Diff line change
Expand Up @@ -1973,7 +1973,7 @@ def _update_sss_info(
The moments that were used.
st_only : bool
Whether tSSS only was performed.
recon_trans : instance of Transformation
recon_trans : instance of Transform
The reconstruction trans.
extended_proj : ndarray
Extended external bases.
Expand Down
2 changes: 1 addition & 1 deletion mne/utils/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -805,7 +805,7 @@ def _get_latest_version(timeout):
try:
with urlopen(url, timeout=timeout) as f: # nosec
response = json.load(f)
except URLError as err:
except (URLError, TimeoutError) as err:
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

# Triage error type
if "SSL" in str(err):
return "SSL error"
Expand Down
Loading