Skip to content
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
2 changes: 1 addition & 1 deletion .github/workflows/pythonapp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
os: [ubuntu-latest]
fail-fast: false
timeout-minutes: 5
Expand Down
3 changes: 1 addition & 2 deletions deadpool.py
Original file line number Diff line number Diff line change
Expand Up @@ -572,8 +572,7 @@ def run_task(self, fn, args, kwargs, timeout, fut: Future):
f"TimeoutError on {worker.pid}, setting ok=False"
)
worker.ok = False
finally:
break
break
elif not worker.is_alive():
self._statistics.tasks_failed.increment()
logger.debug(f"p is no longer alive: {worker.process}")
Expand Down
2 changes: 2 additions & 0 deletions noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"3.11",
"3.12",
"3.13",
"3.14",
]
)
def test(session):
Expand All @@ -25,6 +26,7 @@ def test(session):
"3.11",
"3.12",
"3.13",
"3.14",
]
)
def testcov(session):
Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ classifiers = [
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Programming Language :: Python :: 3.14",
"Programming Language :: Python :: Implementation",
"Programming Language :: Python :: Implementation :: CPython",
]
Expand Down
13 changes: 10 additions & 3 deletions tests/test_deadpool.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import asyncio
import logging
import os
import pickle
import queue
import signal
import sys
Expand Down Expand Up @@ -690,7 +691,9 @@ def f():
with deadpool.Deadpool() as exe:
fut = exe.submit(f)

with pytest.raises(AttributeError, match="local object"):
with pytest.raises(
(AttributeError, pickle.PicklingError), match="local object"
):
fut.result()


Expand All @@ -704,7 +707,9 @@ def f():
with ProcessPoolExecutor() as exe:
fut = exe.submit(f)

with pytest.raises(AttributeError, match="local object"):
with pytest.raises(
(AttributeError, pickle.PicklingError), match="local object"
):
fut.result()


Expand All @@ -714,7 +719,9 @@ def test_can_pickle_lambda_function():
with deadpool.Deadpool() as exe:
fut = exe.submit(lambda: 123)

with pytest.raises(AttributeError, match="local object"):
with pytest.raises(
(AttributeError, pickle.PicklingError), match="local object"
):
fut.result()


Expand Down
Loading