Skip to content

Commit

Permalink
Merge branch 'jupyter-server:main' into pass_session_id
Browse files Browse the repository at this point in the history
  • Loading branch information
gogasca authored Jul 6, 2024
2 parents 64e08f2 + f2d40f6 commit 54e413d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ repos:
- id: trailing-whitespace

- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.28.4
rev: 0.28.6
hooks:
- id: check-github-workflows

Expand Down Expand Up @@ -52,7 +52,7 @@ repos:
- id: rst-inline-touching-normal

- repo: https://github.com/pre-commit/mirrors-mypy
rev: "v1.10.0"
rev: "v1.10.1"
hooks:
- id: mypy
files: jupyter_server
Expand All @@ -61,7 +61,7 @@ repos:
["traitlets>=5.13", "jupyter_core>=5.5", "jupyter_client>=8.5"]

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.4.7
rev: v0.5.0
hooks:
- id: ruff
types_or: [python, jupyter]
Expand Down
2 changes: 1 addition & 1 deletion tests/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ def test_filefind(tmp_path, filename, result):
if isinstance(result, str):
found = filefind(filename, [str(a), str(b)])
found_relative = Path(found).relative_to(tmp_path)
assert str(found_relative) == result
assert str(found_relative).replace(os.sep, "/") == result
else:
with pytest.raises(result):
filefind(filename, [str(a), str(b)])

1 comment on commit 54e413d

@gogasca
Copy link
Owner Author

@gogasca gogasca commented on 54e413d Jul 6, 2024

Choose a reason for hiding this comment

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

Please sign in to comment.