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

Jump to bottom

Fix: DL on MacOS #4418

Merged
merged 7 commits into from
Feb 9, 2023
Merged

Fix: DL on MacOS #4418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f7fd0a5
OP-4513 - fix for DL on MacOS
kalisp Feb 2, 2023
4a963e9
OP-4513 - fix valid logic
kalisp Feb 2, 2023
d1a8744
OP-4513 - better logging
kalisp Feb 2, 2023
63912a0
OP-4513 - fix selection of openpype_console on Mac
kalisp Feb 2, 2023
707c165
OP-4513 - fix copy and paste artifact on MacOS
kalisp Feb 2, 2023
91e1d28
OP-4513 - platform specific logic
kalisp Feb 8, 2023
3ac0a1c
OP-4513 - fix Openpype plugin for MacOS
kalisp Feb 9, 2023
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
16 changes: 11 additions & 5 deletions openpype/modules/deadline/repository/custom/plugins/GlobalJobPreLoad.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def __init__(self, major, minor, patch, prerelease, origin=None):
self.prerelease = prerelease

is_valid = True
if not major or not minor or not patch:
if major is None or minor is None or patch is None:
is_valid = False
self.is_valid = is_valid

Expand Down Expand Up @@ -157,7 +157,7 @@ def get_openpype_version_from_path(path, build=True):

# fix path for application bundle on macos
if platform.system().lower() == "darwin":
path = os.path.join(path, "Contents", "MacOS", "lib", "Python")
path = os.path.join(path, "MacOS")

version_file = os.path.join(path, "openpype", "version.py")
if not os.path.isfile(version_file):
Expand Down Expand Up @@ -189,6 +189,11 @@ def get_openpype_executable():
exe_list = config.GetConfigEntryWithDefault("OpenPypeExecutable", "")
dir_list = config.GetConfigEntryWithDefault(
"OpenPypeInstallationDirs", "")

# clean '\ ' for MacOS pasting
if platform.system().lower() == "darwin":
exe_list = exe_list.replace("\\ ", " ")
dir_list = dir_list.replace("\\ ", " ")
return exe_list, dir_list


Expand Down Expand Up @@ -218,8 +223,8 @@ def get_requested_openpype_executable(
requested_version_obj = OpenPypeVersion.from_string(requested_version)
if not requested_version_obj:
print((
">>> Requested version does not match version regex \"{}\""
).format(VERSION_REGEX))
">>> Requested version '{}' does not match version regex '{}'"
).format(requested_version, VERSION_REGEX))
return None

print((
Expand Down Expand Up @@ -272,7 +277,8 @@ def get_requested_openpype_executable(
# Deadline decide.
exe_list = [
os.path.join(version_dir, "openpype_console.exe"),
os.path.join(version_dir, "openpype_console")
os.path.join(version_dir, "openpype_console"),
os.path.join(version_dir, "MacOS", "openpype_console")
]
return FileUtils.SearchFileList(";".join(exe_list))

Expand Down
14 changes: 11 additions & 3 deletions openpype/modules/deadline/repository/custom/plugins/OpenPype/OpenPype.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def get_openpype_version_from_path(path, build=True):
"""
# fix path for application bundle on macos
if platform.system().lower() == "darwin":
path = os.path.join(path, "Contents", "MacOS", "lib", "Python")
path = os.path.join(path, "MacOS")

version_file = os.path.join(path, "openpype", "version.py")
if not os.path.isfile(version_file):
Expand Down Expand Up @@ -107,8 +107,11 @@ def RenderExecutable(self):
"Scanning for compatible requested "
f"version {requested_version}"))
dir_list = self.GetConfigEntry("OpenPypeInstallationDirs")
# clean '\ ' for MacOS pasting
if platform.system().lower() == "darwin":
dir_list = dir_list.replace("\\ ", " ")
install_dir = DirectoryUtils.SearchDirectoryList(dir_list)
if dir:
if install_dir:
sub_dirs = [
f.path for f in os.scandir(install_dir)
if f.is_dir()
Expand All @@ -120,6 +123,9 @@ def RenderExecutable(self):
openpype_versions.append((version, subdir))

exe_list = self.GetConfigEntry("OpenPypeExecutable")
# clean '\ ' for MacOS pasting
if platform.system().lower() == "darwin":
exe_list = exe_list.replace("\\ ", " ")
exe = FileUtils.SearchFileList(exe_list)
if openpype_versions:
# if looking for requested compatible version,
Expand Down Expand Up @@ -161,7 +167,9 @@ def RenderExecutable(self):
os.path.join(
compatible_versions[-1][1], "openpype_console.exe"),
os.path.join(
compatible_versions[-1][1], "openpype_console")
compatible_versions[-1][1], "openpype_console"),
os.path.join(
compatible_versions[-1][1], "MacOS", "openpype_console")
]
exe = FileUtils.SearchFileList(";".join(exe_list))

Expand Down