Skip to content

Commit a01ff88

Browse files
committed
Merge remote-tracking branch 'graingert/tornado-62' into python-311
2 parents d05fcd4 + 82fc870 commit a01ff88

File tree

9 files changed

+17
-7
lines changed

9 files changed

+17
-7
lines changed

continuous_integration/environment-3.10.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ dependencies:
3939
- sortedcollections
4040
- tblib
4141
- toolz
42-
- tornado<6.2
42+
- tornado >=6.2
4343
- zict # overridden by git tip below
4444
- zstandard >=0.9.0
4545
- pip:

continuous_integration/environment-3.8.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ dependencies:
4242
- sortedcollections
4343
- tblib
4444
- toolz
45-
- tornado<6.2
45+
- tornado >=6.2
4646
- zict
4747
- zstandard >=0.9.0
4848
- pip:

continuous_integration/environment-3.9.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ dependencies:
4545
- tblib
4646
- toolz
4747
- torchvision # Only tested here
48-
- tornado<6.2
48+
- tornado >=6.2
4949
- zict
5050
- zstandard >=0.9.0
5151
- pip:

distributed/deploy/tests/test_adaptive.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,7 @@ async def test_no_more_workers_than_tasks():
281281

282282

283283
@pytest.mark.filterwarnings("ignore:There is no current event loop:DeprecationWarning")
284+
@pytest.mark.filterwarnings("ignore:make_current is deprecated:DeprecationWarning")
284285
def test_basic_no_loop(cleanup):
285286
loop = None
286287
try:

distributed/deploy/tests/test_spec_cluster.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ def test_spec_sync(loop):
8383

8484

8585
@pytest.mark.filterwarnings("ignore:There is no current event loop:DeprecationWarning")
86+
@pytest.mark.filterwarnings("ignore:make_current is deprecated:DeprecationWarning")
8687
def test_loop_started_in_constructor(cleanup):
8788
# test that SpecCluster.__init__ starts a loop in another thread
8889
cluster = SpecCluster(worker_spec, scheduler=scheduler, loop=None)

distributed/tests/test_client.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2889,6 +2889,7 @@ async def test_startup_close_startup(s, a, b):
28892889

28902890

28912891
@pytest.mark.filterwarnings("ignore:There is no current event loop:DeprecationWarning")
2892+
@pytest.mark.filterwarnings("ignore:make_current is deprecated:DeprecationWarning")
28922893
def test_startup_close_startup_sync(loop):
28932894
with cluster() as (s, [a, b]):
28942895
with Client(s["address"], loop=loop) as c:
@@ -5613,6 +5614,8 @@ async def test_future_auto_inform(c, s, a, b):
56135614

56145615

56155616
@pytest.mark.filterwarnings("ignore:There is no current event loop:DeprecationWarning")
5617+
@pytest.mark.filterwarnings("ignore:make_current is deprecated:DeprecationWarning")
5618+
@pytest.mark.filterwarnings("ignore:clear_current is deprecated:DeprecationWarning")
56165619
def test_client_async_before_loop_starts(cleanup):
56175620
async def close():
56185621
async with client:
@@ -6590,9 +6593,9 @@ async def test_as_completed_condition_loop(c, s, a, b):
65906593
sys.version_info >= (3, 10),
65916594
reason="On Py3.10+ semaphore._loop is not bound until .acquire() blocks",
65926595
)
6593-
def test_client_connectionpool_semaphore_loop(s, a, b):
6594-
with Client(s["address"]) as c:
6595-
assert c.rpc.semaphore._loop is c.loop.asyncio_loop
6596+
def test_client_connectionpool_semaphore_loop(s, a, b, loop):
6597+
with Client(s["address"], loop=loop) as c:
6598+
assert c.rpc.semaphore._loop is loop.asyncio_loop
65966599

65976600

65986601
@pytest.mark.slow
@@ -6924,6 +6927,7 @@ async def test_workers_collection_restriction(c, s, a, b):
69246927

69256928

69266929
@pytest.mark.filterwarnings("ignore:There is no current event loop:DeprecationWarning")
6930+
@pytest.mark.filterwarnings("ignore:make_current is deprecated:DeprecationWarning")
69276931
@gen_cluster(client=True, nthreads=[("127.0.0.1", 1)])
69286932
async def test_get_client_functions_spawn_clusters(c, s, a):
69296933
# see gh4565

distributed/tests/test_client_loop.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,15 @@ def _check_cluster_and_client_loop(loop):
3030

3131
# Test if Client stops LoopRunner on close.
3232
@pytest.mark.filterwarnings("ignore:There is no current event loop:DeprecationWarning")
33+
@pytest.mark.filterwarnings("ignore:make_current is deprecated:DeprecationWarning")
3334
def test_close_loop_sync_start_new_loop(cleanup):
3435
with _check_loop_runner():
3536
_check_cluster_and_client_loop(loop=None)
3637

3738

3839
# Test if Client stops LoopRunner on close.
3940
@pytest.mark.filterwarnings("ignore:There is no current event loop:DeprecationWarning")
41+
@pytest.mark.filterwarnings("ignore:make_current is deprecated:DeprecationWarning")
4042
def test_close_loop_sync_use_running_loop(cleanup):
4143
with _check_loop_runner():
4244
# Start own loop or use current thread's one.

distributed/tests/test_utils.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,7 @@ def assert_not_running(loop):
407407

408408

409409
@pytest.mark.filterwarnings("ignore:There is no current event loop:DeprecationWarning")
410+
@pytest.mark.filterwarnings("ignore:make_current is deprecated:DeprecationWarning")
410411
def test_loop_runner(loop_in_thread):
411412
# Implicit loop
412413
loop = IOLoop()
@@ -490,6 +491,7 @@ def test_loop_runner(loop_in_thread):
490491

491492

492493
@pytest.mark.filterwarnings("ignore:There is no current event loop:DeprecationWarning")
494+
@pytest.mark.filterwarnings("ignore:make_current is deprecated:DeprecationWarning")
493495
def test_two_loop_runners(loop_in_thread):
494496
# Loop runners tied to the same loop should cooperate
495497

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ psutil >= 5.0
99
sortedcontainers !=2.0.0, !=2.0.1
1010
tblib >= 1.6.0
1111
toolz >= 0.10.0
12-
tornado >= 6.0.3, <6.2
12+
tornado >= 6.0.3
1313
urllib3
1414
zict >= 0.1.3
1515
pyyaml

0 commit comments

Comments
 (0)