Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to tornado 6.2 #7286

Merged
merged 3 commits into from
Nov 24, 2022
Merged

Upgrade to tornado 6.2 #7286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
73e13e2
upgrade to tornado 6.2
graingert Nov 10, 2022
0383216
Filter implicit deprecation warnings from tornado as well
wence- Oct 13, 2022
82fc870
get loop from fixture
graingert Nov 10, 2022
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 continuous_integration/environment-3.10.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ dependencies:
- sortedcollections
- tblib
- toolz
- tornado<6.2
- tornado >=6.2
Copy link
Member

Choose a reason for hiding this comment

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

This seems like the version restriction we want, given what's specified in requirements.txt

Suggested change
- tornado >=6.2
- tornado >=6.0.3

Copy link
Member Author

Choose a reason for hiding this comment

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

if the restriction doesn't require >=6.2 in the environment then it follows what's currently released for the distributed package

Copy link
Member

Choose a reason for hiding this comment

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

I think the problem we're having here is that all python versions are now testing against 6.2 but we're not testing against 6.0.3 anymore, are we?

I'm fine with this for now if we add <6.2 to #7285

Copy link
Member

Choose a reason for hiding this comment

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

I think the problem we're having here is that all python versions are now testing against 6.2 but we're not testing against 6.0.3 anymore, are we?

Yeah, that's what I was wanting to avoid.

I'm fine with this for now if we add <6.2 to #7285

Yep, I think the mindeps build will be the long term answer for testing against our lowest supported minimum version.

FWIW I didn't mean for this comment to be majorly blocking. @graingert if you and @fjetter are happy with things as they are, that's fine by me.

- zict # overridden by git tip below
- zstandard >=0.9.0
- pip:
Expand Down
2 changes: 1 addition & 1 deletion continuous_integration/environment-3.8.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ dependencies:
- sortedcollections
- tblib
- toolz
- tornado<6.2
- tornado >=6.2
- zict
- zstandard >=0.9.0
- pip:
Expand Down
2 changes: 1 addition & 1 deletion continuous_integration/environment-3.9.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ dependencies:
- tblib
- toolz
- torchvision # Only tested here
- tornado<6.2
- tornado >=6.2
- zict
- zstandard >=0.9.0
- pip:
Expand Down
1 change: 1 addition & 0 deletions distributed/deploy/tests/test_adaptive.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,7 @@ async def test_no_more_workers_than_tasks():


@pytest.mark.filterwarnings("ignore:There is no current event loop:DeprecationWarning")
@pytest.mark.filterwarnings("ignore:make_current is deprecated:DeprecationWarning")
def test_basic_no_loop(cleanup):
loop = None
try:
Expand Down
1 change: 1 addition & 0 deletions distributed/deploy/tests/test_spec_cluster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ def test_spec_sync(loop):


@pytest.mark.filterwarnings("ignore:There is no current event loop:DeprecationWarning")
@pytest.mark.filterwarnings("ignore:make_current is deprecated:DeprecationWarning")
def test_loop_started_in_constructor(cleanup):
# test that SpecCluster.__init__ starts a loop in another thread
cluster = SpecCluster(worker_spec, scheduler=scheduler, loop=None)
Expand Down
10 changes: 7 additions & 3 deletions distributed/tests/test_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2889,6 +2889,7 @@ async def test_startup_close_startup(s, a, b):


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


@pytest.mark.filterwarnings("ignore:There is no current event loop:DeprecationWarning")
@pytest.mark.filterwarnings("ignore:make_current is deprecated:DeprecationWarning")
@pytest.mark.filterwarnings("ignore:clear_current is deprecated:DeprecationWarning")
def test_client_async_before_loop_starts(cleanup):
async def close():
async with client:
Expand Down Expand Up @@ -6590,9 +6593,9 @@ async def test_as_completed_condition_loop(c, s, a, b):
sys.version_info >= (3, 10),
reason="On Py3.10+ semaphore._loop is not bound until .acquire() blocks",
)
def test_client_connectionpool_semaphore_loop(s, a, b):
with Client(s["address"]) as c:
assert c.rpc.semaphore._loop is c.loop.asyncio_loop
def test_client_connectionpool_semaphore_loop(s, a, b, loop):
with Client(s["address"], loop=loop) as c:
assert c.rpc.semaphore._loop is loop.asyncio_loop


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


@pytest.mark.filterwarnings("ignore:There is no current event loop:DeprecationWarning")
@pytest.mark.filterwarnings("ignore:make_current is deprecated:DeprecationWarning")
@gen_cluster(client=True, nthreads=[("127.0.0.1", 1)])
async def test_get_client_functions_spawn_clusters(c, s, a):
# see gh4565
Expand Down
2 changes: 2 additions & 0 deletions distributed/tests/test_client_loop.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,15 @@ def _check_cluster_and_client_loop(loop):

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


# Test if Client stops LoopRunner on close.
@pytest.mark.filterwarnings("ignore:There is no current event loop:DeprecationWarning")
@pytest.mark.filterwarnings("ignore:make_current is deprecated:DeprecationWarning")
def test_close_loop_sync_use_running_loop(cleanup):
with _check_loop_runner():
# Start own loop or use current thread's one.
Expand Down
2 changes: 2 additions & 0 deletions distributed/tests/test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,7 @@ def assert_not_running(loop):


@pytest.mark.filterwarnings("ignore:There is no current event loop:DeprecationWarning")
@pytest.mark.filterwarnings("ignore:make_current is deprecated:DeprecationWarning")
def test_loop_runner(loop_in_thread):
# Implicit loop
loop = IOLoop()
Expand Down Expand Up @@ -490,6 +491,7 @@ def test_loop_runner(loop_in_thread):


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

Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ psutil >= 5.0
sortedcontainers !=2.0.0, !=2.0.1
tblib >= 1.6.0
toolz >= 0.10.0
tornado >= 6.0.3, <6.2
tornado >= 6.0.3
urllib3
zict >= 0.1.3
pyyaml