Skip to content

Commit a573494

Browse files
committed
Merge branch 'main' into zmq_anyio
2 parents bf87ed8 + ff74a6f commit a573494

File tree

4 files changed

+17
-28
lines changed

4 files changed

+17
-28
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,19 @@ jobs:
4949
timeout-minutes: 15
5050
if: ${{ !startsWith( matrix.python-version, 'pypy' ) && !startsWith(matrix.os, 'windows') }}
5151
run: |
52-
hatch run cov:test --cov-fail-under 50 || hatch run test:test --lf
52+
hatch run cov:test --cov-fail-under 50
5353
5454
- name: Run the tests on pypy
5555
timeout-minutes: 15
5656
if: ${{ startsWith( matrix.python-version, 'pypy' ) }}
5757
run: |
58-
hatch run test:nowarn || hatch run test:nowarn --lf
58+
hatch run test:nowarn
5959
6060
- name: Run the tests on Windows
6161
timeout-minutes: 15
6262
if: ${{ startsWith(matrix.os, 'windows') }}
6363
run: |
64-
hatch run cov:nowarn || hatch run test:nowarn --lf
64+
hatch run cov:nowarn
6565
6666
- name: Check Launcher
6767
run: |
@@ -144,7 +144,7 @@ jobs:
144144
145145
- name: Run the tests
146146
timeout-minutes: 15
147-
run: pytest -W default -vv || pytest --vv -W default --lf
147+
run: pytest -W default -vv
148148

149149
test_miniumum_versions:
150150
name: Test Minimum Versions
@@ -164,7 +164,7 @@ jobs:
164164
165165
- name: Run the unit tests
166166
run: |
167-
hatch -v run test:nowarn || hatch run test:nowarn --lf
167+
hatch -v run test:nowarn
168168
169169
test_prereleases:
170170
name: Test Prereleases
@@ -179,7 +179,7 @@ jobs:
179179
dependency_type: pre
180180
- name: Run the tests
181181
run: |
182-
hatch run test:nowarn || hatch run test:nowarn --lf
182+
hatch run test:nowarn
183183
184184
make_sdist:
185185
name: Make SDist

.readthedocs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: 2
33
build:
44
os: ubuntu-22.04
55
tools:
6-
python: "3.11"
6+
python: "3.13"
77

88
sphinx:
99
configuration: docs/conf.py

pyproject.toml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -167,29 +167,14 @@ timeout = 60
167167
filterwarnings= [
168168
# Fail on warnings
169169
"error",
170-
171-
# Ignore our own warnings
172-
"ignore:The `stream` parameter of `getpass.getpass` will have no effect:UserWarning",
173-
"ignore:has moved to ipyparallel:DeprecationWarning",
174-
175170
# IPython warnings
176171
"ignore: `Completer.complete` is pending deprecation since IPython 6.0 and will be replaced by `Completer.completions`:PendingDeprecationWarning",
177172
"ignore: backends is deprecated since IPython 8.24, backends are managed in matplotlib and can be externally registered.:DeprecationWarning",
178173
"ignore: backend2gui is deprecated since IPython 8.24, backends are managed in matplotlib and can be externally registered.:DeprecationWarning",
179174

180175
# Ignore jupyter_client warnings
181-
"ignore:unclosed <socket.socket:ResourceWarning",
182-
"ignore:unclosed event loop:ResourceWarning",
183-
"ignore:There is no current event loop:DeprecationWarning",
184-
"ignore:zmq.eventloop.ioloop is deprecated in pyzmq 17. pyzmq now works with default tornado and asyncio eventloops.:DeprecationWarning",
185176
"module:Jupyter is migrating its paths to use standard platformdirs:DeprecationWarning",
186177

187-
# Ignore datetime warning.
188-
"ignore:datetime.datetime.utc:DeprecationWarning",
189-
190-
# https://github.com/python-trio/trio/issues/3053
191-
"ignore:The `hash` argument is deprecated in favor of `unsafe_hash` and will be removed in or after August 2025.",
192-
193178
# ignore unclosed sqlite in traits
194179
"ignore:unclosed database in <sqlite3.Connection:ResourceWarning",
195180

tests/test_eventloop.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,16 @@ def test_cocoa_loop(kernel):
9999
loop_cocoa(kernel)
100100

101101

102-
@pytest.mark.skipif(
103-
len(qt_guis_avail) == 0, reason="No viable version of PyQt or PySide installed."
104-
)
105-
def test_qt_enable_gui(kernel, capsys):
106-
gui = qt_guis_avail[0]
107-
102+
@pytest.mark.parametrize("gui", qt_guis_avail)
103+
def test_qt_enable_gui(gui, kernel, capsys):
104+
if os.getenv("GITHUB_ACTIONS", None) == "true" and gui == "qt5":
105+
pytest.skip("Qt5 and GitHub action crash CPython")
106+
if gui == "qt6" and sys.version_info < (3, 10):
107+
pytest.skip(
108+
"qt6 fails on 3.9 with AttributeError: module 'PySide6.QtPrintSupport' has no attribute 'QApplication'"
109+
)
110+
if sys.platform == "linux" and gui == "qt6" and os.getenv("GITHUB_ACTIONS", None) == "true":
111+
pytest.skip("qt6 fails on github CI with missing libEGL.so.1")
108112
enable_gui(gui, kernel)
109113

110114
# We store the `QApplication` instance in the kernel.

0 commit comments

Comments
 (0)