Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-24 21:04:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merged in bugfix/2.0/fix-PYPE_ROOT (pull request #125)

Browse source 
fix(setup): fixed PYPE_SETUP_ROOT -> PYPE_ROOT

Approved-by: Milan Kolar <milan@orbi.tools>
This commit is contained in:
Ondřej Samohel 2019-04-26 13:17:51 +00:00 • committed by Milan Kolar
commit f652ca4c7a
5 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pype/aport/api.py
View file

@ -56,7 +56,7 @@ def publish(json_data_path, gui):
log.info("avalon.session is: \n{}".format(SESSION))
pype_start = os.path.join(os.getenv('PYPE_SETUP_ROOT'),
pype_start = os.path.join(os.getenv('PYPE_ROOT'),
"app", "pype-start.py")
publish = "--publish-gui" if gui else "--publish"

2
pype/aport/original/api.py
View file

@ -56,7 +56,7 @@ def publish(json_data_path, staging_dir=None):
return_json_path = os.path.join(staging_dir, "return_data.json")
log.info("avalon.session is: \n{}".format(SESSION))
pype_start = os.path.join(os.getenv('PYPE_SETUP_ROOT'),
pype_start = os.path.join(os.getenv('PYPE_ROOT'),
"app", "pype-start.py")
args = [pype_start, "--publish",

2
pype/aport/original/pipeline.py
View file

@ -55,7 +55,7 @@ def publish(json_data_path, staging_dir=None):
return_json_path = os.path.join(staging_dir, "return_data.json")
log.debug("avalon.session is: \n{}".format(SESSION))
pype_start = os.path.join(os.getenv('PYPE_SETUP_ROOT'),
pype_start = os.path.join(os.getenv('PYPE_ROOT'),
"app", "pype-start.py")
args = [pype_start, "--publish",

2
pype/clockify/widget_settings.py
View file

@ -26,7 +26,7 @@ class ClockifySettings(QtWidgets.QWidget):
elif hasattr(parent, 'parent') and hasattr(parent.parent, 'icon'):
self.setWindowIcon(self.parent.parent.icon)
else:
pype_setup = os.getenv('PYPE_SETUP_ROOT')
pype_setup = os.getenv('PYPE_ROOT')
items = [pype_setup, "app", "resources", "icon.png"]
fname = os.path.sep.join(items)
icon = QtGui.QIcon(fname)

2
pype/ftrack/login_dialog.py
View file

@ -28,7 +28,7 @@ class Login_Dialog_ui(QtWidgets.QWidget):
elif hasattr(parent, 'parent') and hasattr(parent.parent, 'icon'):
self.setWindowIcon(self.parent.parent.icon)
else:
pype_setup = os.getenv('PYPE_SETUP_ROOT')
pype_setup = os.getenv('PYPE_ROOT')
items = [pype_setup, "app", "resources", "icon.png"]
fname = os.path.sep.join(items)
icon = QtGui.QIcon(fname)