Skip to content

Commit

Permalink
Merge branch 'main' into fix_docstring_MDASequence
Browse files Browse the repository at this point in the history
  • Loading branch information
tlambert03 authored Dec 4, 2023
2 parents 03a2063 + 0bb0350 commit 0b0335c
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,30 @@ default_install_hook_types: [pre-commit, commit-msg]

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.5.0
hooks:
- id: check-docstring-first
- id: pretty-format-json
args: ["--autofix"]

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.0.291
rev: v0.1.6
hooks:
- id: ruff
args: [--fix]

- repo: https://github.com/psf/black
rev: 23.9.1
rev: 23.11.0
hooks:
- id: black

- repo: https://github.com/abravalheri/validate-pyproject
rev: v0.14
rev: v0.15
hooks:
- id: validate-pyproject

- repo: https://github.com/pre-commit/mirrors-mypy
rev: v1.5.1
rev: v1.7.1
hooks:
- id: mypy
additional_dependencies:
Expand Down
2 changes: 1 addition & 1 deletion mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ markdown_extensions:
- pymdownx.highlight
- pymdownx.extra
- pymdownx.emoji:
emoji_index: !!python/name:material.extensions.emoji.twemoji
emoji_index: !!python/name:material.extensions.emoji.twemoji
emoji_generator: !!python/name:material.extensions.emoji.to_svg
- pymdownx.tabbed:
alternate_style: true
Expand Down
2 changes: 1 addition & 1 deletion src/useq/_iter_sequence.py
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ def _parse_axes(
index = {ax: _ev[ax][0] for ax in AXES if ax in _ev}
# this needs to be tuple(...) to work for mypyc
axes = tuple(_ev[ax][1] if ax in _ev else None for ax in AXES)
return (index, *axes) # type: ignore[return-value]
return (index, *axes)


def _should_skip(
Expand Down

0 comments on commit 0b0335c

Please sign in to comment.