Skip to content

Commit 9482534

Browse files
authored
Merge branch 'main' into fix-printing-speed
2 parents 0bd8e20 + 4d0c438 commit 9482534

3 files changed

Lines changed: 4 additions & 5 deletions

File tree

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
run: |
7070
python -m pip install --only-binary ':all:' --upgrade pip setuptools wheel build
7171
python -m pip install --only-binary ':all:' --no-binary curio --upgrade -e .[${{ matrix.deps }}]
72-
python -m pip install --only-binary ':all:' --upgrade check-manifest pytest-cov 'pytest<8'
72+
python -m pip install --only-binary ':all:' --upgrade check-manifest pytest-cov pytest
7373
- name: Install and update Python dependencies (dev?)
7474
if: ${{ contains( matrix.python-version, 'dev' ) }}
7575
run: |

IPython/extensions/deduperreload/deduperreload.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
)
2626

2727

28-
def get_module_file_name(module: ModuleType | str) -> str:
28+
def get_module_file_name(module: ModuleType | str) -> str | None:
2929
"""Returns the module's file path, or the empty string if it's inaccessible"""
3030
if (mod := sys.modules.get(module) if isinstance(module, str) else module) is None:
3131
return ""
@@ -200,8 +200,7 @@ def update_sources(self) -> None:
200200
for new_modname in sys.modules.keys() - self.source_by_modname.keys():
201201
new_module = sys.modules[new_modname]
202202
if (
203-
(fname := get_module_file_name(new_module))
204-
is None # type:ignore [redundant-expr]
203+
(fname := get_module_file_name(new_module)) is None
205204
or "site-packages" in fname
206205
or "dist-packages" in fname
207206
or not os.access(fname, os.R_OK)

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ doc = [
7070
]
7171
test = [
7272
"pytest",
73-
"pytest-asyncio<0.22",
73+
"pytest-asyncio",
7474
"testpath",
7575
"packaging",
7676
]

0 commit comments

Comments
 (0)