Skip to content

Commit

Permalink
chore: upgrade deadline-cloud version to 0.23.*
Browse files Browse the repository at this point in the history
  • Loading branch information
gahyusuh committed Sep 12, 2023
1 parent 5b57759 commit 37d8d05
Show file tree
Hide file tree
Showing 10 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ dynamic = ["version"]
dependencies = [
"requests ~= 2.29",
"boto3 ~= 1.26",
"deadline == 0.18.*",
"deadline == 0.23.*",
"openjd == 0.10.*",
# tomli became tomllib in standard library in Python 3.11
"tomli >= 1.1.0 ; python_version<'3.11'",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from threading import Event
from typing import Any, TYPE_CHECKING, Optional

from deadline.job_attachments.errors import AssetSyncCancelledError
from deadline.job_attachments.exceptions import AssetSyncCancelledError
from openjd.sessions import ActionState, ActionStatus

from ..session import Session
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from typing import Any, cast

from openjd.sessions import Parameter, ParameterType
from deadline.job_attachments.utils import AssetLoadingMethod
from deadline.job_attachments._utils import AssetLoadingMethod

from ...api_models import (
FloatParameter,
Expand Down
2 changes: 1 addition & 1 deletion src/deadline_worker_agent/sessions/session.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
Attachments,
)
from deadline.job_attachments.progress_tracker import ProgressReportMetadata
from deadline.job_attachments.utils import OperatingSystemFamily
from deadline.job_attachments._utils import OperatingSystemFamily

from ..scheduler.session_action_status import SessionActionStatus
from ..sessions.errors import SessionActionError
Expand Down
2 changes: 1 addition & 1 deletion test/unit/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from typing import Generator, Optional

from deadline.job_attachments.models import ManifestProperties, Attachments
from deadline.job_attachments.utils import AssetLoadingMethod, OperatingSystemFamily
from deadline.job_attachments._utils import AssetLoadingMethod, OperatingSystemFamily
from openjd.model import SchemaVersion
from openjd.sessions import (
Parameter,
Expand Down
2 changes: 1 addition & 1 deletion test/unit/scheduler/test_session_queue.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from unittest.mock import MagicMock, Mock, patch
from collections import OrderedDict

from deadline.job_attachments.utils import AssetLoadingMethod
from deadline.job_attachments._utils import AssetLoadingMethod
from openjd.model import SchemaVersion, UnsupportedSchema
from openjd.model.v2023_09 import (
Environment,
Expand Down
8 changes: 4 additions & 4 deletions test/unit/sessions/actions/test_sync_input_job_attachments.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from typing import Callable, TYPE_CHECKING
from unittest.mock import Mock, patch

from deadline.job_attachments.errors import AssetSyncCancelledError
from deadline.job_attachments.exceptions import AssetSyncCancelledError
from openjd.sessions import ActionState, ActionStatus
import pytest

Expand Down Expand Up @@ -207,7 +207,7 @@ def test_handles_success(
),
ids=(
"concurrent.futures.CancelledError",
"deadline.job_attachments.errors.AssetSyncCancelledError",
"deadline.job_attachments.exceptions.AssetSyncCancelledError",
),
)
def test_handles_cancelation(
Expand All @@ -220,7 +220,7 @@ def test_handles_cancelation(
"""Tests that when the future raises one of:
- concurrent.futures.CancelledError (future was canceled before starting)
- deadline.job_attachments.errors.AssetSyncCancelledError
- deadline.job_attachments.exceptions.AssetSyncCancelledError
that Session.update_action() is called with state=ActionState.CANCELED
"""
Expand Down Expand Up @@ -263,7 +263,7 @@ def test_handles_failure(
"""Tests that when the future raises one of:
- concurrent.futures.CancelledError (future was canceled before starting)
- deadline.job_attachments.errors.AssetSyncCancelledError
- deadline.job_attachments.exceptions.AssetSyncCancelledError
that Session.update_action() is called with state=ActionState.CANCELED
"""
Expand Down
2 changes: 1 addition & 1 deletion test/unit/sessions/test_job_attachment_details.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import pytest

from deadline.job_attachments.utils import AssetLoadingMethod
from deadline.job_attachments._utils import AssetLoadingMethod
from deadline_worker_agent.sessions.job_entities.job_attachment_details import JobAttachmentDetails


Expand Down
2 changes: 1 addition & 1 deletion test/unit/sessions/test_job_entities.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from typing import Generator
from unittest.mock import MagicMock, patch

from deadline.job_attachments.utils import AssetLoadingMethod
from deadline.job_attachments._utils import AssetLoadingMethod
from openjd.model import SchemaVersion
from openjd.model.v2023_09 import (
Action,
Expand Down
2 changes: 1 addition & 1 deletion test/unit/sessions/test_session.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
StepDetails,
)
from deadline.job_attachments.models import Attachments
from deadline.job_attachments.utils import AssetLoadingMethod
from deadline.job_attachments._utils import AssetLoadingMethod
import deadline_worker_agent.sessions.session as session_mod


Expand Down

0 comments on commit 37d8d05

Please sign in to comment.