Skip to content

Remove more internal references to deprecated utilities #4971

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

Merged
jrbourbeau merged 3 commits into from
Jun 24, 2021
Merged

Remove more internal references to deprecated utilities #4971

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
09bc166
Remove more internal references to deprecated utilities
jrbourbeau Jun 24, 2021
1e4c9a1
Temporarily remove utilities to ensure all reference are accounted for
jrbourbeau Jun 24, 2021
67f5362
Add deprecations back
jrbourbeau Jun 24, 2021
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
4 changes: 2 additions & 2 deletions distributed/dashboard/components/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

from distributed import profile
from distributed.dashboard.utils import BOKEH_VERSION, without_property_validation
from distributed.utils import log_errors, parse_timedelta
from distributed.utils import log_errors

if dask.config.get("distributed.dashboard.export-tool"):
from distributed.dashboard.export_tool import ExportTool
Expand All @@ -39,7 +39,7 @@


profile_interval = dask.config.get("distributed.worker.profile.interval")
profile_interval = parse_timedelta(profile_interval, default="ms")
profile_interval = dask.utils.parse_timedelta(profile_interval, default="ms")


class DashboardComponent:
Expand Down
4 changes: 2 additions & 2 deletions distributed/dashboard/components/scheduler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

import dask
from dask import config
from dask.utils import format_bytes, key_split
from dask.utils import format_bytes, format_time, key_split, parse_timedelta

try:
import numpy as np
Expand All @@ -70,7 +70,7 @@
from distributed.diagnostics.task_stream import color_of as ts_color_of
from distributed.diagnostics.task_stream import colors as ts_color_lookup
from distributed.metrics import time
from distributed.utils import Log, format_time, log_errors, parse_timedelta
from distributed.utils import Log, log_errors

if dask.config.get("distributed.dashboard.export-tool"):
from distributed.dashboard.export_tool import ExportTool
Expand Down
4 changes: 2 additions & 2 deletions distributed/dashboard/components/shared.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
update,
without_property_validation,
)
from distributed.utils import log_errors, parse_timedelta
from distributed.utils import log_errors

if dask.config.get("distributed.dashboard.export-tool"):
from distributed.dashboard.export_tool import ExportTool
Expand All @@ -37,7 +37,7 @@


profile_interval = dask.config.get("distributed.worker.profile.interval")
profile_interval = parse_timedelta(profile_interval, default="ms")
profile_interval = dask.utils.parse_timedelta(profile_interval, default="ms")


class Processing(DashboardComponent):
Expand Down
4 changes: 2 additions & 2 deletions distributed/dashboard/components/worker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
from bokeh.themes import Theme
from tlz import merge, partition_all

from dask.utils import format_bytes
from dask.utils import format_bytes, format_time

from distributed.dashboard.components import add_periodic_callback
from distributed.dashboard.components.shared import (
Expand All @@ -32,7 +32,7 @@
from distributed.dashboard.utils import transpose, update, without_property_validation
from distributed.diagnostics.progress_stream import color_of
from distributed.metrics import time
from distributed.utils import format_time, key_split, log_errors
from distributed.utils import key_split, log_errors

logger = logging.getLogger(__name__)

Expand Down
3 changes: 2 additions & 1 deletion distributed/diagnostics/task_stream.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
from collections import deque

import dask
from dask.utils import format_time, parse_timedelta

from ..metrics import time
from ..utils import format_time, key_split, parse_timedelta
from ..utils import key_split
from .plugin import SchedulerPlugin
from .progress_stream import color_of

Expand Down
4 changes: 2 additions & 2 deletions distributed/http/scheduler/info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
from tornado import escape
from tornado.websocket import WebSocketHandler

from dask.utils import format_bytes
from dask.utils import format_bytes, format_time

from ...diagnostics.websocket import WebsocketPlugin
from ...metrics import time
from ...utils import format_time, log_errors
from ...utils import log_errors
from ..utils import RequestHandler, redirect

ns = {
Expand Down