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.

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

feat(deps)!: update openjd-adaptor-runtime to 0.5 #108

Merged
merged 1 commit into from
Mar 6, 2024
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 hatch.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ sync = "pip install -r requirements-testing.txt"
test = "pytest --cov-config pyproject.toml {args:test}"
typing = "mypy {args:src test maya_submitter_plugin/plug-ins}"
style = [
"ruff {args:.}",
"ruff check {args:.}",
"black --check --diff {args:.}",
]
fmt = [
Expand Down
16 changes: 7 additions & 9 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ license = ""
requires-python = ">=3.7"

dependencies = [
"deadline == 0.37.*",
"openjd-adaptor-runtime == 0.4.*",
"deadline == 0.38.*",
"openjd-adaptor-runtime == 0.5.*",
]

[project.scripts]
Expand Down Expand Up @@ -72,15 +72,13 @@ mypy_path = "src"
module = ["maya.*","PySide2.*"]

[tool.ruff]
ignore = [
"E501",
]
line-length = 100

[tool.ruff.isort]
known-first-party = [
"deadline_worker_agent"
]
[tool.ruff.lint]
ignore = ["E501"]

[tool.ruff.lint.isort]
known-first-party = ["deadline_worker_agent"]

[tool.black]
line-length = 100
Expand Down
18 changes: 9 additions & 9 deletions requirements-testing.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
deadline-cloud-test-fixtures ~= 0.2.0
deadline-cloud-test-fixtures == 0.5.*
coverage[toml] == 7.*
pytest ~= 7.4
pytest-cov ~= 4.1
pytest-xdist ~= 3.5
twine ~= 4.0
mypy ~= 1.8
black ~= 23.12
ruff ~= 0.1.11
moto[s3,sts] ~= 4.2
pytest == 7.*
pytest-cov == 4.*
pytest-xdist == 3.*
twine == 5.*
mypy == 1.*
black == 24.*
ruff == 0.3.*
moto[s3,sts] == 4.*
12 changes: 8 additions & 4 deletions src/deadline/maya_adaptor/MayaAdaptor/adaptor.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from pathlib import Path
from typing import Callable

from openjd.adaptor_runtime.adaptors import Adaptor, AdaptorDataValidators
from openjd.adaptor_runtime.adaptors import Adaptor, AdaptorDataValidators, SemanticVersion
from openjd.adaptor_runtime_client import Action
from openjd.adaptor_runtime.adaptors.configuration import AdaptorConfiguration
from openjd.adaptor_runtime.process import LoggingSubprocess
Expand Down Expand Up @@ -80,6 +80,10 @@ class MayaAdaptor(Adaptor[AdaptorConfiguration]):
_exc_info: Exception | None = None
_performing_cleanup = False

@property
def integration_data_interface_version(self) -> SemanticVersion:
return SemanticVersion(major=0, minor=1)

@staticmethod
def _get_timer(timeout: int | float) -> Callable[[], bool]:
"""Given a timeout length, returns a lambda which returns True until the timeout occurs"""
Expand Down Expand Up @@ -330,9 +334,9 @@ def _start_maya_client(self) -> None:
deadline_namespace_dir = os.path.dirname(os.path.dirname(deadline.maya_adaptor.__file__))
python_path_addition = f"{openjd_namespace_dir}{os.pathsep}{deadline_namespace_dir}"
if "PYTHONPATH" in os.environ:
os.environ[
"PYTHONPATH"
] = f"{os.environ['PYTHONPATH']}{os.pathsep}{python_path_addition}"
os.environ["PYTHONPATH"] = (
f"{os.environ['PYTHONPATH']}{os.pathsep}{python_path_addition}"
)
else:
os.environ["PYTHONPATH"] = python_path_addition

Expand Down