From abdf4a1f99d566bca8183aae907f1b60d09a95ae Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Thu, 1 Apr 2021 14:10:43 +0200 Subject: [PATCH 01/10] changed environments in start.py --- start.py | 64 ++++++++++++++++++++++++++++++-------------------------- 1 file changed, 34 insertions(+), 30 deletions(-) diff --git a/start.py b/start.py index 8d60a14403..ba46d539ca 100644 --- a/start.py +++ b/start.py @@ -281,7 +281,7 @@ def _process_arguments() -> tuple: def _determine_mongodb() -> str: """Determine mongodb connection string. - First use ``PYPE_MONGO`` environment variable, then system keyring. + First use ``OPENPYPE_MONGO`` environment variable, then system keyring. Then try to run **Igniter UI** to let user specify it. Returns: @@ -292,7 +292,7 @@ def _determine_mongodb() -> str: """ - pype_mongo = os.getenv("PYPE_MONGO", None) + pype_mongo = os.getenv("OPENPYPE_MONGO", None) if not pype_mongo: # try system keyring try: @@ -313,23 +313,23 @@ def _determine_mongodb() -> str: def _initialize_environment(pype_version: PypeVersion) -> None: version_path = pype_version.path - os.environ["PYPE_VERSION"] = pype_version.version + os.environ["OPENPYPE_VERSION"] = pype_version.version # set PYPE_ROOT to point to currently used Pype version. - os.environ["PYPE_ROOT"] = os.path.normpath(version_path.as_posix()) + os.environ["OPENPYPE_ROOT"] = os.path.normpath(version_path.as_posix()) # inject version to Python environment (sys.path, ...) print(">>> Injecting Pype version to running environment ...") bootstrap.add_paths_from_directory(version_path) - # Additional sys paths related to PYPE_ROOT directory - # TODO move additional paths to `boot` part when PYPE_ROOT will point + # Additional sys paths related to OPENPYPE_ROOT directory + # TODO move additional paths to `boot` part when OPENPYPE_ROOT will point # to same hierarchy from code and from frozen pype additional_paths = [ # add pype tools - os.path.join(os.environ["PYPE_ROOT"], "pype", "pype", "tools"), + os.path.join(os.environ["OPENPYPE_ROOT"], "pype", "pype", "tools"), # add common pype vendor # (common for multiple Python interpreter versions) os.path.join( - os.environ["PYPE_ROOT"], + os.environ["OPENPYPE_ROOT"], "pype", "pype", "vendor", @@ -338,7 +338,7 @@ def _initialize_environment(pype_version: PypeVersion) -> None: ) ] - split_paths = os.getenv("PYTHONPATH", "").split(os.pathsep) + split_paths = os.getenv("OPENPYTHONPATH", "").split(os.pathsep) for path in additional_paths: split_paths.insert(0, path) sys.path.insert(0, path) @@ -351,7 +351,7 @@ def _find_frozen_pype(use_version: str = None, """Find Pype to run from frozen code. This will process and modify environment variables: - ``PYTHONPATH``, ``PYPE_VERSION``, ``PYPE_ROOT`` + ``PYTHONPATH``, ``OPENPYPE_VERSION``, ``OPENPYPE_ROOT`` Args: use_version (str, optional): Try to use specified version. @@ -368,7 +368,7 @@ def _find_frozen_pype(use_version: str = None, pype_version = None pype_versions = bootstrap.find_pype(include_zips=True, staging=use_staging) - if not os.getenv("PYPE_TRYOUT"): + if not os.getenv("OPENPYPE_TRYOUT"): try: # use latest one found (last in the list is latest) pype_version = pype_versions[-1] @@ -399,7 +399,7 @@ def _find_frozen_pype(use_version: str = None, if not pype_versions: # no Pype versions found anyway, lets use then the one # shipped with frozen Pype - if not os.getenv("PYPE_TRYOUT"): + if not os.getenv("OPENPYPE_TRYOUT"): print("*** Still no luck finding Pype.") print(("*** We'll try to use the one coming " "with Pype installation.")) @@ -476,7 +476,7 @@ def _bootstrap_from_code(use_version): # get current version of Pype local_version = bootstrap.get_local_live_version() - os.environ["PYPE_VERSION"] = local_version + os.environ["OPENPYPE_VERSION"] = local_version if use_version and use_version != local_version: pype_versions = bootstrap.find_pype(include_zips=True) version_path = BootstrapRepos.get_version_path_from_list( @@ -484,10 +484,10 @@ def _bootstrap_from_code(use_version): if version_path: # use specified bootstrap.add_paths_from_directory(version_path) - os.environ["PYPE_VERSION"] = use_version + os.environ["OPENPYPE_VERSION"] = use_version else: version_path = pype_root - os.environ["PYPE_ROOT"] = pype_root + os.environ["OPENPYPE_ROOT"] = pype_root repos = os.listdir(os.path.join(pype_root, "repos")) repos = [os.path.join(pype_root, "repos", repo) for repo in repos] # add self to python paths @@ -505,15 +505,19 @@ def _bootstrap_from_code(use_version): # in case when we are running without any version installed. if not getattr(sys, 'frozen', False): split_paths.append(site.getsitepackages()[-1]) - # TODO move additional paths to `boot` part when PYPE_ROOT will point - # to same hierarchy from code and from frozen pype + # TODO move additional paths to `boot` part when OPENPYPE_ROOT will + # point to same hierarchy from code and from frozen pype additional_paths = [ # add pype tools - os.path.join(os.environ["PYPE_ROOT"], "pype", "tools"), + os.path.join(os.environ["OPENPYPE_ROOT"], "pype", "tools"), # add common pype vendor # (common for multiple Python interpreter versions) os.path.join( - os.environ["PYPE_ROOT"], "pype", "vendor", "python", "common" + os.environ["OPENPYPE_ROOT"], + "pype", + "vendor", + "python", + "common" ) ] for path in additional_paths: @@ -555,7 +559,7 @@ def boot(): print(f"!!! {e}") sys.exit(1) - os.environ["PYPE_MONGO"] = pype_mongo + os.environ["OPENPYPE_MONGO"] = pype_mongo # ------------------------------------------------------------------------ # Set environments - load Pype path from database (if set) @@ -563,15 +567,15 @@ def boot(): # set PYPE_ROOT to running location until proper version can be # determined. if getattr(sys, 'frozen', False): - os.environ["PYPE_ROOT"] = os.path.dirname(sys.executable) + os.environ["OPENPYPE_ROOT"] = os.path.dirname(sys.executable) else: - os.environ["PYPE_ROOT"] = os.path.dirname(__file__) + os.environ["OPENPYPE_ROOT"] = os.path.dirname(__file__) # Get Pype path from database and set it to environment so Pype can # find its versions there and bootstrap them. pype_path = get_pype_path_from_db(pype_mongo) - if not os.getenv("PYPE_PATH") and pype_path: - os.environ["PYPE_PATH"] = pype_path + if not os.getenv("OPENPYPE_PATH") and pype_path: + os.environ["OPENPYPE_PATH"] = pype_path # ------------------------------------------------------------------------ # Find Pype versions @@ -590,13 +594,13 @@ def boot(): # set this to point either to `python` from venv in case of live code # or to `pype` or `pype_console` in case of frozen code - os.environ["PYPE_EXECUTABLE"] = sys.executable + os.environ["OPENPYPE_EXECUTABLE"] = sys.executable if getattr(sys, 'frozen', False): - os.environ["PYPE_REPOS_ROOT"] = os.environ["PYPE_ROOT"] + os.environ["OPENPYPE_REPOS_ROOT"] = os.environ["OPENPYPE_ROOT"] else: - os.environ["PYPE_REPOS_ROOT"] = os.path.join( - os.environ["PYPE_ROOT"], "repos") + os.environ["OPENPYPE_REPOS_ROOT"] = os.path.join( + os.environ["OPENPYPE_ROOT"], "repos") # delete Pype module and it's submodules from cache so it is used from # specific version @@ -624,7 +628,7 @@ def boot(): set_modules_environments() from pype import cli - from pype.lib import terminal as t + from pype.lib import terminal as t from pype.version import __version__ assert version_path, "Version path not defined." @@ -667,7 +671,7 @@ def get_info() -> list: inf.append(("Pype variant", "staging")) else: inf.append(("Pype variant", "production")) - inf.append(("Running pype from", os.environ.get('PYPE_ROOT'))) + inf.append(("Running pype from", os.environ.get('OPENPYPE_ROOT'))) inf.append(("Using mongodb", components["host"])) if os.environ.get("FTRACK_SERVER"): From c26f3ff8c74e6c39cd771ab4ff8e1fb0ec94d7c0 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Thu, 1 Apr 2021 14:14:11 +0200 Subject: [PATCH 02/10] changed prefixes in igniter --- igniter/bootstrap_repos.py | 12 ++++++------ igniter/install_dialog.py | 5 ++++- igniter/install_thread.py | 10 +++++----- igniter/user_settings.py | 4 ++-- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/igniter/bootstrap_repos.py b/igniter/bootstrap_repos.py index 58d59afe88..ec980805be 100644 --- a/igniter/bootstrap_repos.py +++ b/igniter/bootstrap_repos.py @@ -625,7 +625,7 @@ class BootstrapRepos: Resolution order for Pype is following: - 1) First we test for ``PYPE_PATH`` environment variable + 1) First we test for ``OPENPYPE_PATH`` environment variable 2) We try to find ``pypePath`` in registry setting 3) We use user data directory @@ -660,9 +660,9 @@ class BootstrapRepos: if pype_path: dir_to_search = pype_path else: - if os.getenv("PYPE_PATH"): - if Path(os.getenv("PYPE_PATH")).exists(): - dir_to_search = Path(os.getenv("PYPE_PATH")) + if os.getenv("OPENPYPE_PATH"): + if Path(os.getenv("OPENPYPE_PATH")).exists(): + dir_to_search = Path(os.getenv("OPENPYPE_PATH")) else: try: registry_dir = Path( @@ -688,7 +688,7 @@ class BootstrapRepos: """Process user entered location string. It decides if location string is mongodb url or path. - If it is mongodb url, it will connect and load ``PYPE_PATH`` from + If it is mongodb url, it will connect and load ``OPENPYPE_PATH`` from there and use it as path to Pype. In it is _not_ mongodb url, it is assumed we have a path, this is tested and zip file is produced and installed using :meth:`create_version_from_live_code`. @@ -706,7 +706,7 @@ class BootstrapRepos: if location.startswith("mongodb"): pype_path = get_pype_path_from_db(location) if not pype_path: - self._print("cannot find PYPE_PATH in settings.") + self._print("cannot find OPENPYPE_PATH in settings.") return None # if not successful, consider location to be fs path. diff --git a/igniter/install_dialog.py b/igniter/install_dialog.py index 0eb518c2e3..15b9683639 100644 --- a/igniter/install_dialog.py +++ b/igniter/install_dialog.py @@ -46,7 +46,10 @@ class InstallDialog(QtWidgets.QDialog): self.mongo_url = "" try: - self.mongo_url = os.getenv("PYPE_MONGO", "") or self.registry.get_secure_item("pypeMongo") # noqa: E501 + self.mongo_url = ( + os.getenv("OPENPYPE_MONGO", "") + or self.registry.get_secure_item("pypeMongo") + ) except ValueError: pass diff --git a/igniter/install_thread.py b/igniter/install_thread.py index a184a19d36..b0da4c9f0d 100644 --- a/igniter/install_thread.py +++ b/igniter/install_thread.py @@ -68,7 +68,7 @@ class InstallThread(QThread): # user did not entered url if not self._mongo: # it not set in environment - if not os.getenv("PYPE_MONGO"): + if not os.getenv("OPENPYPE_MONGO"): # try to get it from settings registry try: self._mongo = bs.registry.get_secure_item("pypeMongo") @@ -78,12 +78,12 @@ class InstallThread(QThread): self.finished.emit(InstallResult(-1)) return else: - self._mongo = os.getenv("PYPE_MONGO") + self._mongo = os.getenv("OPENPYPE_MONGO") else: self.message.emit("Saving mongo connection string ...", False) bs.registry.set_secure_item("pypeMongo", self._mongo) - os.environ["PYPE_MONGO"] = self._mongo + os.environ["OPENPYPE_MONGO"] = self._mongo self.message.emit( f"Detecting installed Pype versions in {bs.data_dir}", False) @@ -160,7 +160,7 @@ class InstallThread(QThread): return else: # if we have mongo connection string, validate it, set it to - # user settings and get PYPE_PATH from there. + # user settings and get OPENPYPE_PATH from there. if self._mongo: if not validate_mongo_connection(self._mongo): self.message.emit( @@ -168,7 +168,7 @@ class InstallThread(QThread): self.finished.emit(InstallResult(-1)) return bs.registry.set_secure_item("pypeMongo", self._mongo) - os.environ["PYPE_MONGO"] = self._mongo + os.environ["OPENPYPE_MONGO"] = self._mongo self.message.emit(f"processing {self._path}", True) repo_file = bs.process_entered_location(self._path) diff --git a/igniter/user_settings.py b/igniter/user_settings.py index 00ce68cb0b..b0c2ac2370 100644 --- a/igniter/user_settings.py +++ b/igniter/user_settings.py @@ -211,7 +211,7 @@ class IniSettingRegistry(ASettingRegistry): # type: (str, str) -> IniSettingRegistry super(IniSettingRegistry, self).__init__(name) # get registry file - version = os.getenv("PYPE_VERSION", "N/A") + version = os.getenv("OPENPYPE_VERSION", "N/A") self._registry_file = os.path.join(path, "{}.ini".format(name)) if not os.path.exists(self._registry_file): with open(self._registry_file, mode="w") as cfg: @@ -367,7 +367,7 @@ class JSONSettingRegistry(ASettingRegistry): now = datetime.now().strftime("%d/%m/%Y %H:%M:%S") header = { "__metadata__": { - "pype-version": os.getenv("PYPE_VERSION", "N/A"), + "pype-version": os.getenv("OPENPYPE_VERSION", "N/A"), "generated": now }, "registry": {} From 3b72dc9f5e320e566d0e3384ae57c9fa8cc684f7 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Thu, 1 Apr 2021 14:44:19 +0200 Subject: [PATCH 03/10] modified prefix in pype.lib --- pype/lib/__init__.py | 2 +- pype/lib/abstract_submit_deadline.py | 4 ++-- pype/lib/anatomy.py | 17 +++++++++-------- pype/lib/applications.py | 2 +- pype/lib/avalon_context.py | 2 +- pype/lib/execute.py | 4 ++-- pype/lib/import_utils.py | 2 +- pype/lib/local_settings.py | 4 ++-- pype/lib/log.py | 14 +++++++------- pype/lib/mongo.py | 4 ++-- pype/lib/plugin_tools.py | 6 +++--- pype/lib/pype_info.py | 4 ++-- pype/lib/terminal.py | 9 +++++---- 13 files changed, 38 insertions(+), 36 deletions(-) diff --git a/pype/lib/__init__.py b/pype/lib/__init__.py index f4282f7ea3..49ebd699b6 100644 --- a/pype/lib/__init__.py +++ b/pype/lib/__init__.py @@ -9,7 +9,7 @@ import site # add Python version specific vendor folder site.addsitedir( os.path.join( - os.getenv("PYPE_ROOT", ""), + os.getenv("OPENPYPE_ROOT", ""), "vendor", "python", "python_{}".format(sys.version[0]))) from .terminal import Terminal diff --git a/pype/lib/abstract_submit_deadline.py b/pype/lib/abstract_submit_deadline.py index 9862f534f1..12014ddfb5 100644 --- a/pype/lib/abstract_submit_deadline.py +++ b/pype/lib/abstract_submit_deadline.py @@ -607,7 +607,7 @@ class AbstractSubmitDeadline(pyblish.api.InstancePlugin): """ if 'verify' not in kwargs: - kwargs['verify'] = False if os.getenv("PYPE_DONT_VERIFY_SSL", True) else True # noqa + kwargs['verify'] = False if os.getenv("OPENPYPE_DONT_VERIFY_SSL", True) else True # noqa # add 10sec timeout before bailing out kwargs['timeout'] = 10 return requests.post(*args, **kwargs) @@ -626,7 +626,7 @@ class AbstractSubmitDeadline(pyblish.api.InstancePlugin): """ if 'verify' not in kwargs: - kwargs['verify'] = False if os.getenv("PYPE_DONT_VERIFY_SSL", True) else True # noqa + kwargs['verify'] = False if os.getenv("OPENPYPE_DONT_VERIFY_SSL", True) else True # noqa # add 10sec timeout before bailing out kwargs['timeout'] = 10 return requests.get(*args, **kwargs) diff --git a/pype/lib/anatomy.py b/pype/lib/anatomy.py index 4e7643dbbb..4c1a183ce0 100644 --- a/pype/lib/anatomy.py +++ b/pype/lib/anatomy.py @@ -156,7 +156,7 @@ class Anatomy: return self._roots_obj def root_environments(self): - """Return PYPE_ROOT_* environments for current project in dict.""" + """Return OPENPYPE_ROOT_* environments for current project in dict.""" return self._roots_obj.root_environments() def root_environmets_fill_data(self, template=None): @@ -181,7 +181,7 @@ class Anatomy: return self.roots_obj.all_root_paths() def set_root_environments(self): - """Set PYPE_ROOT_* environments for current project.""" + """Set OPENPYPE_ROOT_* environments for current project.""" self._roots_obj.set_root_environments() def root_names(self): @@ -320,7 +320,7 @@ class Anatomy: "<{}>" ## Output - "/project/asset/task/animation_v001.ma" + "/project/asset/task/animation_v001.ma" Args: filepath (str): Full file path where root should be replaced. @@ -1359,7 +1359,7 @@ class Roots: anatomy Anatomy: Anatomy object created for a specific project. """ - env_prefix = "PYPE_PROJECT_ROOT" + env_prefix = "OPENPYPE_PROJECT_ROOT" roots_filename = "roots.json" def __init__(self, anatomy): @@ -1465,7 +1465,8 @@ class Roots: def root_environments(self): """Use root keys to create unique keys for environment variables. - Concatenates prefix "PYPE_ROOT" with root keys to create unique keys. + Concatenates prefix "OPENPYPE_ROOT" with root keys to create unique + keys. Returns: dict: Result is `{(str): (str)}` dicitonary where key represents @@ -1487,13 +1488,13 @@ class Roots: Result on windows platform:: { - "PYPE_ROOT_WORK": "P:/projects/work", - "PYPE_ROOT_PUBLISH": "P:/projects/publish" + "OPENPYPE_ROOT_WORK": "P:/projects/work", + "OPENPYPE_ROOT_PUBLISH": "P:/projects/publish" } Short example when multiroot is not used:: { - "PYPE_ROOT": "P:/projects" + "OPENPYPE_ROOT": "P:/projects" } """ return self._root_environments() diff --git a/pype/lib/applications.py b/pype/lib/applications.py index 6df296db95..4ebf34597f 100644 --- a/pype/lib/applications.py +++ b/pype/lib/applications.py @@ -1187,7 +1187,7 @@ def _prepare_last_workfile(data, workdir): file_template = anatomy.templates["work"]["file"] workdir_data.update({ "version": 1, - "user": os.environ.get("PYPE_USERNAME") or getpass.getuser(), + "user": os.environ.get("OPENPYPE_USERNAME") or getpass.getuser(), "ext": extensions[0] }) diff --git a/pype/lib/avalon_context.py b/pype/lib/avalon_context.py index d4daf22142..393b6820fa 100644 --- a/pype/lib/avalon_context.py +++ b/pype/lib/avalon_context.py @@ -1153,7 +1153,7 @@ def get_creator_by_name(creator_name, case_sensitive=False): @with_avalon def change_timer_to_current_context(): """Called after context change to change timers""" - webserver_url = os.environ.get("PYPE_WEBSERVER_URL") + webserver_url = os.environ.get("OPENPYPE_WEBSERVER_URL") if not webserver_url: log.warning("Couldn't find webserver url") return diff --git a/pype/lib/execute.py b/pype/lib/execute.py index f815d05f1b..441dcfa754 100644 --- a/pype/lib/execute.py +++ b/pype/lib/execute.py @@ -150,13 +150,13 @@ def get_pype_execute_args(*args): It is possible to pass any arguments that will be added after pype executables. """ - pype_executable = os.environ["PYPE_EXECUTABLE"] + pype_executable = os.environ["OPENPYPE_EXECUTABLE"] pype_args = [pype_executable] executable_filename = os.path.basename(pype_executable) if "python" in executable_filename.lower(): pype_args.append( - os.path.join(os.environ["PYPE_ROOT"], "start.py") + os.path.join(os.environ["OPENPYPE_ROOT"], "start.py") ) if args: diff --git a/pype/lib/import_utils.py b/pype/lib/import_utils.py index 5c832a925c..5fca0ae5f9 100644 --- a/pype/lib/import_utils.py +++ b/pype/lib/import_utils.py @@ -8,7 +8,7 @@ log = Logger().get_logger(__name__) def discover_host_vendor_module(module_name): host = os.environ["AVALON_APP"] - pype_root = os.environ["PYPE_ROOT"] + pype_root = os.environ["OPENPYPE_ROOT"] main_module = module_name.split(".")[0] module_path = os.path.join( pype_root, "hosts", host, "vendor", main_module) diff --git a/pype/lib/local_settings.py b/pype/lib/local_settings.py index aa372a52d2..a26d08a4de 100644 --- a/pype/lib/local_settings.py +++ b/pype/lib/local_settings.py @@ -213,7 +213,7 @@ class IniSettingRegistry(ASettingRegistry): # type: (str, str) -> IniSettingRegistry super(IniSettingRegistry, self).__init__(name) # get registry file - version = os.getenv("PYPE_VERSION", "N/A") + version = os.getenv("OPENPYPE_VERSION", "N/A") self._registry_file = os.path.join(path, "{}.ini".format(name)) if not os.path.exists(self._registry_file): with open(self._registry_file, mode="w") as cfg: @@ -369,7 +369,7 @@ class JSONSettingRegistry(ASettingRegistry): now = datetime.now().strftime("%d/%m/%Y %H:%M:%S") header = { "__metadata__": { - "pype-version": os.getenv("PYPE_VERSION", "N/A"), + "pype-version": os.getenv("OPENPYPE_VERSION", "N/A"), "generated": now }, "registry": {} diff --git a/pype/lib/log.py b/pype/lib/log.py index f6e95eea8a..9675637700 100644 --- a/pype/lib/log.py +++ b/pype/lib/log.py @@ -1,11 +1,11 @@ """ Logging to console and to mongo. For mongo logging, you need to set either -``PYPE_LOG_MONGO_URL`` to something like: +``OPENPYPE_LOG_MONGO_URL`` to something like: .. example:: mongo://user:password@hostname:port/database/collection?authSource=avalon -or set ``PYPE_LOG_MONGO_HOST`` and other variables. +or set ``OPENPYPE_LOG_MONGO_HOST`` and other variables. See :func:`_mongo_settings` Best place for it is in ``repos/pype-config/environments/global.json`` @@ -207,7 +207,7 @@ class PypeLogger: # Collection name under database in Mongo log_collection_name = "logs" - # PYPE_DEBUG + # OPENPYPE_DEBUG pype_debug = 0 # Data same for all record documents @@ -335,7 +335,7 @@ class PypeLogger: # like Ftrack event server has 3 other subprocesses that should # use same mongo id if use_mongo_logging: - mongo_id = os.environ.pop("PYPE_PROCESS_MONGO_ID", None) + mongo_id = os.environ.pop("OPENPYPE_PROCESS_MONGO_ID", None) if not mongo_id: # Create new object id mongo_id = ObjectId() @@ -347,11 +347,11 @@ class PypeLogger: # Store result to class definition cls.use_mongo_logging = use_mongo_logging - # Define if is in PYPE_DEBUG mode - cls.pype_debug = int(os.getenv("PYPE_DEBUG") or "0") + # Define if is in OPENPYPE_DEBUG mode + cls.pype_debug = int(os.getenv("OPENPYPE_DEBUG") or "0") # Mongo URL where logs will be stored - cls.log_mongo_url = os.environ.get("PYPE_MONGO") + cls.log_mongo_url = os.environ.get("OPENPYPE_MONGO") if not cls.log_mongo_url: cls.use_mongo_logging = False diff --git a/pype/lib/mongo.py b/pype/lib/mongo.py index 3ee43bb934..edb52a29ab 100644 --- a/pype/lib/mongo.py +++ b/pype/lib/mongo.py @@ -77,7 +77,7 @@ def compose_url(scheme=None, def get_default_components(): - mongo_url = os.environ.get("PYPE_MONGO") + mongo_url = os.environ.get("OPENPYPE_MONGO") if mongo_url is None: raise MongoEnvNotSet( "URL for Mongo logging connection is not set." @@ -139,7 +139,7 @@ class PypeMongoConnection: @staticmethod def get_default_mongo_url(): - return os.environ["PYPE_MONGO"] + return os.environ["OPENPYPE_MONGO"] @classmethod def get_mongo_client(cls, mongo_url=None): diff --git a/pype/lib/plugin_tools.py b/pype/lib/plugin_tools.py index 0f3a0a2838..f352f134d0 100644 --- a/pype/lib/plugin_tools.py +++ b/pype/lib/plugin_tools.py @@ -235,7 +235,7 @@ def oiio_supported(): Returns: (bool) """ - oiio_path = os.getenv("PYPE_OIIO_PATH", "") + oiio_path = os.getenv("OPENPYPE_OIIO_PATH", "") if not oiio_path or not os.path.exists(oiio_path): log.debug("OIIOTool is not configured or not present at {}". format(oiio_path)) @@ -269,7 +269,7 @@ def decompress(target_dir, file_url, (int(input_frame_end) > int(input_frame_start)) oiio_cmd = [] - oiio_cmd.append(os.getenv("PYPE_OIIO_PATH")) + oiio_cmd.append(os.getenv("OPENPYPE_OIIO_PATH")) oiio_cmd.append("--compression none") @@ -328,7 +328,7 @@ def should_decompress(file_url): """ if oiio_supported(): output = run_subprocess([ - os.getenv("PYPE_OIIO_PATH"), + os.getenv("OPENPYPE_OIIO_PATH"), "--info", "-v", file_url]) return "compression: \"dwaa\"" in output or \ "compression: \"dwab\"" in output diff --git a/pype/lib/pype_info.py b/pype/lib/pype_info.py index cbcc5811a0..d9e810e556 100644 --- a/pype/lib/pype_info.py +++ b/pype/lib/pype_info.py @@ -28,8 +28,8 @@ def get_pype_info(): "version": get_pype_version(), "version_type": version_type, "executable": executable_args[-1], - "pype_root": os.environ["PYPE_ROOT"], - "mongo_url": os.environ["PYPE_MONGO"] + "pype_root": os.environ["OPENPYPE_ROOT"], + "mongo_url": os.environ["OPENPYPE_MONGO"] } diff --git a/pype/lib/terminal.py b/pype/lib/terminal.py index 51b0bcebd6..9e9bfa9790 100644 --- a/pype/lib/terminal.py +++ b/pype/lib/terminal.py @@ -21,7 +21,7 @@ class Terminal: If :mod:`Colorama` is not found, it will still work, but without colors. Depends on :mod:`Colorama` - Using **PYPE_LOG_NO_COLORS** environment variable. + Using **OPENPYPE_LOG_NO_COLORS** environment variable. """ # Is Terminal initialized @@ -38,7 +38,8 @@ class Terminal: """Initialize Terminal class as object. First check if colorized output is disabled by environment variable - `PYPE_LOG_NO_COLORS` value. By default is colorized output turned on. + `OPENPYPE_LOG_NO_COLORS` value. By default is colorized output turned + on. Then tries to import python module that do the colors magic and create it's terminal object. Colorized output is not used if import of python @@ -49,7 +50,7 @@ class Terminal: from pype.lib import env_value_to_bool use_colors = env_value_to_bool( - "PYPE_LOG_NO_COLORS", default=Terminal.use_colors + "OPENPYPE_LOG_NO_COLORS", default=Terminal.use_colors ) if not use_colors: Terminal.use_colors = use_colors @@ -166,7 +167,7 @@ class Terminal: def log(message): """Return color formatted message. - If environment variable `PYPE_LOG_NO_COLORS` is set to + If environment variable `OPENPYPE_LOG_NO_COLORS` is set to whatever value, message will be formatted but not colorized. Args: From 3e0b5d4872cfc0d048a585daeb64c7e4283ae8f1 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Thu, 1 Apr 2021 14:54:26 +0200 Subject: [PATCH 04/10] removed publish_deadline script --- pype/scripts/publish_deadline.py | 38 -------------------------------- 1 file changed, 38 deletions(-) delete mode 100644 pype/scripts/publish_deadline.py diff --git a/pype/scripts/publish_deadline.py b/pype/scripts/publish_deadline.py deleted file mode 100644 index 16d097a1ea..0000000000 --- a/pype/scripts/publish_deadline.py +++ /dev/null @@ -1,38 +0,0 @@ -import os -import subprocess -import platform -import argparse - - -def __main__(): - parser = argparse.ArgumentParser() - parser.add_argument("--paths", - nargs="*", - default=[], - help="The filepaths to publish. This can be a " - "directory or a path to a .json publish " - "configuration.") - - kwargs, args = parser.parse_known_args() - pype_root = os.environ.get("PYPE_SETUP_PATH") - if not pype_root: - raise Exception("PYPE_SETUP_PATH is not set") - - # TODO: set correct path - pype_command = "pype.ps1" - if platform.system().lower() == "linux": - pype_command = "pype" - - args = [os.path.join(pype_root, pype_command), - "--node", "--publish", "--paths", kwargs.paths] - - # if we are using windows, run powershell command directly to support - # UNC paths. - if platform.system().lower() == "windows": - args = ["powershell", "-NoProfile", "-noexit", "-nologo", - "-executionPolicy bypass", "-command", - '"{}; exit $LASTEXITCODE"'.format(" ".join(args))] - - print('>>> running pype ...') - p = subprocess.call(args, shell=True) - print('<<< done [ {} ]'.format(p.returncode)) From c83a6fdec8a84aebb688bfa3ddb957c2f41cae07 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Thu, 1 Apr 2021 14:56:36 +0200 Subject: [PATCH 05/10] Added comment to export maya ass job --- pype/scripts/export_maya_ass_job.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pype/scripts/export_maya_ass_job.py b/pype/scripts/export_maya_ass_job.py index d343eec131..8d90fa00e5 100644 --- a/pype/scripts/export_maya_ass_job.py +++ b/pype/scripts/export_maya_ass_job.py @@ -1,4 +1,8 @@ -"""This module is used for command line exporting of ASS files.""" +"""This module is used for command line exporting of ASS files. + +WARNING: +This need to be rewriten to be able use it in Pype 3! +""" import os import argparse From 8e44150deb2a9e0af083a7329288871849cfb55d Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Thu, 1 Apr 2021 15:04:26 +0200 Subject: [PATCH 06/10] remove publish_filesequence which is not used anymore --- pype/scripts/publish_filesequence.py | 97 ---------------------------- 1 file changed, 97 deletions(-) delete mode 100644 pype/scripts/publish_filesequence.py diff --git a/pype/scripts/publish_filesequence.py b/pype/scripts/publish_filesequence.py deleted file mode 100644 index 905c6b99ba..0000000000 --- a/pype/scripts/publish_filesequence.py +++ /dev/null @@ -1,97 +0,0 @@ -"""This module is used for command line publishing of image sequences.""" - -import os -import sys -import argparse -import logging -import subprocess -import platform -import json - -try: - from shutil import which -except ImportError: - # we are in python < 3.3 - def which(command): - path = os.getenv('PATH') - for p in path.split(os.path.pathsep): - p = os.path.join(p, command) - if os.path.exists(p) and os.access(p, os.X_OK): - return p - -handler = logging.basicConfig() -log = logging.getLogger("Publish Image Sequences") -log.setLevel(logging.DEBUG) - -error_format = "Failed {plugin.__name__}: {error} -- {error.traceback}" - - -def __main__(): - parser = argparse.ArgumentParser() - parser.add_argument("--paths", - nargs="*", - default=[], - help="The filepaths to publish. This can be a " - "directory or a path to a .json publish " - "configuration.") - parser.add_argument("--gui", - default=False, - action="store_true", - help="Whether to run Pyblish in GUI mode.") - - parser.add_argument("--pype", help="Pype root") - - kwargs, args = parser.parse_known_args() - - print("Running pype ...") - auto_pype_root = os.path.dirname(os.path.abspath(__file__)) - auto_pype_root = os.path.abspath(auto_pype_root + "../../../../..") - - auto_pype_root = os.environ.get('PYPE_SETUP_PATH') or auto_pype_root - if os.environ.get('PYPE_SETUP_PATH'): - print("Got Pype location from environment: {}".format( - os.environ.get('PYPE_SETUP_PATH'))) - - pype_command = "pype.ps1" - if platform.system().lower() == "linux": - pype_command = "pype" - elif platform.system().lower() == "windows": - pype_command = "pype.bat" - - if kwargs.pype: - pype_root = kwargs.pype - else: - # test if pype.bat / pype is in the PATH - # if it is, which() will return its path and we use that. - # if not, we use auto_pype_root path. Caveat of that one is - # that it can be UNC path and that will not work on windows. - - pype_path = which(pype_command) - - if pype_path: - pype_root = os.path.dirname(pype_path) - else: - pype_root = auto_pype_root - - print("Set pype root to: {}".format(pype_root)) - print("Paths: {}".format(kwargs.paths or [os.getcwd()])) - - paths = kwargs.paths or [os.environ.get("PYPE_METADATA_FILE")] or [os.getcwd()] # noqa - args = [ - os.path.join(pype_root, pype_command), - "publish", - " ".join(['"{}"'.format(p) for p in paths]) - ] - - print("Pype command: {}".format(" ".join(args))) - # Forcing forwaring the environment because environment inheritance does - # not always work. - # Cast all values in environment to str to be safe - env = {k: str(v) for k, v in os.environ.items()} - exit_code = subprocess.call(args, env=env) - if exit_code != 0: - raise RuntimeError("Publishing failed.") - - -if __name__ == '__main__': - __main__() From 2328fc446eba431b64a55b19d845f4dbb42ae8f1 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Thu, 1 Apr 2021 15:10:00 +0200 Subject: [PATCH 07/10] change environments in default settings --- .../system_settings/applications.json | 66 +++++++++---------- .../defaults/system_settings/general.json | 10 +-- .../defaults/system_settings/tools.json | 2 +- 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/pype/settings/defaults/system_settings/applications.json b/pype/settings/defaults/system_settings/applications.json index 5eccdfb83d..b21b035e38 100644 --- a/pype/settings/defaults/system_settings/applications.json +++ b/pype/settings/defaults/system_settings/applications.json @@ -6,9 +6,9 @@ "host_name": "maya", "environment": { "PYTHONPATH": [ - "{PYPE_ROOT}/pype/hosts/maya/startup", - "{PYPE_REPOS_ROOT}/avalon-core/setup/maya", - "{PYPE_REPOS_ROOT}/maya-look-assigner", + "{OPENPYPE_ROOT}/pype/hosts/maya/startup", + "{OPENPYPE_REPOS_ROOT}/avalon-core/setup/maya", + "{OPENPYPE_REPOS_ROOT}/maya-look-assigner", "{PYTHONPATH}" ], "MAYA_DISABLE_CLIC_IPM": "Yes", @@ -16,7 +16,7 @@ "MAYA_DISABLE_CER": "Yes", "PYMEL_SKIP_MEL_INIT": "Yes", "LC_ALL": "C", - "PYPE_LOG_NO_COLORS": "Yes" + "OPENPYPE_LOG_NO_COLORS": "Yes" }, "variants": { "maya_2020": { @@ -91,8 +91,8 @@ "host_name": "maya", "environment": { "PYTHONPATH": [ - "{PYPE_REPOS_ROOT}/avalon-core/setup/maya", - "{PYPE_REPOS_ROOT}/maya-look-assigner", + "{OPENPYPE_REPOS_ROOT}/avalon-core/setup/maya", + "{OPENPYPE_REPOS_ROOT}/maya-look-assigner", "{PYTHON_ENV}/python2/Lib/site-packages", "{PYTHONPATH}" ], @@ -101,7 +101,7 @@ "MAYA_DISABLE_CER": "Yes", "PYMEL_SKIP_MEL_INIT": "Yes", "LC_ALL": "C", - "PYPE_LOG_NO_COLORS": "Yes", + "OPENPYPE_LOG_NO_COLORS": "Yes", "MAYA_TEST": "{MAYA_VERSION}" }, "variants": { @@ -171,9 +171,9 @@ "host_name": "nuke", "environment": { "NUKE_PATH": [ - "{PYPE_REPOS_ROOT}/avalon-core/setup/nuke/nuke_path", - "{PYPE_ROOT}/pype/hosts/nuke/startup", - "{PYPE_STUDIO_PLUGINS}/nuke" + "{OPENPYPE_REPOS_ROOT}/avalon-core/setup/nuke/nuke_path", + "{OPENPYPE_ROOT}/pype/hosts/nuke/startup", + "{OPENPYPE_STUDIO_PLUGINS}/nuke" ], "PATH": { "windows": "C:/Program Files (x86)/QuickTime/QTSystem/;{PATH}" @@ -264,9 +264,9 @@ "host_name": "nuke", "environment": { "NUKE_PATH": [ - "{PYPE_REPOS_ROOT}/avalon-core/setup/nuke/nuke_path", - "{PYPE_ROOT}/pype/hosts/nuke/startup", - "{PYPE_STUDIO_PLUGINS}/nuke" + "{OPENPYPE_REPOS_ROOT}/avalon-core/setup/nuke/nuke_path", + "{OPENPYPE_ROOT}/pype/hosts/nuke/startup", + "{OPENPYPE_STUDIO_PLUGINS}/nuke" ], "PATH": { "windows": "C:/Program Files (x86)/QuickTime/QTSystem/;{PATH}" @@ -381,7 +381,7 @@ "host_name": "hiero", "environment": { "HIERO_PLUGIN_PATH": [ - "{PYPE_ROOT}/pype/hosts/hiero/startup" + "{OPENPYPE_ROOT}/pype/hosts/hiero/startup" ], "PATH": { "windows": "C:/Program Files (x86)/QuickTime/QTSystem/;{PATH}" @@ -496,7 +496,7 @@ "host_name": "hiero", "environment": { "HIERO_PLUGIN_PATH": [ - "{PYPE_ROOT}/pype/hosts/hiero/startup" + "{OPENPYPE_ROOT}/pype/hosts/hiero/startup" ], "PATH": { "windows": "C:/Program Files (x86)/QuickTime/QTSystem/;{PATH}" @@ -633,7 +633,7 @@ "{PYTHON36}/Scripts", "{PATH}" ], - "PYPE_LOG_NO_COLORS": "Yes" + "OPENPYPE_LOG_NO_COLORS": "Yes" }, "variants": { "fusion_16": { @@ -709,8 +709,8 @@ "{PYTHON36_RESOLVE}/Scripts", "{PATH}" ], - "PRE_PYTHON_SCRIPT": "{PYPE_ROOT}/pype/resolve/preload_console.py", - "PYPE_LOG_NO_COLORS": "True", + "PRE_PYTHON_SCRIPT": "{OPENPYPE_ROOT}/pype/resolve/preload_console.py", + "OPENPYPE_LOG_NO_COLORS": "True", "RESOLVE_DEV": "True" }, "variants": { @@ -740,14 +740,14 @@ "host_name": "houdini", "environment": { "HOUDINI_PATH": { - "darwin": "{PYPE_ROOT}/pype/hosts/houdini/startup:&", - "linux": "{PYPE_ROOT}/pype/hosts/houdini/startup:&", - "windows": "{PYPE_ROOT}/pype/hosts/houdini/startup;&" + "darwin": "{OPENPYPE_ROOT}/pype/hosts/houdini/startup:&", + "linux": "{OPENPYPE_ROOT}/pype/hosts/houdini/startup:&", + "windows": "{OPENPYPE_ROOT}/pype/hosts/houdini/startup;&" }, "HOUDINI_MENU_PATH": { - "darwin": "{PYPE_ROOT}/pype/hosts/houdini/startup:&", - "linux": "{PYPE_ROOT}/pype/hosts/houdini/startup:&", - "windows": "{PYPE_ROOT}/pype/hosts/houdini/startup;&" + "darwin": "{OPENPYPE_ROOT}/pype/hosts/houdini/startup:&", + "linux": "{OPENPYPE_ROOT}/pype/hosts/houdini/startup:&", + "windows": "{OPENPYPE_ROOT}/pype/hosts/houdini/startup;&" } }, "variants": { @@ -806,9 +806,9 @@ "icon": "{}/app_icons/blender.png", "host_name": "blender", "environment": { - "BLENDER_USER_SCRIPTS": "{PYPE_REPOS_ROOT}/avalon-core/setup/blender", + "BLENDER_USER_SCRIPTS": "{OPENPYPE_REPOS_ROOT}/avalon-core/setup/blender", "PYTHONPATH": [ - "{PYPE_REPOS_ROOT}/avalon-core/setup/blender", + "{OPENPYPE_REPOS_ROOT}/avalon-core/setup/blender", "{PYTHONPATH}" ], "CREATE_NEW_CONSOLE": "yes" @@ -869,7 +869,7 @@ "host_name": "harmony", "environment": { "AVALON_HARMONY_WORKFILES_ON_LAUNCH": "1", - "LIB_OPENHARMONY_PATH": "{PYPE_ROOT}/pype/vendor/OpenHarmony" + "LIB_OPENHARMONY_PATH": "{OPENPYPE_ROOT}/pype/vendor/OpenHarmony" }, "variants": { "harmony_20": { @@ -912,7 +912,7 @@ "icon": "{}/app_icons/tvpaint.png", "host_name": "tvpaint", "environment": { - "PYPE_LOG_NO_COLORS": "True" + "OPENPYPE_LOG_NO_COLORS": "True" }, "variants": { "tvpaint_animation_11-64bits": { @@ -958,7 +958,7 @@ "host_name": "photoshop", "environment": { "AVALON_PHOTOSHOP_WORKFILES_ON_LAUNCH": "1", - "PYPE_LOG_NO_COLORS": "Yes", + "OPENPYPE_LOG_NO_COLORS": "Yes", "WEBSOCKET_URL": "ws://localhost:8099/ws/", "WORKFILES_SAVE_AS": "Yes" }, @@ -1006,7 +1006,7 @@ "host_name": "aftereffects", "environment": { "AVALON_AFTEREFFECTS_WORKFILES_ON_LAUNCH": "1", - "PYPE_LOG_NO_COLORS": "Yes", + "OPENPYPE_LOG_NO_COLORS": "Yes", "WEBSOCKET_URL": "ws://localhost:8097/ws/", "WORKFILES_SAVE_AS": "Yes" }, @@ -1053,7 +1053,7 @@ "icon": "app_icons/celaction.png", "host_name": "celaction", "environment": { - "CELACTION_TEMPLATE": "{PYPE_ROOT}/pype/hosts/celaction/celaction_template_scene.scn" + "CELACTION_TEMPLATE": "{OPENPYPE_ROOT}/pype/hosts/celaction/celaction_template_scene.scn" }, "variants": { "celation_Local": { @@ -1075,8 +1075,8 @@ "icon": "{}/app_icons/ue4.png'", "host_name": "unreal", "environment": { - "AVALON_UNREAL_PLUGIN": "{PYPE_REPOS_ROOT}/avalon-unreal-integration", - "PYPE_LOG_NO_COLORS": "True", + "AVALON_UNREAL_PLUGIN": "{OPENPYPE_REPOS_ROOT}/avalon-unreal-integration", + "OPENPYPE_LOG_NO_COLORS": "True", "QT_PREFERRED_BINDING": "PySide" }, "variants": { diff --git a/pype/settings/defaults/system_settings/general.json b/pype/settings/defaults/system_settings/general.json index 99db4e85c6..eb9b6950c5 100644 --- a/pype/settings/defaults/system_settings/general.json +++ b/pype/settings/defaults/system_settings/general.json @@ -3,15 +3,15 @@ "studio_code": "stu", "environment": { "FFMPEG_PATH": { - "windows": "{PYPE_ROOT}/vendor/bin/ffmpeg_exec/windows/bin", - "darwin": "{PYPE_ROOT}/vendor/bin/ffmpeg_exec/darwin/bin", - "linux": ":{PYPE_ROOT}/vendor/bin/ffmpeg_exec/linux" + "windows": "{OPENPYPE_ROOT}/vendor/bin/ffmpeg_exec/windows/bin", + "darwin": "{OPENPYPE_ROOT}/vendor/bin/ffmpeg_exec/darwin/bin", + "linux": ":{OPENPYPE_ROOT}/vendor/bin/ffmpeg_exec/linux" }, - "PYPE_OCIO_CONFIG": "{STUDIO_SOFT}/OpenColorIO-Configs", + "OPENPYPE_OCIO_CONFIG": "{STUDIO_SOFT}/OpenColorIO-Configs", "__environment_keys__": { "global": [ "FFMPEG_PATH", - "PYPE_OCIO_CONFIG" + "OPENPYPE_OCIO_CONFIG" ] } }, diff --git a/pype/settings/defaults/system_settings/tools.json b/pype/settings/defaults/system_settings/tools.json index 214bfc95e5..535d8d5fdb 100644 --- a/pype/settings/defaults/system_settings/tools.json +++ b/pype/settings/defaults/system_settings/tools.json @@ -2,7 +2,7 @@ "tool_groups": { "mtoa": { "environment": { - "MTOA": "{PYPE_STUDIO_SOFTWARE}/arnold/mtoa_{MAYA_VERSION}_{MTOA_VERSION}", + "MTOA": "{OPENPYPE_STUDIO_SOFTWARE}/arnold/mtoa_{MAYA_VERSION}_{MTOA_VERSION}", "MAYA_RENDER_DESC_PATH": "{MTOA}", "MAYA_MODULE_PATH": "{MTOA}", "ARNOLD_PLUGIN_PATH": "{MTOA}/shaders", From d33476b724f09b834abe50ec588834ad6dad3444 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Thu, 1 Apr 2021 15:45:16 +0200 Subject: [PATCH 08/10] changed pype prefix in hosts --- .../hooks/pre_celaction_registers.py | 2 +- pype/hosts/harmony/api/__init__.py | 2 +- .../hosts/harmony/js/creators/CreateRender.js | 4 +- .../harmony/js/loaders/ImageSequenceLoader.js | 4 +- .../harmony/js/loaders/TemplateLoader.js | 4 +- .../harmony/js/publish/CollectCurrentFile.js | 4 +- .../harmony/js/publish/CollectFarmRender.js | 4 +- .../harmony/js/publish/CollectPalettes.js | 4 +- .../harmony/js/publish/ExtractPalette.js | 4 +- .../harmony/js/publish/ExtractTemplate.js | 4 +- pype/hosts/maya/api/menu.json | 174 ++++----- pype/hosts/maya/api/menu.py | 2 +- pype/hosts/maya/api/menu_backup.json | 332 +++++++++--------- .../maya/plugins/create/create_render.py | 6 +- .../maya/plugins/create/create_vrayscene.py | 6 +- .../plugins/publish/submit_maya_muster.py | 6 +- .../publish/validate_muster_connection.py | 6 +- pype/hosts/maya/startup/userSetup.py | 2 +- pype/hosts/premiere/lib.py | 2 +- .../premiere/ppro/js/pype_restapi_client.js | 2 +- pype/hosts/unreal/api/lib.py | 10 +- 21 files changed, 292 insertions(+), 292 deletions(-) diff --git a/pype/hosts/celaction/hooks/pre_celaction_registers.py b/pype/hosts/celaction/hooks/pre_celaction_registers.py index 40e8eaa6ff..2e535d6d77 100644 --- a/pype/hosts/celaction/hooks/pre_celaction_registers.py +++ b/pype/hosts/celaction/hooks/pre_celaction_registers.py @@ -35,7 +35,7 @@ class CelactionPrelaunchHook(PreLaunchHook): winreg.KEY_ALL_ACCESS) # TODO: this will need to be checked more thoroughly - pype_exe = os.getenv("PYPE_EXECUTABLE") + pype_exe = os.getenv("OPENPYPE_EXECUTABLE") winreg.SetValueEx(hKey, "SubmitAppTitle", 0, winreg.REG_SZ, pype_exe) diff --git a/pype/hosts/harmony/api/__init__.py b/pype/hosts/harmony/api/__init__.py index 1a0255d045..ae1450d9cc 100644 --- a/pype/hosts/harmony/api/__init__.py +++ b/pype/hosts/harmony/api/__init__.py @@ -154,7 +154,7 @@ def application_launch(): # It is now moved so it it manually called. # ensure_scene_settings() # check_inventory() - # fills PYPE_HARMONY_JS + # fills OPENPYPE_HARMONY_JS pype_harmony_path = Path(__file__).parent.parent / "js" / "PypeHarmony.js" pype_harmony_js = pype_harmony_path.read_text() diff --git a/pype/hosts/harmony/js/creators/CreateRender.js b/pype/hosts/harmony/js/creators/CreateRender.js index cfb0701df4..92ec6dfd2f 100644 --- a/pype/hosts/harmony/js/creators/CreateRender.js +++ b/pype/hosts/harmony/js/creators/CreateRender.js @@ -6,8 +6,8 @@ // check if PypeHarmony is defined and if not, load it. if (typeof PypeHarmony === 'undefined') { - var PYPE_HARMONY_JS = System.getenv('PYPE_HARMONY_JS') + '/PypeHarmony.js'; - include(PYPE_HARMONY_JS.replace(/\\/g, "/")); + var OPENPYPE_HARMONY_JS = System.getenv('OPENPYPE_HARMONY_JS') + '/PypeHarmony.js'; + include(OPENPYPE_HARMONY_JS.replace(/\\/g, "/")); } diff --git a/pype/hosts/harmony/js/loaders/ImageSequenceLoader.js b/pype/hosts/harmony/js/loaders/ImageSequenceLoader.js index cfa71e2834..d809c350ab 100644 --- a/pype/hosts/harmony/js/loaders/ImageSequenceLoader.js +++ b/pype/hosts/harmony/js/loaders/ImageSequenceLoader.js @@ -5,8 +5,8 @@ // check if PypeHarmony is defined and if not, load it. if (typeof PypeHarmony === 'undefined') { - var PYPE_HARMONY_JS = System.getenv('PYPE_HARMONY_JS') + '/PypeHarmony.js'; - include(PYPE_HARMONY_JS.replace(/\\/g, "/")); + var OPENPYPE_HARMONY_JS = System.getenv('OPENPYPE_HARMONY_JS') + '/PypeHarmony.js'; + include(OPENPYPE_HARMONY_JS.replace(/\\/g, "/")); } if (typeof $ === 'undefined'){ diff --git a/pype/hosts/harmony/js/loaders/TemplateLoader.js b/pype/hosts/harmony/js/loaders/TemplateLoader.js index 160979f943..1df04c8282 100644 --- a/pype/hosts/harmony/js/loaders/TemplateLoader.js +++ b/pype/hosts/harmony/js/loaders/TemplateLoader.js @@ -6,8 +6,8 @@ // check if PypeHarmony is defined and if not, load it. if (typeof PypeHarmony === 'undefined') { - var PYPE_HARMONY_JS = System.getenv('PYPE_HARMONY_JS') + '/PypeHarmony.js'; - include(PYPE_HARMONY_JS.replace(/\\/g, "/")); + var OPENPYPE_HARMONY_JS = System.getenv('OPENPYPE_HARMONY_JS') + '/PypeHarmony.js'; + include(OPENPYPE_HARMONY_JS.replace(/\\/g, "/")); } if (typeof $ === 'undefined'){ diff --git a/pype/hosts/harmony/js/publish/CollectCurrentFile.js b/pype/hosts/harmony/js/publish/CollectCurrentFile.js index d39f23712d..2eeb7fb764 100644 --- a/pype/hosts/harmony/js/publish/CollectCurrentFile.js +++ b/pype/hosts/harmony/js/publish/CollectCurrentFile.js @@ -6,8 +6,8 @@ // check if PypeHarmony is defined and if not, load it. if (typeof PypeHarmony === 'undefined') { - var PYPE_HARMONY_JS = System.getenv('PYPE_HARMONY_JS') + '/PypeHarmony.js'; - include(PYPE_HARMONY_JS.replace(/\\/g, "/")); + var OPENPYPE_HARMONY_JS = System.getenv('OPENPYPE_HARMONY_JS') + '/PypeHarmony.js'; + include(OPENPYPE_HARMONY_JS.replace(/\\/g, "/")); } diff --git a/pype/hosts/harmony/js/publish/CollectFarmRender.js b/pype/hosts/harmony/js/publish/CollectFarmRender.js index 7c0cda5165..759dc5ce5d 100644 --- a/pype/hosts/harmony/js/publish/CollectFarmRender.js +++ b/pype/hosts/harmony/js/publish/CollectFarmRender.js @@ -6,8 +6,8 @@ // check if PypeHarmony is defined and if not, load it. if (typeof PypeHarmony === 'undefined') { - var PYPE_HARMONY_JS = System.getenv('PYPE_HARMONY_JS') + '/PypeHarmony.js'; - include(PYPE_HARMONY_JS.replace(/\\/g, "/")); + var OPENPYPE_HARMONY_JS = System.getenv('OPENPYPE_HARMONY_JS') + '/PypeHarmony.js'; + include(OPENPYPE_HARMONY_JS.replace(/\\/g, "/")); } diff --git a/pype/hosts/harmony/js/publish/CollectPalettes.js b/pype/hosts/harmony/js/publish/CollectPalettes.js index 8fda55ff75..afb0ad854a 100644 --- a/pype/hosts/harmony/js/publish/CollectPalettes.js +++ b/pype/hosts/harmony/js/publish/CollectPalettes.js @@ -6,8 +6,8 @@ // check if PypeHarmony is defined and if not, load it. if (typeof PypeHarmony === 'undefined') { - var PYPE_HARMONY_JS = System.getenv('PYPE_HARMONY_JS') + '/PypeHarmony.js'; - include(PYPE_HARMONY_JS.replace(/\\/g, "/")); + var OPENPYPE_HARMONY_JS = System.getenv('OPENPYPE_HARMONY_JS') + '/PypeHarmony.js'; + include(OPENPYPE_HARMONY_JS.replace(/\\/g, "/")); } diff --git a/pype/hosts/harmony/js/publish/ExtractPalette.js b/pype/hosts/harmony/js/publish/ExtractPalette.js index 794c6fdbb1..c4765354c4 100644 --- a/pype/hosts/harmony/js/publish/ExtractPalette.js +++ b/pype/hosts/harmony/js/publish/ExtractPalette.js @@ -6,8 +6,8 @@ // check if PypeHarmony is defined and if not, load it. if (typeof PypeHarmony === 'undefined') { - var PYPE_HARMONY_JS = System.getenv('PYPE_HARMONY_JS') + '/PypeHarmony.js'; - include(PYPE_HARMONY_JS.replace(/\\/g, "/")); + var OPENPYPE_HARMONY_JS = System.getenv('OPENPYPE_HARMONY_JS') + '/PypeHarmony.js'; + include(OPENPYPE_HARMONY_JS.replace(/\\/g, "/")); } /** diff --git a/pype/hosts/harmony/js/publish/ExtractTemplate.js b/pype/hosts/harmony/js/publish/ExtractTemplate.js index d36a8947f8..4676e1ff68 100644 --- a/pype/hosts/harmony/js/publish/ExtractTemplate.js +++ b/pype/hosts/harmony/js/publish/ExtractTemplate.js @@ -6,8 +6,8 @@ // check if PypeHarmony is defined and if not, load it. if (typeof PypeHarmony === 'undefined') { - var PYPE_HARMONY_JS = System.getenv('PYPE_HARMONY_JS') + '/PypeHarmony.js'; - include(PYPE_HARMONY_JS.replace(/\\/g, "/")); + var OPENPYPE_HARMONY_JS = System.getenv('OPENPYPE_HARMONY_JS') + '/PypeHarmony.js'; + include(OPENPYPE_HARMONY_JS.replace(/\\/g, "/")); } diff --git a/pype/hosts/maya/api/menu.json b/pype/hosts/maya/api/menu.json index 03eb05e5bd..b32f295ec4 100644 --- a/pype/hosts/maya/api/menu.json +++ b/pype/hosts/maya/api/menu.json @@ -1,21 +1,21 @@ [ { "type": "action", - "command": "$PYPE_SCRIPTS\\others\\save_scene_incremental.py", + "command": "$OPENPYPE_SCRIPTS\\others\\save_scene_incremental.py", "sourcetype": "file", "title": "# Version Up", "tooltip": "Incremental save with a specific format" }, { "type": "action", - "command": "$PYPE_SCRIPTS\\others\\open_current_folder.py", + "command": "$OPENPYPE_SCRIPTS\\others\\open_current_folder.py", "sourcetype": "file", "title": "Open working folder..", "tooltip": "Show current scene in Explorer" }, { "type": "action", - "command": "$PYPE_SCRIPTS\\avalon\\launch_manager.py", + "command": "$OPENPYPE_SCRIPTS\\avalon\\launch_manager.py", "sourcetype": "file", "title": "# Project Manager", "tooltip": "Add assets to the project" @@ -44,7 +44,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\modeling\\separateMeshPerShader.py", + "command": "$OPENPYPE_SCRIPTS\\modeling\\separateMeshPerShader.py", "sourcetype": "file", "tags": ["modeling", "separateMeshPerShader"], "title": "# Separate Mesh Per Shader", @@ -52,7 +52,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\modeling\\polyDetachSeparate.py", + "command": "$OPENPYPE_SCRIPTS\\modeling\\polyDetachSeparate.py", "sourcetype": "file", "tags": ["modeling", "poly", "detach", "separate"], "title": "# Polygon Detach and Separate", @@ -60,14 +60,14 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\modeling\\polySelectEveryNthEdgeUI.py", + "command": "$OPENPYPE_SCRIPTS\\modeling\\polySelectEveryNthEdgeUI.py", "sourcetype": "file", "tags": ["modeling", "select", "nth", "edge", "ui"], "title": "# Select Every Nth Edge" }, { "type": "action", - "command": "$PYPE_SCRIPTS\\modeling\\djPFXUVs.py", + "command": "$OPENPYPE_SCRIPTS\\modeling\\djPFXUVs.py", "sourcetype": "file", "tags": ["modeling", "djPFX", "UVs"], "title": "# dj PFX UVs", @@ -81,7 +81,7 @@ "items": [ { "type": "action", - "command": "$PYPE_SCRIPTS\\rigging\\advancedSkeleton.py", + "command": "$OPENPYPE_SCRIPTS\\rigging\\advancedSkeleton.py", "sourcetype": "file", "tags": [ "rigging", @@ -106,7 +106,7 @@ { "type": "action", "title": "# Import Proxies", - "command": "$PYPE_SCRIPTS\\shading\\vray\\vrayImportProxies.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\vray\\vrayImportProxies.py", "sourcetype": "file", "tags": ["shading", "vray", "import", "proxies"], "tooltip": "" @@ -117,7 +117,7 @@ { "type": "action", "title": "# Select All GES", - "command": "$PYPE_SCRIPTS\\shading\\vray\\selectAllGES.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\vray\\selectAllGES.py", "sourcetype": "file", "tooltip": "", "tags": ["shading", "vray", "select All GES"] @@ -125,7 +125,7 @@ { "type": "action", "title": "# Select All GES Under Selection", - "command": "$PYPE_SCRIPTS\\shading\\vray\\selectAllGESUnderSelection.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\vray\\selectAllGESUnderSelection.py", "sourcetype": "file", "tooltip": "", "tags": ["shading", "vray", "select", "all", "GES"] @@ -136,7 +136,7 @@ { "type": "action", "title": "# Selection To VRay Mesh", - "command": "$PYPE_SCRIPTS\\shading\\vray\\selectionToVrayMesh.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\vray\\selectionToVrayMesh.py", "sourcetype": "file", "tooltip": "", "tags": ["shading", "vray", "selection", "vraymesh"] @@ -144,7 +144,7 @@ { "type": "action", "title": "# Add VRay Round Edges Attribute", - "command": "$PYPE_SCRIPTS\\shading\\vray\\addVrayRoundEdgesAttribute.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\vray\\addVrayRoundEdgesAttribute.py", "sourcetype": "file", "tooltip": "", "tags": ["shading", "vray", "round edges", "attribute"] @@ -152,7 +152,7 @@ { "type": "action", "title": "# Add Gamma", - "command": "$PYPE_SCRIPTS\\shading\\vray\\vrayAddGamma.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\vray\\vrayAddGamma.py", "sourcetype": "file", "tooltip": "", "tags": ["shading", "vray", "add gamma"] @@ -162,7 +162,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\shading\\vray\\select_vraymesh_materials_with_unconnected_shader_slots.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\vray\\select_vraymesh_materials_with_unconnected_shader_slots.py", "sourcetype": "file", "title": "# Select Unconnected Shader Materials", "tags": [ @@ -177,7 +177,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\shading\\vray\\vrayMergeSimilarVRayMeshMaterials.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\vray\\vrayMergeSimilarVRayMeshMaterials.py", "sourcetype": "file", "title": "# Merge Similar VRay Mesh Materials", "tags": [ @@ -192,7 +192,7 @@ { "type": "action", "title": "# Create Two Sided Material", - "command": "$PYPE_SCRIPTS\\shading\\vray\\vrayCreate2SidedMtlForSelectedMtlRenamed.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\vray\\vrayCreate2SidedMtlForSelectedMtlRenamed.py", "sourcetype": "file", "tooltip": "Creates two sided material for selected material and renames it", "tags": ["shading", "vray", "two sided", "material"] @@ -200,7 +200,7 @@ { "type": "action", "title": "# Create Two Sided Material For Selected", - "command": "$PYPE_SCRIPTS\\shading\\vray\\vrayCreate2SidedMtlForSelectedMtl.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\vray\\vrayCreate2SidedMtlForSelectedMtl.py", "sourcetype": "file", "tooltip": "Select material to create a two sided version from it", "tags": [ @@ -215,7 +215,7 @@ { "type": "action", "title": "# Add OpenSubdiv Attribute", - "command": "$PYPE_SCRIPTS\\shading\\vray\\addVrayOpenSubdivAttribute.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\vray\\addVrayOpenSubdivAttribute.py", "sourcetype": "file", "tooltip": "", "tags": [ @@ -229,7 +229,7 @@ { "type": "action", "title": "# Remove OpenSubdiv Attribute", - "command": "$PYPE_SCRIPTS\\shading\\vray\\removeVrayOpenSubdivAttribute.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\vray\\removeVrayOpenSubdivAttribute.py", "sourcetype": "file", "tooltip": "", "tags": [ @@ -246,7 +246,7 @@ { "type": "action", "title": "# Add Subdivision Attribute", - "command": "$PYPE_SCRIPTS\\shading\\vray\\addVraySubdivisionAttribute.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\vray\\addVraySubdivisionAttribute.py", "sourcetype": "file", "tooltip": "", "tags": [ @@ -258,7 +258,7 @@ { "type": "action", "title": "# Remove Subdivision Attribute.py", - "command": "$PYPE_SCRIPTS\\shading\\vray\\removeVraySubdivisionAttribute.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\vray\\removeVraySubdivisionAttribute.py", "sourcetype": "file", "tooltip": "", "tags": [ @@ -275,7 +275,7 @@ { "type": "action", "title": "# Add Vray Object Ids", - "command": "$PYPE_SCRIPTS\\shading\\vray\\addVrayObjectIds.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\vray\\addVrayObjectIds.py", "sourcetype": "file", "tooltip": "", "tags": ["shading", "vray", "add", "object id"] @@ -283,7 +283,7 @@ { "type": "action", "title": "# Add Vray Material Ids", - "command": "$PYPE_SCRIPTS\\shading\\vray\\addVrayMaterialIds.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\vray\\addVrayMaterialIds.py", "sourcetype": "file", "tooltip": "", "tags": ["shading", "vray", "addVrayMaterialIds.py"] @@ -294,7 +294,7 @@ { "type": "action", "title": "# Set Physical DOF Depth", - "command": "$PYPE_SCRIPTS\\shading\\vray\\vrayPhysicalDOFSetDepth.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\vray\\vrayPhysicalDOFSetDepth.py", "sourcetype": "file", "tooltip": "", "tags": ["shading", "vray", "physical", "DOF ", "Depth"] @@ -302,7 +302,7 @@ { "type": "action", "title": "# Magic Vray Proxy UI", - "command": "$PYPE_SCRIPTS\\shading\\vray\\magicVrayProxyUI.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\vray\\magicVrayProxyUI.py", "sourcetype": "file", "tooltip": "", "tags": ["shading", "vray", "magicVrayProxyUI"] @@ -311,7 +311,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\pyblish\\lighting\\set_filename_prefix.py", + "command": "$OPENPYPE_SCRIPTS\\pyblish\\lighting\\set_filename_prefix.py", "sourcetype": "file", "tags": [ "shading", @@ -335,7 +335,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\shading\\LightLinkUi.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\LightLinkUi.py", "sourcetype": "file", "tags": ["shading", "light", "link", "ui"], "title": "# Light Link UI", @@ -343,7 +343,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\shading\\vdviewer_ui.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\vdviewer_ui.py", "sourcetype": "file", "tags": [ "shading", @@ -358,7 +358,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\shading\\setTexturePreviewToCLRImage.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\setTexturePreviewToCLRImage.py", "sourcetype": "file", "tags": ["shading", "CLRImage", "textures", "preview"], "title": "# Set Texture Preview To CLRImage", @@ -366,7 +366,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\shading\\fixDefaultShaderSetBehavior.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\fixDefaultShaderSetBehavior.py", "sourcetype": "file", "tags": ["shading", "fix", "DefaultShaderSet", "Behavior"], "title": "# Fix Default Shader Set Behavior", @@ -374,7 +374,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\shading\\fixSelectedShapesReferenceAssignments.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\fixSelectedShapesReferenceAssignments.py", "sourcetype": "file", "tags": [ "shading", @@ -389,7 +389,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\shading\\selectLambert1Members.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\selectLambert1Members.py", "sourcetype": "file", "tags": ["shading", "selectLambert1Members"], "title": "# Select Lambert1 Members", @@ -397,7 +397,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\shading\\selectShapesWithoutShader.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\selectShapesWithoutShader.py", "sourcetype": "file", "tags": ["shading", "selectShapesWithoutShader"], "title": "# Select Shapes Without Shader", @@ -405,7 +405,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\shading\\fixRenderLayerOutAdjustmentErrors.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\fixRenderLayerOutAdjustmentErrors.py", "sourcetype": "file", "tags": ["shading", "fixRenderLayerOutAdjustmentErrors"], "title": "# Fix RenderLayer Out Adjustment Errors", @@ -413,7 +413,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\shading\\fix_renderlayer_missing_node_override.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\fix_renderlayer_missing_node_override.py", "sourcetype": "file", "tags": [ "shading", @@ -429,7 +429,7 @@ { "type": "action", "title": "# Image 2 Tiled EXR", - "command": "$PYPE_SCRIPTS\\shading\\open_img2exr.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\open_img2exr.py", "sourcetype": "file", "tooltip": "", "tags": ["shading", "vray", "exr"] @@ -442,7 +442,7 @@ "items": [ { "type": "action", - "command": "$PYPE_SCRIPTS\\pyblish\\open_deadline_submission_settings.py", + "command": "$OPENPYPE_SCRIPTS\\pyblish\\open_deadline_submission_settings.py", "sourcetype": "file", "tags": ["settings", "deadline", "globals", "render"], "title": "# DL Submission Settings UI", @@ -461,7 +461,7 @@ "items": [ { "type": "action", - "command": "$PYPE_SCRIPTS\\animation\\attributes\\copyValues.py", + "command": "$OPENPYPE_SCRIPTS\\animation\\attributes\\copyValues.py", "sourcetype": "file", "tags": ["animation", "copy", "attributes"], "title": "# Copy Values", @@ -469,7 +469,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\animation\\attributes\\copyInConnections.py", + "command": "$OPENPYPE_SCRIPTS\\animation\\attributes\\copyInConnections.py", "sourcetype": "file", "tags": [ "animation", @@ -483,7 +483,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\animation\\attributes\\copyOutConnections.py", + "command": "$OPENPYPE_SCRIPTS\\animation\\attributes\\copyOutConnections.py", "sourcetype": "file", "tags": [ "animation", @@ -497,7 +497,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\animation\\attributes\\copyTransformLocal.py", + "command": "$OPENPYPE_SCRIPTS\\animation\\attributes\\copyTransformLocal.py", "sourcetype": "file", "tags": [ "animation", @@ -511,7 +511,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\animation\\attributes\\copyTransformMatrix.py", + "command": "$OPENPYPE_SCRIPTS\\animation\\attributes\\copyTransformMatrix.py", "sourcetype": "file", "tags": [ "animation", @@ -525,7 +525,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\animation\\attributes\\copyTransformUI.py", + "command": "$OPENPYPE_SCRIPTS\\animation\\attributes\\copyTransformUI.py", "sourcetype": "file", "tags": [ "animation", @@ -539,7 +539,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\animation\\attributes\\simpleCopyUI.py", + "command": "$OPENPYPE_SCRIPTS\\animation\\attributes\\simpleCopyUI.py", "sourcetype": "file", "tags": [ "animation", @@ -561,7 +561,7 @@ "items": [ { "type": "action", - "command": "$PYPE_SCRIPTS\\animation\\optimize\\toggleFreezeHierarchy.py", + "command": "$OPENPYPE_SCRIPTS\\animation\\optimize\\toggleFreezeHierarchy.py", "sourcetype": "file", "tags": ["animation", "hierarchy", "toggle", "freeze"], "title": "# Toggle Freeze Hierarchy", @@ -569,7 +569,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\animation\\optimize\\toggleParallelNucleus.py", + "command": "$OPENPYPE_SCRIPTS\\animation\\optimize\\toggleParallelNucleus.py", "sourcetype": "file", "tags": ["animation", "nucleus", "toggle", "parallel"], "title": "# Toggle Parallel Nucleus", @@ -579,21 +579,21 @@ }, { "sourcetype": "file", - "command": "$PYPE_SCRIPTS\\animation\\bakeSelectedToWorldSpace.py", + "command": "$OPENPYPE_SCRIPTS\\animation\\bakeSelectedToWorldSpace.py", "tags": ["animation", "bake", "selection", "worldspace.py"], "title": "# Bake Selected To Worldspace", "type": "action" }, { "sourcetype": "file", - "command": "$PYPE_SCRIPTS\\animation\\timeStepper.py", + "command": "$OPENPYPE_SCRIPTS\\animation\\timeStepper.py", "tags": ["animation", "time", "stepper"], "title": "# Time Stepper", "type": "action" }, { "sourcetype": "file", - "command": "$PYPE_SCRIPTS\\animation\\capture_ui.py", + "command": "$OPENPYPE_SCRIPTS\\animation\\capture_ui.py", "tags": [ "animation", "capture", @@ -607,63 +607,63 @@ }, { "sourcetype": "file", - "command": "$PYPE_SCRIPTS\\animation\\simplePlayblastUI.py", + "command": "$OPENPYPE_SCRIPTS\\animation\\simplePlayblastUI.py", "tags": ["animation", "simple", "playblast", "ui"], "title": "# Simple Playblast UI", "type": "action" }, { "sourcetype": "file", - "command": "$PYPE_SCRIPTS\\animation\\tweenMachineUI.py", + "command": "$OPENPYPE_SCRIPTS\\animation\\tweenMachineUI.py", "tags": ["animation", "tween", "machine"], "title": "# Tween Machine UI", "type": "action" }, { "sourcetype": "file", - "command": "$PYPE_SCRIPTS\\animation\\selectAllAnimationCurves.py", + "command": "$OPENPYPE_SCRIPTS\\animation\\selectAllAnimationCurves.py", "tags": ["animation", "select", "curves"], "title": "# Select All Animation Curves", "type": "action" }, { "sourcetype": "file", - "command": "$PYPE_SCRIPTS\\animation\\pathAnimation.py", + "command": "$OPENPYPE_SCRIPTS\\animation\\pathAnimation.py", "tags": ["animation", "path", "along"], "title": "# Path Animation", "type": "action" }, { "sourcetype": "file", - "command": "$PYPE_SCRIPTS\\animation\\offsetSelectedObjectsUI.py", + "command": "$OPENPYPE_SCRIPTS\\animation\\offsetSelectedObjectsUI.py", "tags": ["animation", "offsetSelectedObjectsUI.py"], "title": "# Offset Selected Objects UI", "type": "action" }, { "sourcetype": "file", - "command": "$PYPE_SCRIPTS\\animation\\key_amplifier_ui.py", + "command": "$OPENPYPE_SCRIPTS\\animation\\key_amplifier_ui.py", "tags": ["animation", "key", "amplifier"], "title": "# Key Amplifier UI", "type": "action" }, { "sourcetype": "file", - "command": "$PYPE_SCRIPTS\\animation\\anim_scene_optimizer.py", + "command": "$OPENPYPE_SCRIPTS\\animation\\anim_scene_optimizer.py", "tags": ["animation", "anim_scene_optimizer.py"], "title": "# Anim_Scene_Optimizer", "type": "action" }, { "sourcetype": "file", - "command": "$PYPE_SCRIPTS\\animation\\zvParentMaster.py", + "command": "$OPENPYPE_SCRIPTS\\animation\\zvParentMaster.py", "tags": ["animation", "zvParentMaster.py"], "title": "# ZV Parent Master", "type": "action" }, { "sourcetype": "file", - "command": "$PYPE_SCRIPTS\\animation\\animLibrary.py", + "command": "$OPENPYPE_SCRIPTS\\animation\\animLibrary.py", "tags": ["animation", "studiolibrary.py"], "title": "Anim Library", "type": "action" @@ -676,7 +676,7 @@ "items": [ { "type": "action", - "command": "$PYPE_SCRIPTS\\layout\\alignDistributeUI.py", + "command": "$OPENPYPE_SCRIPTS\\layout\\alignDistributeUI.py", "sourcetype": "file", "tags": ["layout", "align", "Distribute", "UI"], "title": "# Align Distribute UI", @@ -684,7 +684,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\layout\\alignSimpleUI.py", + "command": "$OPENPYPE_SCRIPTS\\layout\\alignSimpleUI.py", "sourcetype": "file", "tags": ["layout", "align", "UI", "Simple"], "title": "# Align Simple UI", @@ -692,7 +692,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\layout\\center_locator.py", + "command": "$OPENPYPE_SCRIPTS\\layout\\center_locator.py", "sourcetype": "file", "tags": ["layout", "center", "locator"], "title": "# Center Locator", @@ -700,7 +700,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\layout\\average_locator.py", + "command": "$OPENPYPE_SCRIPTS\\layout\\average_locator.py", "sourcetype": "file", "tags": ["layout", "average", "locator"], "title": "# Average Locator", @@ -708,7 +708,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\layout\\selectWithinProximityUI.py", + "command": "$OPENPYPE_SCRIPTS\\layout\\selectWithinProximityUI.py", "sourcetype": "file", "tags": ["layout", "select", "proximity", "ui"], "title": "# Select Within Proximity UI", @@ -716,7 +716,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\layout\\dupCurveUI.py", + "command": "$OPENPYPE_SCRIPTS\\layout\\dupCurveUI.py", "sourcetype": "file", "tags": ["layout", "Duplicate", "Curve", "UI"], "title": "# Duplicate Curve UI", @@ -724,7 +724,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\layout\\randomDeselectUI.py", + "command": "$OPENPYPE_SCRIPTS\\layout\\randomDeselectUI.py", "sourcetype": "file", "tags": ["layout", "random", "Deselect", "UI"], "title": "# Random Deselect UI", @@ -732,7 +732,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\layout\\multiReferencerUI.py", + "command": "$OPENPYPE_SCRIPTS\\layout\\multiReferencerUI.py", "sourcetype": "file", "tags": ["layout", "multi", "reference"], "title": "# Multi Referencer UI", @@ -740,7 +740,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\layout\\duplicateOffsetUI.py", + "command": "$OPENPYPE_SCRIPTS\\layout\\duplicateOffsetUI.py", "sourcetype": "file", "tags": ["layout", "duplicate", "offset", "UI"], "title": "# Duplicate Offset UI", @@ -748,7 +748,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\layout\\spPaint3d.py", + "command": "$OPENPYPE_SCRIPTS\\layout\\spPaint3d.py", "sourcetype": "file", "tags": ["layout", "spPaint3d", "paint", "tool"], "title": "# SP Paint 3d", @@ -756,7 +756,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\layout\\randomizeUI.py", + "command": "$OPENPYPE_SCRIPTS\\layout\\randomizeUI.py", "sourcetype": "file", "tags": ["layout", "randomize", "UI"], "title": "# Randomize UI", @@ -764,7 +764,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\layout\\distributeWithinObjectUI.py", + "command": "$OPENPYPE_SCRIPTS\\layout\\distributeWithinObjectUI.py", "sourcetype": "file", "tags": ["layout", "distribute", "ObjectUI", "within"], "title": "# Distribute Within Object UI", @@ -778,7 +778,7 @@ "items": [ { "type": "action", - "command": "$PYPE_SCRIPTS\\particles\\instancerToObjects.py", + "command": "$OPENPYPE_SCRIPTS\\particles\\instancerToObjects.py", "sourcetype": "file", "tags": ["particles", "instancerToObjects"], "title": "# Instancer To Objects", @@ -786,7 +786,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\particles\\instancerToObjectsInstances.py", + "command": "$OPENPYPE_SCRIPTS\\particles\\instancerToObjectsInstances.py", "sourcetype": "file", "tags": ["particles", "instancerToObjectsInstances"], "title": "# Instancer To Objects Instances", @@ -794,7 +794,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\particles\\instancerToObjectsInstancesWithAnimation.py", + "command": "$OPENPYPE_SCRIPTS\\particles\\instancerToObjectsInstancesWithAnimation.py", "sourcetype": "file", "tags": [ "particles", @@ -805,7 +805,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\particles\\instancerToObjectsWithAnimation.py", + "command": "$OPENPYPE_SCRIPTS\\particles\\instancerToObjectsWithAnimation.py", "sourcetype": "file", "tags": ["particles", "instancerToObjectsWithAnimation"], "title": "# Instancer To Objects With Animation", @@ -819,7 +819,7 @@ "items": [ { "type": "action", - "command": "$PYPE_SCRIPTS\\cleanup\\repair_faulty_containers.py", + "command": "$OPENPYPE_SCRIPTS\\cleanup\\repair_faulty_containers.py", "sourcetype": "file", "tags": ["cleanup", "repair", "containers"], "title": "# Find and Repair Containers", @@ -830,7 +830,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\cleanup\\removeNamespaces.py", + "command": "$OPENPYPE_SCRIPTS\\cleanup\\removeNamespaces.py", "sourcetype": "file", "tags": ["cleanup", "remove", "namespaces"], "title": "# Remove Namespaces", @@ -838,7 +838,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\cleanup\\remove_user_defined_attributes.py", + "command": "$OPENPYPE_SCRIPTS\\cleanup\\remove_user_defined_attributes.py", "sourcetype": "file", "tags": ["cleanup", "remove_user_defined_attributes"], "title": "# Remove User Defined Attributes", @@ -846,7 +846,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\cleanup\\removeUnknownNodes.py", + "command": "$OPENPYPE_SCRIPTS\\cleanup\\removeUnknownNodes.py", "sourcetype": "file", "tags": ["cleanup", "removeUnknownNodes"], "title": "# Remove Unknown Nodes", @@ -854,7 +854,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\cleanup\\removeUnloadedReferences.py", + "command": "$OPENPYPE_SCRIPTS\\cleanup\\removeUnloadedReferences.py", "sourcetype": "file", "tags": ["cleanup", "removeUnloadedReferences"], "title": "# Remove Unloaded References", @@ -862,7 +862,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\cleanup\\removeReferencesFailedEdits.py", + "command": "$OPENPYPE_SCRIPTS\\cleanup\\removeReferencesFailedEdits.py", "sourcetype": "file", "tags": ["cleanup", "removeReferencesFailedEdits"], "title": "# Remove References Failed Edits", @@ -870,7 +870,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\cleanup\\remove_unused_looks.py", + "command": "$OPENPYPE_SCRIPTS\\cleanup\\remove_unused_looks.py", "sourcetype": "file", "tags": ["cleanup", "removeUnusedLooks"], "title": "# Remove Unused Looks", @@ -881,7 +881,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\cleanup\\uniqifyNodeNames.py", + "command": "$OPENPYPE_SCRIPTS\\cleanup\\uniqifyNodeNames.py", "sourcetype": "file", "tags": ["cleanup", "uniqifyNodeNames"], "title": "# Uniqify Node Names", @@ -889,7 +889,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\cleanup\\autoRenameFileNodes.py", + "command": "$OPENPYPE_SCRIPTS\\cleanup\\autoRenameFileNodes.py", "sourcetype": "file", "tags": ["cleanup", "auto", "rename", "filenodes"], "title": "# Auto Rename File Nodes", @@ -897,7 +897,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\cleanup\\update_asset_id.py", + "command": "$OPENPYPE_SCRIPTS\\cleanup\\update_asset_id.py", "sourcetype": "file", "tags": ["cleanup", "update", "database", "asset", "id"], "title": "# Update Asset ID", @@ -905,7 +905,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\cleanup\\ccRenameReplace.py", + "command": "$OPENPYPE_SCRIPTS\\cleanup\\ccRenameReplace.py", "sourcetype": "file", "tags": ["cleanup", "rename", "ui"], "title": "Renamer", @@ -913,7 +913,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\cleanup\\renameShapesToTransform.py", + "command": "$OPENPYPE_SCRIPTS\\cleanup\\renameShapesToTransform.py", "sourcetype": "file", "tags": ["cleanup", "renameShapesToTransform"], "title": "# Rename Shapes To Transform", diff --git a/pype/hosts/maya/api/menu.py b/pype/hosts/maya/api/menu.py index 9381043511..5993268f1d 100644 --- a/pype/hosts/maya/api/menu.py +++ b/pype/hosts/maya/api/menu.py @@ -8,7 +8,7 @@ from pype.api import BuildWorkfile import maya.cmds as cmds self = sys.modules[__name__] -self._menu = os.environ.get('PYPE_STUDIO_NAME') or "Pype" +self._menu = os.environ.get('OPENPYPE_STUDIO_NAME') or "Pype" log = logging.getLogger(__name__) diff --git a/pype/hosts/maya/api/menu_backup.json b/pype/hosts/maya/api/menu_backup.json index 735799345d..731a33a630 100644 --- a/pype/hosts/maya/api/menu_backup.json +++ b/pype/hosts/maya/api/menu_backup.json @@ -1,21 +1,21 @@ [ { "type": "action", - "command": "$PYPE_SCRIPTS\\others\\save_scene_incremental.py", + "command": "$OPENPYPE_SCRIPTS\\others\\save_scene_incremental.py", "sourcetype": "file", "title": "Version Up", "tooltip": "Incremental save with a specific format" }, { "type": "action", - "command": "$PYPE_SCRIPTS\\others\\show_current_scene_in_explorer.py", + "command": "$OPENPYPE_SCRIPTS\\others\\show_current_scene_in_explorer.py", "sourcetype": "file", "title": "Explore current scene..", "tooltip": "Show current scene in Explorer" }, { "type": "action", - "command": "$PYPE_SCRIPTS\\avalon\\launch_manager.py", + "command": "$OPENPYPE_SCRIPTS\\avalon\\launch_manager.py", "sourcetype": "file", "title": "Project Manager", "tooltip": "Add assets to the project" @@ -29,7 +29,7 @@ "items": [ { "type": "action", - "command": "$PYPE_SCRIPTS\\modeling\\duplicate_normalized.py", + "command": "$OPENPYPE_SCRIPTS\\modeling\\duplicate_normalized.py", "sourcetype": "file", "tags": ["modeling", "duplicate", "normalized"], "title": "Duplicate Normalized", @@ -37,7 +37,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\modeling\\transferUVs.py", + "command": "$OPENPYPE_SCRIPTS\\modeling\\transferUVs.py", "sourcetype": "file", "tags": ["modeling", "transfer", "uv"], "title": "Transfer UVs", @@ -45,7 +45,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\modeling\\mirrorSymmetry.py", + "command": "$OPENPYPE_SCRIPTS\\modeling\\mirrorSymmetry.py", "sourcetype": "file", "tags": ["modeling", "mirror", "symmetry"], "title": "Mirror Symmetry", @@ -53,7 +53,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\modeling\\selectOutlineUI.py", + "command": "$OPENPYPE_SCRIPTS\\modeling\\selectOutlineUI.py", "sourcetype": "file", "tags": ["modeling", "select", "outline", "ui"], "title": "Select Outline UI", @@ -61,7 +61,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\modeling\\polyDeleteOtherUVSets.py", + "command": "$OPENPYPE_SCRIPTS\\modeling\\polyDeleteOtherUVSets.py", "sourcetype": "file", "tags": ["modeling", "polygon", "uvset", "delete"], "title": "Polygon Delete Other UV Sets", @@ -69,7 +69,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\modeling\\polyCombineQuick.py", + "command": "$OPENPYPE_SCRIPTS\\modeling\\polyCombineQuick.py", "sourcetype": "file", "tags": ["modeling", "combine", "polygon", "quick"], "title": "Polygon Combine Quick", @@ -77,7 +77,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\modeling\\separateMeshPerShader.py", + "command": "$OPENPYPE_SCRIPTS\\modeling\\separateMeshPerShader.py", "sourcetype": "file", "tags": ["modeling", "separateMeshPerShader"], "title": "Separate Mesh Per Shader", @@ -85,7 +85,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\modeling\\polyDetachSeparate.py", + "command": "$OPENPYPE_SCRIPTS\\modeling\\polyDetachSeparate.py", "sourcetype": "file", "tags": ["modeling", "poly", "detach", "separate"], "title": "Polygon Detach and Separate", @@ -93,7 +93,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\modeling\\polyRelaxVerts.py", + "command": "$OPENPYPE_SCRIPTS\\modeling\\polyRelaxVerts.py", "sourcetype": "file", "tags": ["modeling", "relax", "verts"], "title": "Polygon Relax Vertices", @@ -101,14 +101,14 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\modeling\\polySelectEveryNthEdgeUI.py", + "command": "$OPENPYPE_SCRIPTS\\modeling\\polySelectEveryNthEdgeUI.py", "sourcetype": "file", "tags": ["modeling", "select", "nth", "edge", "ui"], "title": "Select Every Nth Edge" }, { "type": "action", - "command": "$PYPE_SCRIPTS\\modeling\\djPFXUVs.py", + "command": "$OPENPYPE_SCRIPTS\\modeling\\djPFXUVs.py", "sourcetype": "file", "tags": ["modeling", "djPFX", "UVs"], "title": "dj PFX UVs", @@ -122,105 +122,105 @@ "items": [ { "type": "action", - "command": "$PYPE_SCRIPTS\\rigging\\addCurveBetween.py", + "command": "$OPENPYPE_SCRIPTS\\rigging\\addCurveBetween.py", "sourcetype": "file", "tags": ["rigging", "addCurveBetween", "file"], "title": "Add Curve Between" }, { "type": "action", - "command": "$PYPE_SCRIPTS\\rigging\\averageSkinWeights.py", + "command": "$OPENPYPE_SCRIPTS\\rigging\\averageSkinWeights.py", "sourcetype": "file", "tags": ["rigging", "average", "skin weights", "file"], "title": "Average Skin Weights" }, { "type": "action", - "command": "$PYPE_SCRIPTS\\rigging\\cbSmoothSkinWeightUI.py", + "command": "$OPENPYPE_SCRIPTS\\rigging\\cbSmoothSkinWeightUI.py", "sourcetype": "file", "tags": ["rigging", "cbSmoothSkinWeightUI", "file"], "title": "CB Smooth Skin Weight UI" }, { "type": "action", - "command": "$PYPE_SCRIPTS\\rigging\\channelBoxManagerUI.py", + "command": "$OPENPYPE_SCRIPTS\\rigging\\channelBoxManagerUI.py", "sourcetype": "file", "tags": ["rigging", "channelBoxManagerUI", "file"], "title": "Channel Box Manager UI" }, { "type": "action", - "command": "$PYPE_SCRIPTS\\rigging\\characterAutorigger.py", + "command": "$OPENPYPE_SCRIPTS\\rigging\\characterAutorigger.py", "sourcetype": "file", "tags": ["rigging", "characterAutorigger", "file"], "title": "Character Auto Rigger" }, { "type": "action", - "command": "$PYPE_SCRIPTS\\rigging\\connectUI.py", + "command": "$OPENPYPE_SCRIPTS\\rigging\\connectUI.py", "sourcetype": "file", "tags": ["rigging", "connectUI", "file"], "title": "Connect UI" }, { "type": "action", - "command": "$PYPE_SCRIPTS\\rigging\\copySkinWeightsLocal.py", + "command": "$OPENPYPE_SCRIPTS\\rigging\\copySkinWeightsLocal.py", "sourcetype": "file", "tags": ["rigging", "copySkinWeightsLocal", "file"], "title": "Copy Skin Weights Local" }, { "type": "action", - "command": "$PYPE_SCRIPTS\\rigging\\createCenterLocator.py", + "command": "$OPENPYPE_SCRIPTS\\rigging\\createCenterLocator.py", "sourcetype": "file", "tags": ["rigging", "createCenterLocator", "file"], "title": "Create Center Locator" }, { "type": "action", - "command": "$PYPE_SCRIPTS\\rigging\\freezeTransformToGroup.py", + "command": "$OPENPYPE_SCRIPTS\\rigging\\freezeTransformToGroup.py", "sourcetype": "file", "tags": ["rigging", "freezeTransformToGroup", "file"], "title": "Freeze Transform To Group" }, { "type": "action", - "command": "$PYPE_SCRIPTS\\rigging\\groupSelected.py", + "command": "$OPENPYPE_SCRIPTS\\rigging\\groupSelected.py", "sourcetype": "file", "tags": ["rigging", "groupSelected", "file"], "title": "Group Selected" }, { "type": "action", - "command": "$PYPE_SCRIPTS\\rigging\\ikHandlePoleVectorLocator.py", + "command": "$OPENPYPE_SCRIPTS\\rigging\\ikHandlePoleVectorLocator.py", "sourcetype": "file", "tags": ["rigging", "ikHandlePoleVectorLocator", "file"], "title": "IK Handle Pole Vector Locator" }, { "type": "action", - "command": "$PYPE_SCRIPTS\\rigging\\jointOrientUI.py", + "command": "$OPENPYPE_SCRIPTS\\rigging\\jointOrientUI.py", "sourcetype": "file", "tags": ["rigging", "jointOrientUI", "file"], "title": "Joint Orient UI" }, { "type": "action", - "command": "$PYPE_SCRIPTS\\rigging\\jointsOnCurve.py", + "command": "$OPENPYPE_SCRIPTS\\rigging\\jointsOnCurve.py", "sourcetype": "file", "tags": ["rigging", "jointsOnCurve", "file"], "title": "Joints On Curve" }, { "type": "action", - "command": "$PYPE_SCRIPTS\\rigging\\resetBindSelectedSkinJoints.py", + "command": "$OPENPYPE_SCRIPTS\\rigging\\resetBindSelectedSkinJoints.py", "sourcetype": "file", "tags": ["rigging", "resetBindSelectedSkinJoints", "file"], "title": "Reset Bind Selected Skin Joints" }, { "type": "action", - "command": "$PYPE_SCRIPTS\\rigging\\selectSkinclusterJointsFromSelectedComponents.py", + "command": "$OPENPYPE_SCRIPTS\\rigging\\selectSkinclusterJointsFromSelectedComponents.py", "sourcetype": "file", "tags": [ "rigging", @@ -231,7 +231,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\rigging\\selectSkinclusterJointsFromSelectedMesh.py", + "command": "$OPENPYPE_SCRIPTS\\rigging\\selectSkinclusterJointsFromSelectedMesh.py", "sourcetype": "file", "tags": [ "rigging", @@ -242,14 +242,14 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\rigging\\setJointLabels.py", + "command": "$OPENPYPE_SCRIPTS\\rigging\\setJointLabels.py", "sourcetype": "file", "tags": ["rigging", "setJointLabels", "file"], "title": "Set Joint Labels" }, { "type": "action", - "command": "$PYPE_SCRIPTS\\rigging\\setJointOrientationFromCurrentRotation.py", + "command": "$OPENPYPE_SCRIPTS\\rigging\\setJointOrientationFromCurrentRotation.py", "sourcetype": "file", "tags": [ "rigging", @@ -260,84 +260,84 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\rigging\\setSelectedJointsOrientationZero.py", + "command": "$OPENPYPE_SCRIPTS\\rigging\\setSelectedJointsOrientationZero.py", "sourcetype": "file", "tags": ["rigging", "setSelectedJointsOrientationZero", "file"], "title": "Set Selected Joints Orientation Zero" }, { "type": "action", - "command": "$PYPE_SCRIPTS\\rigging\\mirrorCurveShape.py", + "command": "$OPENPYPE_SCRIPTS\\rigging\\mirrorCurveShape.py", "sourcetype": "file", "tags": ["rigging", "mirrorCurveShape", "file"], "title": "Mirror Curve Shape" }, { "type": "action", - "command": "$PYPE_SCRIPTS\\rigging\\setRotationOrderUI.py", + "command": "$OPENPYPE_SCRIPTS\\rigging\\setRotationOrderUI.py", "sourcetype": "file", "tags": ["rigging", "setRotationOrderUI", "file"], "title": "Set Rotation Order UI" }, { "type": "action", - "command": "$PYPE_SCRIPTS\\rigging\\paintItNowUI.py", + "command": "$OPENPYPE_SCRIPTS\\rigging\\paintItNowUI.py", "sourcetype": "file", "tags": ["rigging", "paintItNowUI", "file"], "title": "Paint It Now UI" }, { "type": "action", - "command": "$PYPE_SCRIPTS\\rigging\\parentScaleConstraint.py", + "command": "$OPENPYPE_SCRIPTS\\rigging\\parentScaleConstraint.py", "sourcetype": "file", "tags": ["rigging", "parentScaleConstraint", "file"], "title": "Parent Scale Constraint" }, { "type": "action", - "command": "$PYPE_SCRIPTS\\rigging\\quickSetWeightsUI.py", + "command": "$OPENPYPE_SCRIPTS\\rigging\\quickSetWeightsUI.py", "sourcetype": "file", "tags": ["rigging", "quickSetWeightsUI", "file"], "title": "Quick Set Weights UI" }, { "type": "action", - "command": "$PYPE_SCRIPTS\\rigging\\rapidRig.py", + "command": "$OPENPYPE_SCRIPTS\\rigging\\rapidRig.py", "sourcetype": "file", "tags": ["rigging", "rapidRig", "file"], "title": "Rapid Rig" }, { "type": "action", - "command": "$PYPE_SCRIPTS\\rigging\\regenerate_blendshape_targets.py", + "command": "$OPENPYPE_SCRIPTS\\rigging\\regenerate_blendshape_targets.py", "sourcetype": "file", "tags": ["rigging", "regenerate_blendshape_targets", "file"], "title": "Regenerate Blendshape Targets" }, { "type": "action", - "command": "$PYPE_SCRIPTS\\rigging\\removeRotationAxis.py", + "command": "$OPENPYPE_SCRIPTS\\rigging\\removeRotationAxis.py", "sourcetype": "file", "tags": ["rigging", "removeRotationAxis", "file"], "title": "Remove Rotation Axis" }, { "type": "action", - "command": "$PYPE_SCRIPTS\\rigging\\resetBindSelectedMeshes.py", + "command": "$OPENPYPE_SCRIPTS\\rigging\\resetBindSelectedMeshes.py", "sourcetype": "file", "tags": ["rigging", "resetBindSelectedMeshes", "file"], "title": "Reset Bind Selected Meshes" }, { "type": "action", - "command": "$PYPE_SCRIPTS\\rigging\\simpleControllerOnSelection.py", + "command": "$OPENPYPE_SCRIPTS\\rigging\\simpleControllerOnSelection.py", "sourcetype": "file", "tags": ["rigging", "simpleControllerOnSelection", "file"], "title": "Simple Controller On Selection" }, { "type": "action", - "command": "$PYPE_SCRIPTS\\rigging\\simpleControllerOnSelectionHierarchy.py", + "command": "$OPENPYPE_SCRIPTS\\rigging\\simpleControllerOnSelectionHierarchy.py", "sourcetype": "file", "tags": [ "rigging", @@ -348,35 +348,35 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\rigging\\superRelativeCluster.py", + "command": "$OPENPYPE_SCRIPTS\\rigging\\superRelativeCluster.py", "sourcetype": "file", "tags": ["rigging", "superRelativeCluster", "file"], "title": "Super Relative Cluster" }, { "type": "action", - "command": "$PYPE_SCRIPTS\\rigging\\tfSmoothSkinWeight.py", + "command": "$OPENPYPE_SCRIPTS\\rigging\\tfSmoothSkinWeight.py", "sourcetype": "file", "tags": ["rigging", "tfSmoothSkinWeight", "file"], "title": "TF Smooth Skin Weight" }, { "type": "action", - "command": "$PYPE_SCRIPTS\\rigging\\toggleIntermediates.py", + "command": "$OPENPYPE_SCRIPTS\\rigging\\toggleIntermediates.py", "sourcetype": "file", "tags": ["rigging", "toggleIntermediates", "file"], "title": "Toggle Intermediates" }, { "type": "action", - "command": "$PYPE_SCRIPTS\\rigging\\toggleSegmentScaleCompensate.py", + "command": "$OPENPYPE_SCRIPTS\\rigging\\toggleSegmentScaleCompensate.py", "sourcetype": "file", "tags": ["rigging", "toggleSegmentScaleCompensate", "file"], "title": "Toggle Segment Scale Compensate" }, { "type": "action", - "command": "$PYPE_SCRIPTS\\rigging\\toggleSkinclusterDeformNormals.py", + "command": "$OPENPYPE_SCRIPTS\\rigging\\toggleSkinclusterDeformNormals.py", "sourcetype": "file", "tags": ["rigging", "toggleSkinclusterDeformNormals", "file"], "title": "Toggle Skincluster Deform Normals" @@ -394,7 +394,7 @@ { "type": "action", "title": "Import Proxies", - "command": "$PYPE_SCRIPTS\\shading\\vray\\vrayImportProxies.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\vray\\vrayImportProxies.py", "sourcetype": "file", "tags": ["shading", "vray", "import", "proxies"], "tooltip": "" @@ -405,7 +405,7 @@ { "type": "action", "title": "Select All GES", - "command": "$PYPE_SCRIPTS\\shading\\vray\\selectAllGES.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\vray\\selectAllGES.py", "sourcetype": "file", "tooltip": "", "tags": ["shading", "vray", "select All GES"] @@ -413,7 +413,7 @@ { "type": "action", "title": "Select All GES Under Selection", - "command": "$PYPE_SCRIPTS\\shading\\vray\\selectAllGESUnderSelection.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\vray\\selectAllGESUnderSelection.py", "sourcetype": "file", "tooltip": "", "tags": ["shading", "vray", "select", "all", "GES"] @@ -424,7 +424,7 @@ { "type": "action", "title": "Selection To VRay Mesh", - "command": "$PYPE_SCRIPTS\\shading\\vray\\selectionToVrayMesh.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\vray\\selectionToVrayMesh.py", "sourcetype": "file", "tooltip": "", "tags": ["shading", "vray", "selection", "vraymesh"] @@ -432,7 +432,7 @@ { "type": "action", "title": "Add VRay Round Edges Attribute", - "command": "$PYPE_SCRIPTS\\shading\\vray\\addVrayRoundEdgesAttribute.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\vray\\addVrayRoundEdgesAttribute.py", "sourcetype": "file", "tooltip": "", "tags": ["shading", "vray", "round edges", "attribute"] @@ -440,7 +440,7 @@ { "type": "action", "title": "Add Gamma", - "command": "$PYPE_SCRIPTS\\shading\\vray\\vrayAddGamma.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\vray\\vrayAddGamma.py", "sourcetype": "file", "tooltip": "", "tags": ["shading", "vray", "add gamma"] @@ -450,7 +450,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\shading\\vray\\select_vraymesh_materials_with_unconnected_shader_slots.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\vray\\select_vraymesh_materials_with_unconnected_shader_slots.py", "sourcetype": "file", "title": "Select Unconnected Shader Materials", "tags": [ @@ -465,7 +465,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\shading\\vray\\vrayMergeSimilarVRayMeshMaterials.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\vray\\vrayMergeSimilarVRayMeshMaterials.py", "sourcetype": "file", "title": "Merge Similar VRay Mesh Materials", "tags": [ @@ -480,7 +480,7 @@ { "type": "action", "title": "Create Two Sided Material", - "command": "$PYPE_SCRIPTS\\shading\\vray\\vrayCreate2SidedMtlForSelectedMtlRenamed.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\vray\\vrayCreate2SidedMtlForSelectedMtlRenamed.py", "sourcetype": "file", "tooltip": "Creates two sided material for selected material and renames it", "tags": ["shading", "vray", "two sided", "material"] @@ -488,7 +488,7 @@ { "type": "action", "title": "Create Two Sided Material For Selected", - "command": "$PYPE_SCRIPTS\\shading\\vray\\vrayCreate2SidedMtlForSelectedMtl.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\vray\\vrayCreate2SidedMtlForSelectedMtl.py", "sourcetype": "file", "tooltip": "Select material to create a two sided version from it", "tags": [ @@ -503,7 +503,7 @@ { "type": "action", "title": "Add OpenSubdiv Attribute", - "command": "$PYPE_SCRIPTS\\shading\\vray\\addVrayOpenSubdivAttribute.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\vray\\addVrayOpenSubdivAttribute.py", "sourcetype": "file", "tooltip": "", "tags": [ @@ -517,7 +517,7 @@ { "type": "action", "title": "Remove OpenSubdiv Attribute", - "command": "$PYPE_SCRIPTS\\shading\\vray\\removeVrayOpenSubdivAttribute.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\vray\\removeVrayOpenSubdivAttribute.py", "sourcetype": "file", "tooltip": "", "tags": [ @@ -534,7 +534,7 @@ { "type": "action", "title": "Add Subdivision Attribute", - "command": "$PYPE_SCRIPTS\\shading\\vray\\addVraySubdivisionAttribute.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\vray\\addVraySubdivisionAttribute.py", "sourcetype": "file", "tooltip": "", "tags": [ @@ -546,7 +546,7 @@ { "type": "action", "title": "Remove Subdivision Attribute.py", - "command": "$PYPE_SCRIPTS\\shading\\vray\\removeVraySubdivisionAttribute.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\vray\\removeVraySubdivisionAttribute.py", "sourcetype": "file", "tooltip": "", "tags": [ @@ -563,7 +563,7 @@ { "type": "action", "title": "Add Vray Object Ids", - "command": "$PYPE_SCRIPTS\\shading\\vray\\addVrayObjectIds.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\vray\\addVrayObjectIds.py", "sourcetype": "file", "tooltip": "", "tags": ["shading", "vray", "add", "object id"] @@ -571,7 +571,7 @@ { "type": "action", "title": "Add Vray Material Ids", - "command": "$PYPE_SCRIPTS\\shading\\vray\\addVrayMaterialIds.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\vray\\addVrayMaterialIds.py", "sourcetype": "file", "tooltip": "", "tags": ["shading", "vray", "addVrayMaterialIds.py"] @@ -582,7 +582,7 @@ { "type": "action", "title": "Set Physical DOF Depth", - "command": "$PYPE_SCRIPTS\\shading\\vray\\vrayPhysicalDOFSetDepth.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\vray\\vrayPhysicalDOFSetDepth.py", "sourcetype": "file", "tooltip": "", "tags": ["shading", "vray", "physical", "DOF ", "Depth"] @@ -590,7 +590,7 @@ { "type": "action", "title": "Magic Vray Proxy UI", - "command": "$PYPE_SCRIPTS\\shading\\vray\\magicVrayProxyUI.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\vray\\magicVrayProxyUI.py", "sourcetype": "file", "tooltip": "", "tags": ["shading", "vray", "magicVrayProxyUI"] @@ -599,7 +599,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\pyblish\\lighting\\set_filename_prefix.py", + "command": "$OPENPYPE_SCRIPTS\\pyblish\\lighting\\set_filename_prefix.py", "sourcetype": "file", "tags": [ "shading", @@ -623,7 +623,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\shading\\LightLinkUi.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\LightLinkUi.py", "sourcetype": "file", "tags": ["shading", "light", "link", "ui"], "title": "Light Link UI", @@ -631,7 +631,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\shading\\vdviewer_ui.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\vdviewer_ui.py", "sourcetype": "file", "tags": [ "shading", @@ -646,7 +646,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\shading\\setTexturePreviewToCLRImage.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\setTexturePreviewToCLRImage.py", "sourcetype": "file", "tags": ["shading", "CLRImage", "textures", "preview"], "title": "Set Texture Preview To CLRImage", @@ -654,7 +654,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\shading\\fixDefaultShaderSetBehavior.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\fixDefaultShaderSetBehavior.py", "sourcetype": "file", "tags": ["shading", "fix", "DefaultShaderSet", "Behavior"], "title": "Fix Default Shader Set Behavior", @@ -662,7 +662,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\shading\\fixSelectedShapesReferenceAssignments.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\fixSelectedShapesReferenceAssignments.py", "sourcetype": "file", "tags": [ "shading", @@ -677,7 +677,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\shading\\selectLambert1Members.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\selectLambert1Members.py", "sourcetype": "file", "tags": ["shading", "selectLambert1Members"], "title": "Select Lambert1 Members", @@ -685,7 +685,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\shading\\selectShapesWithoutShader.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\selectShapesWithoutShader.py", "sourcetype": "file", "tags": ["shading", "selectShapesWithoutShader"], "title": "Select Shapes Without Shader", @@ -693,7 +693,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\shading\\fixRenderLayerOutAdjustmentErrors.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\fixRenderLayerOutAdjustmentErrors.py", "sourcetype": "file", "tags": ["shading", "fixRenderLayerOutAdjustmentErrors"], "title": "Fix RenderLayer Out Adjustment Errors", @@ -701,7 +701,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\shading\\fix_renderlayer_missing_node_override.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\fix_renderlayer_missing_node_override.py", "sourcetype": "file", "tags": [ "shading", @@ -717,7 +717,7 @@ { "type": "action", "title": "Image 2 Tiled EXR", - "command": "$PYPE_SCRIPTS\\shading\\open_img2exr.py", + "command": "$OPENPYPE_SCRIPTS\\shading\\open_img2exr.py", "sourcetype": "file", "tooltip": "", "tags": ["shading", "vray", "exr"] @@ -730,7 +730,7 @@ "items": [ { "type": "action", - "command": "$PYPE_SCRIPTS\\pyblish\\open_deadline_submission_settings.py", + "command": "$OPENPYPE_SCRIPTS\\pyblish\\open_deadline_submission_settings.py", "sourcetype": "file", "tags": ["settings", "deadline", "globals", "render"], "title": "DL Submission Settings UI", @@ -749,7 +749,7 @@ "items": [ { "type": "action", - "command": "$PYPE_SCRIPTS\\animation\\attributes\\copyValues.py", + "command": "$OPENPYPE_SCRIPTS\\animation\\attributes\\copyValues.py", "sourcetype": "file", "tags": ["animation", "copy", "attributes"], "title": "Copy Values", @@ -757,7 +757,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\animation\\attributes\\copyInConnections.py", + "command": "$OPENPYPE_SCRIPTS\\animation\\attributes\\copyInConnections.py", "sourcetype": "file", "tags": [ "animation", @@ -771,7 +771,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\animation\\attributes\\copyOutConnections.py", + "command": "$OPENPYPE_SCRIPTS\\animation\\attributes\\copyOutConnections.py", "sourcetype": "file", "tags": [ "animation", @@ -785,7 +785,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\animation\\attributes\\copyTransformLocal.py", + "command": "$OPENPYPE_SCRIPTS\\animation\\attributes\\copyTransformLocal.py", "sourcetype": "file", "tags": [ "animation", @@ -799,7 +799,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\animation\\attributes\\copyTransformMatrix.py", + "command": "$OPENPYPE_SCRIPTS\\animation\\attributes\\copyTransformMatrix.py", "sourcetype": "file", "tags": [ "animation", @@ -813,7 +813,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\animation\\attributes\\copyTransformUI.py", + "command": "$OPENPYPE_SCRIPTS\\animation\\attributes\\copyTransformUI.py", "sourcetype": "file", "tags": [ "animation", @@ -827,7 +827,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\animation\\attributes\\simpleCopyUI.py", + "command": "$OPENPYPE_SCRIPTS\\animation\\attributes\\simpleCopyUI.py", "sourcetype": "file", "tags": [ "animation", @@ -849,7 +849,7 @@ "items": [ { "type": "action", - "command": "$PYPE_SCRIPTS\\animation\\optimize\\toggleFreezeHierarchy.py", + "command": "$OPENPYPE_SCRIPTS\\animation\\optimize\\toggleFreezeHierarchy.py", "sourcetype": "file", "tags": ["animation", "hierarchy", "toggle", "freeze"], "title": "Toggle Freeze Hierarchy", @@ -857,7 +857,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\animation\\optimize\\toggleParallelNucleus.py", + "command": "$OPENPYPE_SCRIPTS\\animation\\optimize\\toggleParallelNucleus.py", "sourcetype": "file", "tags": ["animation", "nucleus", "toggle", "parallel"], "title": "Toggle Parallel Nucleus", @@ -867,21 +867,21 @@ }, { "sourcetype": "file", - "command": "$PYPE_SCRIPTS\\animation\\bakeSelectedToWorldSpace.py", + "command": "$OPENPYPE_SCRIPTS\\animation\\bakeSelectedToWorldSpace.py", "tags": ["animation", "bake", "selection", "worldspace.py"], "title": "Bake Selected To Worldspace", "type": "action" }, { "sourcetype": "file", - "command": "$PYPE_SCRIPTS\\animation\\timeStepper.py", + "command": "$OPENPYPE_SCRIPTS\\animation\\timeStepper.py", "tags": ["animation", "time", "stepper"], "title": "Time Stepper", "type": "action" }, { "sourcetype": "file", - "command": "$PYPE_SCRIPTS\\animation\\capture_ui.py", + "command": "$OPENPYPE_SCRIPTS\\animation\\capture_ui.py", "tags": [ "animation", "capture", @@ -895,63 +895,63 @@ }, { "sourcetype": "file", - "command": "$PYPE_SCRIPTS\\animation\\simplePlayblastUI.py", + "command": "$OPENPYPE_SCRIPTS\\animation\\simplePlayblastUI.py", "tags": ["animation", "simple", "playblast", "ui"], "title": "Simple Playblast UI", "type": "action" }, { "sourcetype": "file", - "command": "$PYPE_SCRIPTS\\animation\\tweenMachineUI.py", + "command": "$OPENPYPE_SCRIPTS\\animation\\tweenMachineUI.py", "tags": ["animation", "tween", "machine"], "title": "Tween Machine UI", "type": "action" }, { "sourcetype": "file", - "command": "$PYPE_SCRIPTS\\animation\\selectAllAnimationCurves.py", + "command": "$OPENPYPE_SCRIPTS\\animation\\selectAllAnimationCurves.py", "tags": ["animation", "select", "curves"], "title": "Select All Animation Curves", "type": "action" }, { "sourcetype": "file", - "command": "$PYPE_SCRIPTS\\animation\\pathAnimation.py", + "command": "$OPENPYPE_SCRIPTS\\animation\\pathAnimation.py", "tags": ["animation", "path", "along"], "title": "Path Animation", "type": "action" }, { "sourcetype": "file", - "command": "$PYPE_SCRIPTS\\animation\\offsetSelectedObjectsUI.py", + "command": "$OPENPYPE_SCRIPTS\\animation\\offsetSelectedObjectsUI.py", "tags": ["animation", "offsetSelectedObjectsUI.py"], "title": "Offset Selected Objects UI", "type": "action" }, { "sourcetype": "file", - "command": "$PYPE_SCRIPTS\\animation\\key_amplifier_ui.py", + "command": "$OPENPYPE_SCRIPTS\\animation\\key_amplifier_ui.py", "tags": ["animation", "key", "amplifier"], "title": "Key Amplifier UI", "type": "action" }, { "sourcetype": "file", - "command": "$PYPE_SCRIPTS\\animation\\anim_scene_optimizer.py", + "command": "$OPENPYPE_SCRIPTS\\animation\\anim_scene_optimizer.py", "tags": ["animation", "anim_scene_optimizer.py"], "title": "Anim_Scene_Optimizer", "type": "action" }, { "sourcetype": "file", - "command": "$PYPE_SCRIPTS\\animation\\zvParentMaster.py", + "command": "$OPENPYPE_SCRIPTS\\animation\\zvParentMaster.py", "tags": ["animation", "zvParentMaster.py"], "title": "ZV Parent Master", "type": "action" }, { "sourcetype": "file", - "command": "$PYPE_SCRIPTS\\animation\\poseLibrary.py", + "command": "$OPENPYPE_SCRIPTS\\animation\\poseLibrary.py", "tags": ["animation", "poseLibrary.py"], "title": "Pose Library", "type": "action" @@ -964,7 +964,7 @@ "items": [ { "type": "action", - "command": "$PYPE_SCRIPTS\\layout\\alignDistributeUI.py", + "command": "$OPENPYPE_SCRIPTS\\layout\\alignDistributeUI.py", "sourcetype": "file", "tags": ["layout", "align", "Distribute", "UI"], "title": "Align Distribute UI", @@ -972,7 +972,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\layout\\alignSimpleUI.py", + "command": "$OPENPYPE_SCRIPTS\\layout\\alignSimpleUI.py", "sourcetype": "file", "tags": ["layout", "align", "UI", "Simple"], "title": "Align Simple UI", @@ -980,7 +980,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\layout\\center_locator.py", + "command": "$OPENPYPE_SCRIPTS\\layout\\center_locator.py", "sourcetype": "file", "tags": ["layout", "center", "locator"], "title": "Center Locator", @@ -988,7 +988,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\layout\\average_locator.py", + "command": "$OPENPYPE_SCRIPTS\\layout\\average_locator.py", "sourcetype": "file", "tags": ["layout", "average", "locator"], "title": "Average Locator", @@ -996,7 +996,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\layout\\selectWithinProximityUI.py", + "command": "$OPENPYPE_SCRIPTS\\layout\\selectWithinProximityUI.py", "sourcetype": "file", "tags": ["layout", "select", "proximity", "ui"], "title": "Select Within Proximity UI", @@ -1004,7 +1004,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\layout\\dupCurveUI.py", + "command": "$OPENPYPE_SCRIPTS\\layout\\dupCurveUI.py", "sourcetype": "file", "tags": ["layout", "Duplicate", "Curve", "UI"], "title": "Duplicate Curve UI", @@ -1012,7 +1012,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\layout\\randomDeselectUI.py", + "command": "$OPENPYPE_SCRIPTS\\layout\\randomDeselectUI.py", "sourcetype": "file", "tags": ["layout", "random", "Deselect", "UI"], "title": "Random Deselect UI", @@ -1020,7 +1020,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\layout\\multiReferencerUI.py", + "command": "$OPENPYPE_SCRIPTS\\layout\\multiReferencerUI.py", "sourcetype": "file", "tags": ["layout", "multi", "reference"], "title": "Multi Referencer UI", @@ -1028,7 +1028,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\layout\\duplicateOffsetUI.py", + "command": "$OPENPYPE_SCRIPTS\\layout\\duplicateOffsetUI.py", "sourcetype": "file", "tags": ["layout", "duplicate", "offset", "UI"], "title": "Duplicate Offset UI", @@ -1036,7 +1036,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\layout\\spPaint3d.py", + "command": "$OPENPYPE_SCRIPTS\\layout\\spPaint3d.py", "sourcetype": "file", "tags": ["layout", "spPaint3d", "paint", "tool"], "title": "SP Paint 3d", @@ -1044,7 +1044,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\layout\\randomizeUI.py", + "command": "$OPENPYPE_SCRIPTS\\layout\\randomizeUI.py", "sourcetype": "file", "tags": ["layout", "randomize", "UI"], "title": "Randomize UI", @@ -1052,7 +1052,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\layout\\distributeWithinObjectUI.py", + "command": "$OPENPYPE_SCRIPTS\\layout\\distributeWithinObjectUI.py", "sourcetype": "file", "tags": ["layout", "distribute", "ObjectUI", "within"], "title": "Distribute Within Object UI", @@ -1066,7 +1066,7 @@ "items": [ { "type": "action", - "command": "$PYPE_SCRIPTS\\particles\\instancerToObjects.py", + "command": "$OPENPYPE_SCRIPTS\\particles\\instancerToObjects.py", "sourcetype": "file", "tags": ["particles", "instancerToObjects"], "title": "Instancer To Objects", @@ -1074,7 +1074,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\particles\\instancerToObjectsInstances.py", + "command": "$OPENPYPE_SCRIPTS\\particles\\instancerToObjectsInstances.py", "sourcetype": "file", "tags": ["particles", "instancerToObjectsInstances"], "title": "Instancer To Objects Instances", @@ -1082,7 +1082,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\particles\\objectsToParticlesAndInstancerCleanSource.py", + "command": "$OPENPYPE_SCRIPTS\\particles\\objectsToParticlesAndInstancerCleanSource.py", "sourcetype": "file", "tags": [ "particles", @@ -1097,7 +1097,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\particles\\particleComponentsToLocators.py", + "command": "$OPENPYPE_SCRIPTS\\particles\\particleComponentsToLocators.py", "sourcetype": "file", "tags": ["particles", "components", "locators"], "title": "Particle Components To Locators", @@ -1105,7 +1105,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\particles\\objectsToParticlesAndInstancer.py", + "command": "$OPENPYPE_SCRIPTS\\particles\\objectsToParticlesAndInstancer.py", "sourcetype": "file", "tags": ["particles", "objects", "particles", "instancer"], "title": "Objects To Particles And Instancer", @@ -1113,7 +1113,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\particles\\spawnParticlesOnMesh.py", + "command": "$OPENPYPE_SCRIPTS\\particles\\spawnParticlesOnMesh.py", "sourcetype": "file", "tags": ["particles", "spawn", "on", "mesh"], "title": "Spawn Particles On Mesh", @@ -1121,7 +1121,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\particles\\instancerToObjectsInstancesWithAnimation.py", + "command": "$OPENPYPE_SCRIPTS\\particles\\instancerToObjectsInstancesWithAnimation.py", "sourcetype": "file", "tags": [ "particles", @@ -1132,7 +1132,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\particles\\objectsToParticles.py", + "command": "$OPENPYPE_SCRIPTS\\particles\\objectsToParticles.py", "sourcetype": "file", "tags": ["particles", "objectsToParticles"], "title": "Objects To Particles", @@ -1140,7 +1140,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\particles\\add_particle_cacheFile_attrs.py", + "command": "$OPENPYPE_SCRIPTS\\particles\\add_particle_cacheFile_attrs.py", "sourcetype": "file", "tags": ["particles", "add_particle_cacheFile_attrs"], "title": "Add Particle CacheFile Attributes", @@ -1148,7 +1148,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\particles\\mergeParticleSystems.py", + "command": "$OPENPYPE_SCRIPTS\\particles\\mergeParticleSystems.py", "sourcetype": "file", "tags": ["particles", "mergeParticleSystems"], "title": "Merge Particle Systems", @@ -1156,7 +1156,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\particles\\particlesToLocators.py", + "command": "$OPENPYPE_SCRIPTS\\particles\\particlesToLocators.py", "sourcetype": "file", "tags": ["particles", "particlesToLocators"], "title": "Particles To Locators", @@ -1164,7 +1164,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\particles\\instancerToObjectsWithAnimation.py", + "command": "$OPENPYPE_SCRIPTS\\particles\\instancerToObjectsWithAnimation.py", "sourcetype": "file", "tags": ["particles", "instancerToObjectsWithAnimation"], "title": "Instancer To Objects With Animation", @@ -1175,7 +1175,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\particles\\mayaReplicateHoudiniTool.py", + "command": "$OPENPYPE_SCRIPTS\\particles\\mayaReplicateHoudiniTool.py", "sourcetype": "file", "tags": [ "particles", @@ -1191,7 +1191,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\particles\\clearInitialState.py", + "command": "$OPENPYPE_SCRIPTS\\particles\\clearInitialState.py", "sourcetype": "file", "tags": ["particles", "clearInitialState"], "title": "Clear Initial State", @@ -1199,7 +1199,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\particles\\killSelectedParticles.py", + "command": "$OPENPYPE_SCRIPTS\\particles\\killSelectedParticles.py", "sourcetype": "file", "tags": ["particles", "killSelectedParticles"], "title": "Kill Selected Particles", @@ -1213,7 +1213,7 @@ "items": [ { "type": "action", - "command": "$PYPE_SCRIPTS\\yeti\\yeti_rig_manager.py", + "command": "$OPENPYPE_SCRIPTS\\yeti\\yeti_rig_manager.py", "sourcetype": "file", "tags": ["yeti", "rig", "fur", "manager"], "title": "Open Yeti Rig Manager", @@ -1227,7 +1227,7 @@ "items": [ { "type": "action", - "command": "$PYPE_SCRIPTS\\cleanup\\repair_faulty_containers.py", + "command": "$OPENPYPE_SCRIPTS\\cleanup\\repair_faulty_containers.py", "sourcetype": "file", "tags": ["cleanup", "repair", "containers"], "title": "Find and Repair Containers", @@ -1235,7 +1235,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\cleanup\\selectByType.py", + "command": "$OPENPYPE_SCRIPTS\\cleanup\\selectByType.py", "sourcetype": "file", "tags": ["cleanup", "selectByType"], "title": "Select By Type", @@ -1243,7 +1243,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\cleanup\\selectIntermediateObjects.py", + "command": "$OPENPYPE_SCRIPTS\\cleanup\\selectIntermediateObjects.py", "sourcetype": "file", "tags": ["cleanup", "selectIntermediateObjects"], "title": "Select Intermediate Objects", @@ -1251,7 +1251,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\cleanup\\selectNonUniqueNames.py", + "command": "$OPENPYPE_SCRIPTS\\cleanup\\selectNonUniqueNames.py", "sourcetype": "file", "tags": ["cleanup", "select", "non unique", "names"], "title": "Select Non Unique Names", @@ -1262,7 +1262,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\cleanup\\removeNamespaces.py", + "command": "$OPENPYPE_SCRIPTS\\cleanup\\removeNamespaces.py", "sourcetype": "file", "tags": ["cleanup", "remove", "namespaces"], "title": "Remove Namespaces", @@ -1270,7 +1270,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\cleanup\\remove_user_defined_attributes.py", + "command": "$OPENPYPE_SCRIPTS\\cleanup\\remove_user_defined_attributes.py", "sourcetype": "file", "tags": ["cleanup", "remove_user_defined_attributes"], "title": "Remove User Defined Attributes", @@ -1278,7 +1278,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\cleanup\\removeUnknownNodes.py", + "command": "$OPENPYPE_SCRIPTS\\cleanup\\removeUnknownNodes.py", "sourcetype": "file", "tags": ["cleanup", "removeUnknownNodes"], "title": "Remove Unknown Nodes", @@ -1286,7 +1286,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\cleanup\\removeUnloadedReferences.py", + "command": "$OPENPYPE_SCRIPTS\\cleanup\\removeUnloadedReferences.py", "sourcetype": "file", "tags": ["cleanup", "removeUnloadedReferences"], "title": "Remove Unloaded References", @@ -1294,7 +1294,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\cleanup\\removeReferencesFailedEdits.py", + "command": "$OPENPYPE_SCRIPTS\\cleanup\\removeReferencesFailedEdits.py", "sourcetype": "file", "tags": ["cleanup", "removeReferencesFailedEdits"], "title": "Remove References Failed Edits", @@ -1302,7 +1302,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\cleanup\\remove_unused_looks.py", + "command": "$OPENPYPE_SCRIPTS\\cleanup\\remove_unused_looks.py", "sourcetype": "file", "tags": ["cleanup", "removeUnusedLooks"], "title": "Remove Unused Looks", @@ -1310,7 +1310,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\cleanup\\deleteGhostIntermediateObjects.py", + "command": "$OPENPYPE_SCRIPTS\\cleanup\\deleteGhostIntermediateObjects.py", "sourcetype": "file", "tags": ["cleanup", "deleteGhostIntermediateObjects"], "title": "Delete Ghost Intermediate Objects", @@ -1321,7 +1321,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\cleanup\\resetViewportCache.py", + "command": "$OPENPYPE_SCRIPTS\\cleanup\\resetViewportCache.py", "sourcetype": "file", "tags": ["cleanup", "reset", "viewport", "cache"], "title": "Reset Viewport Cache", @@ -1329,7 +1329,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\cleanup\\uniqifyNodeNames.py", + "command": "$OPENPYPE_SCRIPTS\\cleanup\\uniqifyNodeNames.py", "sourcetype": "file", "tags": ["cleanup", "uniqifyNodeNames"], "title": "Uniqify Node Names", @@ -1337,7 +1337,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\cleanup\\autoRenameFileNodes.py", + "command": "$OPENPYPE_SCRIPTS\\cleanup\\autoRenameFileNodes.py", "sourcetype": "file", "tags": ["cleanup", "auto", "rename", "filenodes"], "title": "Auto Rename File Nodes", @@ -1345,7 +1345,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\cleanup\\update_asset_id.py", + "command": "$OPENPYPE_SCRIPTS\\cleanup\\update_asset_id.py", "sourcetype": "file", "tags": ["cleanup", "update", "database", "asset", "id"], "title": "Update Asset ID", @@ -1353,7 +1353,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\cleanup\\colorbleedRename.py", + "command": "$OPENPYPE_SCRIPTS\\cleanup\\colorbleedRename.py", "sourcetype": "file", "tags": ["cleanup", "rename", "ui"], "title": "Colorbleed Renamer", @@ -1361,7 +1361,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\cleanup\\renameShapesToTransform.py", + "command": "$OPENPYPE_SCRIPTS\\cleanup\\renameShapesToTransform.py", "sourcetype": "file", "tags": ["cleanup", "renameShapesToTransform"], "title": "Rename Shapes To Transform", @@ -1369,7 +1369,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\cleanup\\reorderUI.py", + "command": "$OPENPYPE_SCRIPTS\\cleanup\\reorderUI.py", "sourcetype": "file", "tags": ["cleanup", "reorderUI"], "title": "Reorder UI", @@ -1377,7 +1377,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\cleanup\\pastedCleaner.py", + "command": "$OPENPYPE_SCRIPTS\\cleanup\\pastedCleaner.py", "sourcetype": "file", "tags": ["cleanup", "pastedCleaner"], "title": "Pasted Cleaner", @@ -1396,7 +1396,7 @@ "items": [ { "type": "action", - "command": "$PYPE_SCRIPTS\\others\\yeti\\cache_selected_yeti_nodes.py", + "command": "$OPENPYPE_SCRIPTS\\others\\yeti\\cache_selected_yeti_nodes.py", "sourcetype": "file", "tags": ["others", "yeti", "cache", "selected"], "title": "Cache Selected Yeti Nodes", @@ -1411,7 +1411,7 @@ "items": [ { "type": "action", - "command": "$PYPE_SCRIPTS\\others\\hair\\recolorHairCurrentCurve", + "command": "$OPENPYPE_SCRIPTS\\others\\hair\\recolorHairCurrentCurve", "sourcetype": "file", "tags": ["others", "selectSoftSelection"], "title": "Select Soft Selection", @@ -1421,14 +1421,14 @@ }, { "type": "menu", - "command": "$PYPE_SCRIPTS\\others\\display", + "command": "$OPENPYPE_SCRIPTS\\others\\display", "sourcetype": "file", "tags": ["others", "display"], "title": "Display", "items": [ { "type": "action", - "command": "$PYPE_SCRIPTS\\others\\display\\wireframeSelectedObjects.py", + "command": "$OPENPYPE_SCRIPTS\\others\\display\\wireframeSelectedObjects.py", "sourcetype": "file", "tags": ["others", "wireframe", "selected", "objects"], "title": "Wireframe Selected Objects", @@ -1438,7 +1438,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\others\\archiveSceneUI.py", + "command": "$OPENPYPE_SCRIPTS\\others\\archiveSceneUI.py", "sourcetype": "file", "tags": ["others", "archiveSceneUI"], "title": "Archive Scene UI", @@ -1446,7 +1446,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\others\\getSimilarMeshes.py", + "command": "$OPENPYPE_SCRIPTS\\others\\getSimilarMeshes.py", "sourcetype": "file", "tags": ["others", "getSimilarMeshes"], "title": "Get Similar Meshes", @@ -1454,7 +1454,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\others\\createBoundingBoxEachSelected.py", + "command": "$OPENPYPE_SCRIPTS\\others\\createBoundingBoxEachSelected.py", "sourcetype": "file", "tags": ["others", "createBoundingBoxEachSelected"], "title": "Create BoundingBox Each Selected", @@ -1462,7 +1462,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\others\\curveFromPositionEveryFrame.py", + "command": "$OPENPYPE_SCRIPTS\\others\\curveFromPositionEveryFrame.py", "sourcetype": "file", "tags": ["others", "curveFromPositionEveryFrame"], "title": "Curve From Position", @@ -1470,7 +1470,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\others\\instanceLeafSmartTransform.py", + "command": "$OPENPYPE_SCRIPTS\\others\\instanceLeafSmartTransform.py", "sourcetype": "file", "tags": ["others", "instance", "leaf", "smart", "transform"], "title": "Instance Leaf Smart Transform", @@ -1478,7 +1478,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\others\\instanceSmartTransform.py", + "command": "$OPENPYPE_SCRIPTS\\others\\instanceSmartTransform.py", "sourcetype": "file", "tags": ["others", "instance", "smart", "transform"], "title": "Instance Smart Transform", @@ -1486,7 +1486,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\others\\randomizeUVShellsSelectedObjects.py", + "command": "$OPENPYPE_SCRIPTS\\others\\randomizeUVShellsSelectedObjects.py", "sourcetype": "file", "tags": ["others", "randomizeUVShellsSelectedObjects"], "title": "Randomize UV Shells", @@ -1494,7 +1494,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\others\\centerPivotGroup.py", + "command": "$OPENPYPE_SCRIPTS\\others\\centerPivotGroup.py", "sourcetype": "file", "tags": ["others", "centerPivotGroup"], "title": "Center Pivot Group", @@ -1505,7 +1505,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\others\\locatorsOnSelectedFaces.py", + "command": "$OPENPYPE_SCRIPTS\\others\\locatorsOnSelectedFaces.py", "sourcetype": "file", "tags": ["others", "locatorsOnSelectedFaces"], "title": "Locators On Selected Faces", @@ -1513,7 +1513,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\others\\locatorsOnEdgeSelectionPrompt.py", + "command": "$OPENPYPE_SCRIPTS\\others\\locatorsOnEdgeSelectionPrompt.py", "sourcetype": "file", "tags": ["others", "locatorsOnEdgeSelectionPrompt"], "title": "Locators On Edge Selection Prompt", @@ -1524,7 +1524,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\others\\copyDeformers.py", + "command": "$OPENPYPE_SCRIPTS\\others\\copyDeformers.py", "sourcetype": "file", "tags": ["others", "copyDeformers"], "title": "Copy Deformers", @@ -1532,7 +1532,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\others\\selectInReferenceEditor.py", + "command": "$OPENPYPE_SCRIPTS\\others\\selectInReferenceEditor.py", "sourcetype": "file", "tags": ["others", "selectInReferenceEditor"], "title": "Select In Reference Editor", @@ -1540,7 +1540,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\others\\selectConstrainingObject.py", + "command": "$OPENPYPE_SCRIPTS\\others\\selectConstrainingObject.py", "sourcetype": "file", "tags": ["others", "selectConstrainingObject"], "title": "Select Constraining Object", @@ -1548,7 +1548,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\others\\deformerSetRelationsUI.py", + "command": "$OPENPYPE_SCRIPTS\\others\\deformerSetRelationsUI.py", "sourcetype": "file", "tags": ["others", "deformerSetRelationsUI"], "title": "Deformer Set Relations UI", @@ -1556,7 +1556,7 @@ }, { "type": "action", - "command": "$PYPE_SCRIPTS\\others\\recreateBaseNodesForAllLatticeNodes.py", + "command": "$OPENPYPE_SCRIPTS\\others\\recreateBaseNodesForAllLatticeNodes.py", "sourcetype": "file", "tags": ["others", "recreate", "base", "nodes", "lattice"], "title": "Recreate Base Nodes For Lattice Nodes", diff --git a/pype/hosts/maya/plugins/create/create_render.py b/pype/hosts/maya/plugins/create/create_render.py index 1d06cf7080..60ef670f58 100644 --- a/pype/hosts/maya/plugins/create/create_render.py +++ b/pype/hosts/maya/plugins/create/create_render.py @@ -274,7 +274,7 @@ class CreateRender(plugin.Creator): # authentication token expired so we need to login to Muster # again to get it. We use Pype API call to show login window. api_url = "{}/muster/show_login".format( - os.environ["PYPE_WEBSERVER_URL"]) + os.environ["OPENPYPE_WEBSERVER_URL"]) self.log.debug(api_url) login_response = self._requests_get(api_url, timeout=1) if login_response.status_code != 200: @@ -296,7 +296,7 @@ class CreateRender(plugin.Creator): """ if "verify" not in kwargs: kwargs["verify"] = ( - False if os.getenv("PYPE_DONT_VERIFY_SSL", True) else True + False if os.getenv("OPENPYPE_DONT_VERIFY_SSL", True) else True ) # noqa return requests.post(*args, **kwargs) @@ -315,6 +315,6 @@ class CreateRender(plugin.Creator): """ if "verify" not in kwargs: kwargs["verify"] = ( - False if os.getenv("PYPE_DONT_VERIFY_SSL", True) else True + False if os.getenv("OPENPYPE_DONT_VERIFY_SSL", True) else True ) # noqa return requests.get(*args, **kwargs) diff --git a/pype/hosts/maya/plugins/create/create_vrayscene.py b/pype/hosts/maya/plugins/create/create_vrayscene.py index f37a6c4e20..7724edbe63 100644 --- a/pype/hosts/maya/plugins/create/create_vrayscene.py +++ b/pype/hosts/maya/plugins/create/create_vrayscene.py @@ -191,7 +191,7 @@ class CreateVRayScene(plugin.Creator): # authentication token expired so we need to login to Muster # again to get it. We use Pype API call to show login window. api_url = "{}/muster/show_login".format( - os.environ["PYPE_WEBSERVER_URL"]) + os.environ["OPENPYPE_WEBSERVER_URL"]) self.log.debug(api_url) login_response = self._requests_get(api_url, timeout=1) if login_response.status_code != 200: @@ -213,7 +213,7 @@ class CreateVRayScene(plugin.Creator): """ if "verify" not in kwargs: kwargs["verify"] = ( - False if os.getenv("PYPE_DONT_VERIFY_SSL", True) else True + False if os.getenv("OPENPYPE_DONT_VERIFY_SSL", True) else True ) # noqa return requests.post(*args, **kwargs) @@ -232,6 +232,6 @@ class CreateVRayScene(plugin.Creator): """ if "verify" not in kwargs: kwargs["verify"] = ( - False if os.getenv("PYPE_DONT_VERIFY_SSL", True) else True + False if os.getenv("OPENPYPE_DONT_VERIFY_SSL", True) else True ) # noqa return requests.get(*args, **kwargs) diff --git a/pype/hosts/maya/plugins/publish/submit_maya_muster.py b/pype/hosts/maya/plugins/publish/submit_maya_muster.py index e31f989224..14edc25b12 100644 --- a/pype/hosts/maya/plugins/publish/submit_maya_muster.py +++ b/pype/hosts/maya/plugins/publish/submit_maya_muster.py @@ -310,7 +310,7 @@ class MayaSubmitMuster(pyblish.api.InstancePlugin): output_dir = instance.data["outputDir"] metadata_path = os.path.join(output_dir, metadata_filename) - pype_root = os.environ["PYPE_SETUP_PATH"] + pype_root = os.environ["OPENPYPE_SETUP_PATH"] # we must provide either full path to executable or use musters own # python named MPython.exe, residing directly in muster bin @@ -509,7 +509,7 @@ class MayaSubmitMuster(pyblish.api.InstancePlugin): environment[path] = os.environ[path] environment["PATH"] = os.environ["PATH"] - # self.log.debug("enviro: {}".format(environment['PYPE_SCRIPTS'])) + # self.log.debug("enviro: {}".format(environment['OPENPYPE_SCRIPTS'])) clean_environment = {} for key, value in environment.items(): clean_path = "" @@ -559,5 +559,5 @@ class MayaSubmitMuster(pyblish.api.InstancePlugin): of defense SSL is providing and it is not recommended. """ if 'verify' not in kwargs: - kwargs['verify'] = False if os.getenv("PYPE_DONT_VERIFY_SSL", True) else True # noqa + kwargs['verify'] = False if os.getenv("OPENPYPE_DONT_VERIFY_SSL", True) else True # noqa return requests.post(*args, **kwargs) diff --git a/pype/hosts/maya/plugins/publish/validate_muster_connection.py b/pype/hosts/maya/plugins/publish/validate_muster_connection.py index 868135677e..9077314831 100644 --- a/pype/hosts/maya/plugins/publish/validate_muster_connection.py +++ b/pype/hosts/maya/plugins/publish/validate_muster_connection.py @@ -85,7 +85,7 @@ class ValidateMusterConnection(pyblish.api.ContextPlugin): Renew authentication token by logging into Muster """ api_url = "{}/muster/show_login".format( - os.environ["PYPE_WEBSERVER_URL"]) + os.environ["OPENPYPE_WEBSERVER_URL"]) cls.log.debug(api_url) response = cls._requests_get(api_url, timeout=1) if response.status_code != 200: @@ -103,7 +103,7 @@ class ValidateMusterConnection(pyblish.api.ContextPlugin): of defense SSL is providing and it is not recommended. """ if 'verify' not in kwargs: - kwargs['verify'] = False if os.getenv("PYPE_DONT_VERIFY_SSL", True) else True # noqa + kwargs['verify'] = False if os.getenv("OPENPYPE_DONT_VERIFY_SSL", True) else True # noqa return requests.post(*args, **kwargs) def _requests_get(self, *args, **kwargs): @@ -117,5 +117,5 @@ class ValidateMusterConnection(pyblish.api.ContextPlugin): of defense SSL is providing and it is not recommended. """ if 'verify' not in kwargs: - kwargs['verify'] = False if os.getenv("PYPE_DONT_VERIFY_SSL", True) else True # noqa + kwargs['verify'] = False if os.getenv("OPENPYPE_DONT_VERIFY_SSL", True) else True # noqa return requests.get(*args, **kwargs) diff --git a/pype/hosts/maya/startup/userSetup.py b/pype/hosts/maya/startup/userSetup.py index a562d3ab9e..68558b7f0d 100644 --- a/pype/hosts/maya/startup/userSetup.py +++ b/pype/hosts/maya/startup/userSetup.py @@ -14,7 +14,7 @@ shelf_preset = settings['maya'].get('project_shelf') if shelf_preset: project = os.environ["AVALON_PROJECT"] - icon_path = os.path.join(os.environ['PYPE_PROJECT_SCRIPTS'], + icon_path = os.path.join(os.environ['OPENPYPE_PROJECT_SCRIPTS'], project, "icons") icon_path = os.path.abspath(icon_path) diff --git a/pype/hosts/premiere/lib.py b/pype/hosts/premiere/lib.py index 410e159560..7981fd5608 100644 --- a/pype/hosts/premiere/lib.py +++ b/pype/hosts/premiere/lib.py @@ -168,7 +168,7 @@ def clearing_caches_ui(): def test_rest_api_server(env): # from pprint import pformat - rest_url = env.get("PYPE_WEBSERVER_URL") + rest_url = env.get("OPENPYPE_WEBSERVER_URL") project_name = "{AVALON_PROJECT}".format(**env) URL = "/".join((rest_url, "avalon/projects", diff --git a/pype/hosts/premiere/ppro/js/pype_restapi_client.js b/pype/hosts/premiere/ppro/js/pype_restapi_client.js index be73a2fb8c..21beb8c5de 100644 --- a/pype/hosts/premiere/ppro/js/pype_restapi_client.js +++ b/pype/hosts/premiere/ppro/js/pype_restapi_client.js @@ -14,7 +14,7 @@ class PypeRestApiClient { * @return {url string} */ _getApiServerUrl() { - var url = this.env.PYPE_WEBSERVER_URL; + var url = this.env.OPENPYPE_WEBSERVER_URL; return url } diff --git a/pype/hosts/unreal/api/lib.py b/pype/hosts/unreal/api/lib.py index 02b1ae5bf5..0b0c5b608d 100644 --- a/pype/hosts/unreal/api/lib.py +++ b/pype/hosts/unreal/api/lib.py @@ -146,7 +146,7 @@ def create_unreal_project(project_name: str, directory is not found in plugin folders as this indicates this is only source distribution of the plugin. Dev mode is also set by preset file `unreal/project_setup.json` in - **PYPE_CONFIG**. + **OPENPYPE_CONFIG**. :type dev_mode: bool :returns: None """ @@ -180,17 +180,17 @@ def create_unreal_project(project_name: str, } if preset["install_unreal_python_engine"]: - # If `PYPE_UNREAL_ENGINE_PYTHON_PLUGIN` is set, copy it from there to - # support offline installation. + # If `OPENPYPE_UNREAL_ENGINE_PYTHON_PLUGIN` is set, copy it from there + # to support offline installation. # Otherwise clone UnrealEnginePython to Plugins directory # https://github.com/20tab/UnrealEnginePython.git uep_path = os.path.join(plugins_path, "UnrealEnginePython") - if os.environ.get("PYPE_UNREAL_ENGINE_PYTHON_PLUGIN"): + if os.environ.get("OPENPYPE_UNREAL_ENGINE_PYTHON_PLUGIN"): os.makedirs(uep_path, exist_ok=True) dir_util._path_created = {} dir_util.copy_tree( - os.environ.get("PYPE_UNREAL_ENGINE_PYTHON_PLUGIN"), + os.environ.get("OPENPYPE_UNREAL_ENGINE_PYTHON_PLUGIN"), uep_path) else: # WARNING: this will trigger dev_mode, because we need to compile From 43572b5b6f32c0013f5eb4a45f27e13d6a648782 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Thu, 1 Apr 2021 15:46:08 +0200 Subject: [PATCH 09/10] changed pype env prefix in modules --- pype/modules/avalon_apps/avalon_app.py | 2 +- .../publish/submit_aftereffects_deadline.py | 8 +++--- .../publish/submit_harmony_deadline..py | 8 +++--- .../plugins/publish/submit_maya_deadline.py | 28 +++++++++---------- .../plugins/publish/submit_nuke_deadline.py | 4 +-- .../plugins/publish/submit_publish_job.py | 22 +++++++-------- .../publish/validate_deadline_connection.py | 2 +- .../action_applications.py | 2 +- .../ftrack/ftrack_server/socket_thread.py | 4 +-- .../ftrack/lib/ftrack_action_handler.py | 2 +- .../validate_custom_ftrack_attributes.py | 2 +- pype/modules/muster/muster.py | 2 +- pype/modules/timers_manager/timers_manager.py | 2 +- pype/modules/user/user_module.py | 2 +- pype/modules/webserver/webserver_module.py | 4 +-- 15 files changed, 47 insertions(+), 47 deletions(-) diff --git a/pype/modules/avalon_apps/avalon_app.py b/pype/modules/avalon_apps/avalon_app.py index 38d6e4394c..60f62fe731 100644 --- a/pype/modules/avalon_apps/avalon_app.py +++ b/pype/modules/avalon_apps/avalon_app.py @@ -23,7 +23,7 @@ class AvalonModule(PypeModule, ITrayModule, IWebServerRoutes): avalon_mongo_url = avalon_settings["AVALON_MONGO"] # Use pype mongo if Avalon's mongo not defined if not avalon_mongo_url: - avalon_mongo_url = os.environ["PYPE_MONGO"] + avalon_mongo_url = os.environ["OPENPYPE_MONGO"] thumbnail_root = os.environ.get("AVALON_THUMBNAIL_ROOT") if not thumbnail_root: diff --git a/pype/modules/deadline/plugins/publish/submit_aftereffects_deadline.py b/pype/modules/deadline/plugins/publish/submit_aftereffects_deadline.py index c1a6de4ce3..5ec5129fa4 100644 --- a/pype/modules/deadline/plugins/publish/submit_aftereffects_deadline.py +++ b/pype/modules/deadline/plugins/publish/submit_aftereffects_deadline.py @@ -64,9 +64,9 @@ class AfterEffectsSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline "AVALON_ASSET", "AVALON_TASK", "AVALON_APP_NAME", - "PYPE_USERNAME", - "PYPE_DEV", - "PYPE_LOG_NO_COLORS" + "OPENPYPE_USERNAME", + "OPENPYPE_DEV", + "OPENPYPE_LOG_NO_COLORS" ] environment = dict({key: os.environ[key] for key in keys @@ -78,7 +78,7 @@ class AfterEffectsSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline key=key, value=val) # to recognize job from PYPE for turning Event On/Off - dln_job_info.EnvironmentKeyValue = "PYPE_RENDER_JOB=1" + dln_job_info.EnvironmentKeyValue = "OPENPYPE_RENDER_JOB=1" return dln_job_info diff --git a/pype/modules/deadline/plugins/publish/submit_harmony_deadline..py b/pype/modules/deadline/plugins/publish/submit_harmony_deadline..py index 8e85937353..d723490a69 100644 --- a/pype/modules/deadline/plugins/publish/submit_harmony_deadline..py +++ b/pype/modules/deadline/plugins/publish/submit_harmony_deadline..py @@ -273,9 +273,9 @@ class HarmonySubmitDeadline( "AVALON_ASSET", "AVALON_TASK", "AVALON_APP_NAME", - "PYPE_USERNAME", - "PYPE_DEV", - "PYPE_LOG_NO_COLORS" + "OPENPYPE_USERNAME", + "OPENPYPE_DEV", + "OPENPYPE_LOG_NO_COLORS" ] environment = dict({key: os.environ[key] for key in keys @@ -288,7 +288,7 @@ class HarmonySubmitDeadline( value=val) # to recognize job from PYPE for turning Event On/Off - job_info.EnvironmentKeyValue = "PYPE_RENDER_JOB=1" + job_info.EnvironmentKeyValue = "OPENPYPE_RENDER_JOB=1" return job_info diff --git a/pype/modules/deadline/plugins/publish/submit_maya_deadline.py b/pype/modules/deadline/plugins/publish/submit_maya_deadline.py index b17dd6ba8d..041a351de9 100644 --- a/pype/modules/deadline/plugins/publish/submit_maya_deadline.py +++ b/pype/modules/deadline/plugins/publish/submit_maya_deadline.py @@ -441,17 +441,17 @@ class MayaSubmitDeadline(pyblish.api.InstancePlugin): "AVALON_ASSET", "AVALON_TASK", "AVALON_APP_NAME", - "PYPE_USERNAME", - "PYPE_DEV", - "PYPE_LOG_NO_COLORS" + "OPENPYPE_USERNAME", + "OPENPYPE_DEV", + "OPENPYPE_LOG_NO_COLORS" ] environment = dict({key: os.environ[key] for key in keys if key in os.environ}, **api.Session) - environment["PYPE_LOG_NO_COLORS"] = "1" - environment["PYPE_MAYA_VERSION"] = cmds.about(v=True) + environment["OPENPYPE_LOG_NO_COLORS"] = "1" + environment["OPENPYPE_MAYA_VERSION"] = cmds.about(v=True) # to recognize job from PYPE for turning Event On/Off - environment["PYPE_RENDER_JOB"] = "1" + environment["OPENPYPE_RENDER_JOB"] = "1" self.payload_skeleton["JobInfo"].update({ "EnvironmentKeyValue%d" % index: "{key}={value}".format( key=key, @@ -858,20 +858,20 @@ class MayaSubmitDeadline(pyblish.api.InstancePlugin): envs.append( "AVALON_APP_NAME={}".format(os.environ.get("AVALON_APP_NAME"))) envs.append( - "PYPE_ASS_EXPORT_RENDER_LAYER={}".format(data["renderlayer"])) + "OPENPYPE_ASS_EXPORT_RENDER_LAYER={}".format(data["renderlayer"])) envs.append( - "PYPE_ASS_EXPORT_SCENE_FILE={}".format(data["filepath"])) + "OPENPYPE_ASS_EXPORT_SCENE_FILE={}".format(data["filepath"])) envs.append( - "PYPE_ASS_EXPORT_OUTPUT={}".format( + "OPENPYPE_ASS_EXPORT_OUTPUT={}".format( payload['JobInfo']['OutputFilename0'])) envs.append( - "PYPE_ASS_EXPORT_START={}".format( + "OPENPYPE_ASS_EXPORT_START={}".format( int(self._instance.data["frameStartHandle"]))) envs.append( - "PYPE_ASS_EXPORT_END={}".format( + "OPENPYPE_ASS_EXPORT_END={}".format( int(self._instance.data["frameEndHandle"]))) envs.append( - "PYPE_ASS_EXPORT_STEP={}".format(1)) + "OPENPYPE_ASS_EXPORT_STEP={}".format(1)) i = 0 for e in envs: @@ -984,7 +984,7 @@ class MayaSubmitDeadline(pyblish.api.InstancePlugin): """ if 'verify' not in kwargs: - kwargs['verify'] = False if os.getenv("PYPE_DONT_VERIFY_SSL", True) else True # noqa + kwargs['verify'] = False if os.getenv("OPENPYPE_DONT_VERIFY_SSL", True) else True # noqa # add 10sec timeout before bailing out kwargs['timeout'] = 10 return requests.post(*args, **kwargs) @@ -1003,7 +1003,7 @@ class MayaSubmitDeadline(pyblish.api.InstancePlugin): """ if 'verify' not in kwargs: - kwargs['verify'] = False if os.getenv("PYPE_DONT_VERIFY_SSL", True) else True # noqa + kwargs['verify'] = False if os.getenv("OPENPYPE_DONT_VERIFY_SSL", True) else True # noqa # add 10sec timeout before bailing out kwargs['timeout'] = 10 return requests.get(*args, **kwargs) diff --git a/pype/modules/deadline/plugins/publish/submit_nuke_deadline.py b/pype/modules/deadline/plugins/publish/submit_nuke_deadline.py index a4653427bb..2e30e624ef 100644 --- a/pype/modules/deadline/plugins/publish/submit_nuke_deadline.py +++ b/pype/modules/deadline/plugins/publish/submit_nuke_deadline.py @@ -237,7 +237,7 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin): "PYBLISHPLUGINPATH", "NUKE_PATH", "TOOL_ENV", - "PYPE_DEV", + "OPENPYPE_DEV", "FOUNDRY_LICENSE" ] environment = dict({key: os.environ[key] for key in keys @@ -279,7 +279,7 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin): environment = clean_environment # to recognize job from PYPE for turning Event On/Off - environment["PYPE_RENDER_JOB"] = "1" + environment["OPENPYPE_RENDER_JOB"] = "1" payload["JobInfo"].update({ "EnvironmentKeyValue%d" % index: "{key}={value}".format( key=key, diff --git a/pype/modules/deadline/plugins/publish/submit_publish_job.py b/pype/modules/deadline/plugins/publish/submit_publish_job.py index 38d328b1cb..8f937b23df 100644 --- a/pype/modules/deadline/plugins/publish/submit_publish_job.py +++ b/pype/modules/deadline/plugins/publish/submit_publish_job.py @@ -114,16 +114,16 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): "FTRACK_API_USER", "FTRACK_API_KEY", "FTRACK_SERVER", - "PYPE_METADATA_FILE", + "OPENPYPE_METADATA_FILE", "AVALON_PROJECT", "AVALON_ASSET", "AVALON_TASK", "AVALON_APP_NAME", - "PYPE_PUBLISH_JOB" - "PYPE_LOG_NO_COLORS", - "PYPE_USERNAME", - "PYPE_RENDER_JOB", - "PYPE_PUBLISH_JOB" + "OPENPYPE_PUBLISH_JOB" + "OPENPYPE_LOG_NO_COLORS", + "OPENPYPE_USERNAME", + "OPENPYPE_RENDER_JOB", + "OPENPYPE_PUBLISH_JOB" ] # custom deadline atributes @@ -223,10 +223,10 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): environment["AVALON_ASSET"] = io.Session["AVALON_ASSET"] environment["AVALON_TASK"] = io.Session["AVALON_TASK"] environment["AVALON_APP_NAME"] = os.environ.get("AVALON_APP_NAME") - environment["PYPE_LOG_NO_COLORS"] = "1" - environment["PYPE_USERNAME"] = instance.context.data["user"] - environment["PYPE_PUBLISH_JOB"] = "1" - environment["PYPE_RENDER_JOB"] = "0" + environment["OPENPYPE_LOG_NO_COLORS"] = "1" + environment["OPENPYPE_USERNAME"] = instance.context.data["user"] + environment["OPENPYPE_PUBLISH_JOB"] = "1" + environment["OPENPYPE_RENDER_JOB"] = "0" args = [ 'publish', @@ -1048,4 +1048,4 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): # Directory publish_folder = os.path.dirname(file_path) - return publish_folder \ No newline at end of file + return publish_folder diff --git a/pype/modules/deadline/plugins/publish/validate_deadline_connection.py b/pype/modules/deadline/plugins/publish/validate_deadline_connection.py index 1c49e68ee1..88b3f42d49 100644 --- a/pype/modules/deadline/plugins/publish/validate_deadline_connection.py +++ b/pype/modules/deadline/plugins/publish/validate_deadline_connection.py @@ -44,5 +44,5 @@ class ValidateDeadlineConnection(pyblish.api.ContextPlugin): of defense SSL is providing and it is not recommended. """ if 'verify' not in kwargs: - kwargs['verify'] = False if os.getenv("PYPE_DONT_VERIFY_SSL", True) else True # noqa + kwargs['verify'] = False if os.getenv("OPENPYPE_DONT_VERIFY_SSL", True) else True # noqa return requests.get(*args, **kwargs) diff --git a/pype/modules/ftrack/event_handlers_user/action_applications.py b/pype/modules/ftrack/event_handlers_user/action_applications.py index 2c42cadfb7..fcfebe5078 100644 --- a/pype/modules/ftrack/event_handlers_user/action_applications.py +++ b/pype/modules/ftrack/event_handlers_user/action_applications.py @@ -26,7 +26,7 @@ class AppplicationsAction(BaseAction): type = "Application" label = "Application action" identifier = "pype_app.{}.".format(str(uuid4())) - icon_url = os.environ.get("PYPE_STATICS_SERVER") + icon_url = os.environ.get("OPENPYPE_STATICS_SERVER") def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) diff --git a/pype/modules/ftrack/ftrack_server/socket_thread.py b/pype/modules/ftrack/ftrack_server/socket_thread.py index a895e0b900..181fad5ce5 100644 --- a/pype/modules/ftrack/ftrack_server/socket_thread.py +++ b/pype/modules/ftrack/ftrack_server/socket_thread.py @@ -12,7 +12,7 @@ from pype.lib import get_pype_execute_args class SocketThread(threading.Thread): """Thread that checks suprocess of storer of processor of events""" - MAX_TIMEOUT = int(os.environ.get("PYPE_FTRACK_SOCKET_TIMEOUT", 45)) + MAX_TIMEOUT = int(os.environ.get("OPENPYPE_FTRACK_SOCKET_TIMEOUT", 45)) def __init__(self, name, port, filepath, additional_args=[]): super(SocketThread, self).__init__() @@ -57,7 +57,7 @@ class SocketThread(threading.Thread): ) env = os.environ.copy() - env["PYPE_PROCESS_MONGO_ID"] = str(Logger.mongo_process_id) + env["OPENPYPE_PROCESS_MONGO_ID"] = str(Logger.mongo_process_id) # Pype executable (with path to start script if not build) args = get_pype_execute_args( # Add `run` command diff --git a/pype/modules/ftrack/lib/ftrack_action_handler.py b/pype/modules/ftrack/lib/ftrack_action_handler.py index d95c81955e..2bff9d8cb3 100644 --- a/pype/modules/ftrack/lib/ftrack_action_handler.py +++ b/pype/modules/ftrack/lib/ftrack_action_handler.py @@ -3,7 +3,7 @@ from .ftrack_base_handler import BaseHandler def statics_icon(*icon_statics_file_parts): - statics_server = os.environ.get("PYPE_STATICS_SERVER") + statics_server = os.environ.get("OPENPYPE_STATICS_SERVER") if not statics_server: return None return "/".join((statics_server, *icon_statics_file_parts)) diff --git a/pype/modules/ftrack/plugins/publish/validate_custom_ftrack_attributes.py b/pype/modules/ftrack/plugins/publish/validate_custom_ftrack_attributes.py index 03aa8844fd..549f48889d 100644 --- a/pype/modules/ftrack/plugins/publish/validate_custom_ftrack_attributes.py +++ b/pype/modules/ftrack/plugins/publish/validate_custom_ftrack_attributes.py @@ -8,7 +8,7 @@ class ValidateFtrackAttributes(pyblish.api.InstancePlugin): Attributes to be validated are specified in: - `$PYPE_CONFIG/presets//ftrack_attributes.json` + `$OPENPYPE_CONFIG/presets//ftrack_attributes.json` This is array (list) of checks in format: [ diff --git a/pype/modules/muster/muster.py b/pype/modules/muster/muster.py index 5595ccff15..1a82926802 100644 --- a/pype/modules/muster/muster.py +++ b/pype/modules/muster/muster.py @@ -153,5 +153,5 @@ class MusterModule(PypeModule, ITrayModule, IWebServerRoutes): of defense SSL is providing and it is not recommended. """ if 'verify' not in kwargs: - kwargs['verify'] = False if os.getenv("PYPE_DONT_VERIFY_SSL", True) else True # noqa + kwargs['verify'] = False if os.getenv("OPENPYPE_DONT_VERIFY_SSL", True) else True # noqa return requests.post(*args, **kwargs) diff --git a/pype/modules/timers_manager/timers_manager.py b/pype/modules/timers_manager/timers_manager.py index b83f51f0ba..a8ea5799e6 100644 --- a/pype/modules/timers_manager/timers_manager.py +++ b/pype/modules/timers_manager/timers_manager.py @@ -221,7 +221,7 @@ class TimersManager(PypeModule, ITrayService, IIdleManager, IWebServerRoutes): def change_timer_from_host(self, project_name, asset_name, task_name): """Prepared method for calling change timers on REST api""" - webserver_url = os.environ.get("PYPE_WEBSERVER_URL") + webserver_url = os.environ.get("OPENPYPE_WEBSERVER_URL") if not webserver_url: self.log.warning("Couldn't find webserver url") return diff --git a/pype/modules/user/user_module.py b/pype/modules/user/user_module.py index 71c5fd124e..7d257f1781 100644 --- a/pype/modules/user/user_module.py +++ b/pype/modules/user/user_module.py @@ -29,7 +29,7 @@ class UserModule(PypeModule, ITrayModule, IWebServerRoutes): appdirs.user_data_dir('pype-app', 'pype') ) cred_filename = 'user_info.json' - env_name = "PYPE_USERNAME" + env_name = "OPENPYPE_USERNAME" name = "user" diff --git a/pype/modules/webserver/webserver_module.py b/pype/modules/webserver/webserver_module.py index 3b3f0e7a79..b3fb83596d 100644 --- a/pype/modules/webserver/webserver_module.py +++ b/pype/modules/webserver/webserver_module.py @@ -49,8 +49,8 @@ class WebServerModule(PypeModule, ITrayService): self.server_manager.add_static(static_prefix, resources.RESOURCES_DIR) webserver_url = "http://localhost:{}".format(self.port) - os.environ["PYPE_WEBSERVER_URL"] = webserver_url - os.environ["PYPE_STATICS_SERVER"] = "{}{}".format( + os.environ["OPENPYPE_WEBSERVER_URL"] = webserver_url + os.environ["OPENPYPE_STATICS_SERVER"] = "{}{}".format( webserver_url, static_prefix ) From 7f15ef8d8136cf67de52ec5b3127bcd08955e8f6 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Thu, 1 Apr 2021 15:53:13 +0200 Subject: [PATCH 10/10] changed environment prefixes in rest of pype module --- pype/cli.py | 10 +++++----- pype/hooks/pre_python2_vendor.py | 3 +-- .../publish/collect_current_pype_user.py | 2 +- .../plugins/publish/collect_rendered_files.py | 8 ++++---- pype/plugins/publish/extract_scanline_exr.py | 2 +- pype/pype_commands.py | 2 +- pype/resources/__init__.py | 4 ++-- pype/scripts/export_maya_ass_job.py | 8 ++++---- pype/scripts/export_maya_ass_sequence.mel | 12 +++++------ pype/tools/pyblish_pype/settings.py | 2 +- .../settings/local_settings/mongo_widget.py | 2 +- .../settings/settings/widgets/widgets.py | 2 +- pype/tools/tray/pype_tray.py | 4 ++-- start.py | 20 +++++++++---------- 14 files changed, 40 insertions(+), 41 deletions(-) diff --git a/pype/cli.py b/pype/cli.py index f67cf10ea1..c6da88cbc1 100644 --- a/pype/cli.py +++ b/pype/cli.py @@ -93,7 +93,7 @@ def eventserver(debug, provided credentials will be stored for later use. """ if debug: - os.environ['PYPE_DEBUG'] = "3" + os.environ['OPENPYPE_DEBUG'] = "3" PypeCommands().launch_eventservercli( ftrack_url, @@ -139,7 +139,7 @@ def publish(debug, paths): More than one path is allowed. """ if debug: - os.environ['PYPE_DEBUG'] = '3' + os.environ['OPENPYPE_DEBUG'] = '3' PypeCommands.publish(list(paths)) @@ -164,7 +164,7 @@ def texturecopy(debug, project, asset, path): Nothing is written to database. """ if debug: - os.environ['PYPE_DEBUG'] = '3' + os.environ['OPENPYPE_DEBUG'] = '3' PypeCommands().texture_copy(project, asset, path) @@ -178,7 +178,7 @@ def texturecopy(debug, project, asset, path): default=lambda: os.environ.get('AVALON_TASK', '')) @click.option("--tools", help="List of tools to add") @click.option("--user", help="Pype user name", - default=lambda: os.environ.get('PYPE_USERNAME', '')) + default=lambda: os.environ.get('OPENPYPE_USERNAME', '')) @click.option("-fs", "--ftrack-server", help="Registered application name", @@ -214,7 +214,7 @@ def launch(app, project, asset, task, os.environ["FTRACK_API_KEY"] = ftrack_key if user: - os.environ["PYPE_USERNAME"] = user + os.environ["OPENPYPE_USERNAME"] = user # test required if not project or not asset or not task: diff --git a/pype/hooks/pre_python2_vendor.py b/pype/hooks/pre_python2_vendor.py index 6f34e44132..377431b372 100644 --- a/pype/hooks/pre_python2_vendor.py +++ b/pype/hooks/pre_python2_vendor.py @@ -11,7 +11,7 @@ class PrePython2Vendor(PreLaunchHook): def execute(self): # Prepare vendor dir path self.log.info("adding global python 2 vendor") - pype_root = os.getenv("PYPE_ROOT") + pype_root = os.getenv("OPENPYPE_ROOT") python_2_vendor = os.path.join( pype_root, "pype", @@ -32,4 +32,3 @@ class PrePython2Vendor(PreLaunchHook): # Set new PYTHONPATH to launch context environments self.launch_context.env["PYTHONPATH"] = os.pathsep.join(python_paths) - \ No newline at end of file diff --git a/pype/plugins/publish/collect_current_pype_user.py b/pype/plugins/publish/collect_current_pype_user.py index a8947dd8fb..de4e950d56 100644 --- a/pype/plugins/publish/collect_current_pype_user.py +++ b/pype/plugins/publish/collect_current_pype_user.py @@ -11,7 +11,7 @@ class CollectCurrentUserPype(pyblish.api.ContextPlugin): label = "Collect Pype User" def process(self, context): - user = os.getenv("PYPE_USERNAME", "").strip() + user = os.getenv("OPENPYPE_USERNAME", "").strip() if not user: user = context.data.get("user", getpass.getuser()) diff --git a/pype/plugins/publish/collect_rendered_files.py b/pype/plugins/publish/collect_rendered_files.py index e0f3695fd5..edf9b50b92 100644 --- a/pype/plugins/publish/collect_rendered_files.py +++ b/pype/plugins/publish/collect_rendered_files.py @@ -17,7 +17,7 @@ from avalon import api class CollectRenderedFiles(pyblish.api.ContextPlugin): """ This collector will try to find json files in provided - `PYPE_PUBLISH_DATA`. Those files _MUST_ share same context. + `OPENPYPE_PUBLISH_DATA`. Those files _MUST_ share same context. """ order = pyblish.api.CollectorOrder - 0.2 @@ -113,9 +113,9 @@ class CollectRenderedFiles(pyblish.api.ContextPlugin): def process(self, context): self._context = context - assert os.environ.get("PYPE_PUBLISH_DATA"), ( - "Missing `PYPE_PUBLISH_DATA`") - paths = os.environ["PYPE_PUBLISH_DATA"].split(os.pathsep) + assert os.environ.get("OPENPYPE_PUBLISH_DATA"), ( + "Missing `OPENPYPE_PUBLISH_DATA`") + paths = os.environ["OPENPYPE_PUBLISH_DATA"].split(os.pathsep) project_name = os.environ.get("AVALON_PROJECT") if project_name is None: diff --git a/pype/plugins/publish/extract_scanline_exr.py b/pype/plugins/publish/extract_scanline_exr.py index a801baa17c..5839105f7f 100644 --- a/pype/plugins/publish/extract_scanline_exr.py +++ b/pype/plugins/publish/extract_scanline_exr.py @@ -45,7 +45,7 @@ class ExtractScanlineExr(pyblish.api.InstancePlugin): stagingdir = os.path.normpath(repre.get("stagingDir")) - oiio_tool_path = os.getenv("PYPE_OIIO_PATH", "") + oiio_tool_path = os.getenv("OPENPYPE_OIIO_PATH", "") if not os.path.exists(oiio_tool_path): self.log.error( "OIIO tool not found in {}".format(oiio_tool_path)) diff --git a/pype/pype_commands.py b/pype/pype_commands.py index ea94a35e3a..c46d71c631 100644 --- a/pype/pype_commands.py +++ b/pype/pype_commands.py @@ -79,7 +79,7 @@ class PypeCommands: pyblish.api.register_target("filesequence") pyblish.api.register_host("shell") - os.environ["PYPE_PUBLISH_DATA"] = os.pathsep.join(paths) + os.environ["OPENPYPE_PUBLISH_DATA"] = os.pathsep.join(paths) log.info("Running publish ...") diff --git a/pype/resources/__init__.py b/pype/resources/__init__.py index fdee38ab34..ef4ed73974 100644 --- a/pype/resources/__init__.py +++ b/pype/resources/__init__.py @@ -32,7 +32,7 @@ def get_liberation_font_path(bold=False, italic=False): def pype_icon_filepath(debug=None): if debug is None: - debug = bool(os.getenv("PYPE_DEV")) + debug = bool(os.getenv("OPENPYPE_DEV")) if debug: icon_file_name = "openpype_icon_staging.png" @@ -43,7 +43,7 @@ def pype_icon_filepath(debug=None): def pype_splash_filepath(debug=None): if debug is None: - debug = bool(os.getenv("PYPE_DEV")) + debug = bool(os.getenv("OPENPYPE_DEV")) if debug: splash_file_name = "openpype_splash_staging.png" diff --git a/pype/scripts/export_maya_ass_job.py b/pype/scripts/export_maya_ass_job.py index 8d90fa00e5..6e5eff6663 100644 --- a/pype/scripts/export_maya_ass_job.py +++ b/pype/scripts/export_maya_ass_job.py @@ -49,10 +49,10 @@ def __main__(): auto_pype_root = os.path.dirname(os.path.abspath(__file__)) auto_pype_root = os.path.abspath(auto_pype_root + "../../../../..") - auto_pype_root = os.environ.get('PYPE_SETUP_PATH') or auto_pype_root - if os.environ.get('PYPE_SETUP_PATH'): + auto_pype_root = os.environ.get('OPENPYPE_SETUP_PATH') or auto_pype_root + if os.environ.get('OPENPYPE_SETUP_PATH'): print("Got Pype location from environment: {}".format( - os.environ.get('PYPE_SETUP_PATH'))) + os.environ.get('OPENPYPE_SETUP_PATH'))) pype_command = "pype.ps1" if platform.system().lower() == "linux": @@ -78,7 +78,7 @@ def __main__(): print("Set pype root to: {}".format(pype_root)) print("Paths: {}".format(kwargs.paths or [os.getcwd()])) - # paths = kwargs.paths or [os.environ.get("PYPE_METADATA_FILE")] or [os.getcwd()] # noqa + # paths = kwargs.paths or [os.environ.get("OPENPYPE_METADATA_FILE")] or [os.getcwd()] # noqa mayabatch = os.environ.get("AVALON_APP_NAME").replace("maya", "mayabatch") args = [ diff --git a/pype/scripts/export_maya_ass_sequence.mel b/pype/scripts/export_maya_ass_sequence.mel index 83d1d010ac..b3b9a8543e 100644 --- a/pype/scripts/export_maya_ass_sequence.mel +++ b/pype/scripts/export_maya_ass_sequence.mel @@ -12,12 +12,12 @@ Attributes: */ -$scene_file=`getenv "PYPE_ASS_EXPORT_SCENE_FILE"`; -$step=`getenv "PYPE_ASS_EXPORT_STEP"`; -$start=`getenv "PYPE_ASS_EXPORT_START"`; -$end=`getenv "PYPE_ASS_EXPORT_END"`; -$file_path=`getenv "PYPE_ASS_EXPORT_OUTPUT"`; -$render_layer = `getenv "PYPE_ASS_EXPORT_RENDER_LAYER"`; +$scene_file=`getenv "OPENPYPE_ASS_EXPORT_SCENE_FILE"`; +$step=`getenv "OPENPYPE_ASS_EXPORT_STEP"`; +$start=`getenv "OPENPYPE_ASS_EXPORT_START"`; +$end=`getenv "OPENPYPE_ASS_EXPORT_END"`; +$file_path=`getenv "OPENPYPE_ASS_EXPORT_OUTPUT"`; +$render_layer = `getenv "OPENPYPE_ASS_EXPORT_RENDER_LAYER"`; print("*** ASS Export Plugin\n"); diff --git a/pype/tools/pyblish_pype/settings.py b/pype/tools/pyblish_pype/settings.py index 5848cdf698..11539f67a6 100644 --- a/pype/tools/pyblish_pype/settings.py +++ b/pype/tools/pyblish_pype/settings.py @@ -24,4 +24,4 @@ TerminalFilters = { } # Allow animations in GUI -Animated = env_variable_to_bool("PYPE_PYBLISH_ANIMATED", True) +Animated = env_variable_to_bool("OPENPYPE_PYBLISH_ANIMATED", True) diff --git a/pype/tools/settings/local_settings/mongo_widget.py b/pype/tools/settings/local_settings/mongo_widget.py index c6f6ab1591..35a415b081 100644 --- a/pype/tools/settings/local_settings/mongo_widget.py +++ b/pype/tools/settings/local_settings/mongo_widget.py @@ -27,7 +27,7 @@ class PypeMongoWidget(QtWidgets.QWidget): # Input mongo_url_input = QtWidgets.QLineEdit(self) mongo_url_input.setPlaceholderText("< Pype Mongo URL >") - mongo_url_input.setText(os.environ["PYPE_MONGO"]) + mongo_url_input.setText(os.environ["OPENPYPE_MONGO"]) # Confirm button mongo_url_change_btn = QtWidgets.QPushButton("Confirm Change", self) diff --git a/pype/tools/settings/settings/widgets/widgets.py b/pype/tools/settings/settings/widgets/widgets.py index ccd437ece3..d00372be03 100644 --- a/pype/tools/settings/settings/widgets/widgets.py +++ b/pype/tools/settings/settings/widgets/widgets.py @@ -643,7 +643,7 @@ class ProjectListWidget(QtWidgets.QWidget): items = [self.default] - mongo_url = os.environ["PYPE_MONGO"] + mongo_url = os.environ["OPENPYPE_MONGO"] # Force uninstall of whole avalon connection if url does not match # to current environment and set it as environment diff --git a/pype/tools/tray/pype_tray.py b/pype/tools/tray/pype_tray.py index 2d37c04136..0d3f729870 100644 --- a/pype/tools/tray/pype_tray.py +++ b/pype/tools/tray/pype_tray.py @@ -77,8 +77,8 @@ class TrayManager: self.tray_widget.showMessage(*args, **kwargs) def _add_version_item(self): - subversion = os.environ.get("PYPE_SUBVERSION") - client_name = os.environ.get("PYPE_CLIENT") + subversion = os.environ.get("OPENPYPE_SUBVERSION") + client_name = os.environ.get("OPENPYPE_CLIENT") version_string = pype.version.__version__ if subversion: diff --git a/start.py b/start.py index ba46d539ca..e8fac8c86c 100644 --- a/start.py +++ b/start.py @@ -3,7 +3,7 @@ Bootstrapping process of Pype is as follows: -`PYPE_PATH` is checked for existence - either one from environment or +`OPENPYPE_PATH` is checked for existence - either one from environment or from user settings. Precedence takes the one set by environment. On this path we try to find pype in directories version string in their names. @@ -11,16 +11,16 @@ For example: `pype-v3.0.1-foo` is valid name, or even `foo_3.0.2` - as long as version can be determined from its name _AND_ file `pype/pype/version.py` can be found inside, it is considered Pype installation. -If no Pype repositories are found in `PYPE_PATH` (user data dir) +If no Pype repositories are found in `OPENPYPE_PATH` (user data dir) then **Igniter** (Pype setup tool) will launch its GUI. -It can be used to specify `PYPE_PATH` or if it is _not_ specified, current +It can be used to specify `OPENPYPE_PATH` or if it is _not_ specified, current *"live"* repositories will be used to create zip file and copy it to appdata dir in user home and extract it there. Version will be determined by version specified in Pype module. If Pype repository directories are found in default install location -(user data dir) or in `PYPE_PATH`, it will get list of those dirs there and +(user data dir) or in `OPENPYPE_PATH`, it will get list of those dirs there and use latest one or the one specified with optional `--use-version` command line argument. If the one specified doesn't exist then latest available version will be used. All repositories in that dir will be added @@ -31,7 +31,7 @@ used. All directories under `repos` will be added to `sys.path` and `PYTHONPATH`. Pype depends on connection to `MongoDB`_. You can specify MongoDB connection -string via `PYPE_MONGO` set in environment or it can be set in user +string via `OPENPYPE_MONGO` set in environment or it can be set in user settings or via **Igniter** GUI. So, bootstrapping Pype looks like this:: @@ -40,7 +40,7 @@ So, bootstrapping Pype looks like this:: +-------------------------------------------------------+ | Determine MongoDB connection: | -| Use `PYPE_MONGO`, system keyring `pypeMongo` | +| Use `OPENPYPE_MONGO`, system keyring `pypeMongo` | +--------------------------|----------------------------+ .--- Found? --. YES NO @@ -53,7 +53,7 @@ So, bootstrapping Pype looks like this:: | | +-----------------v------------------------------------+ | | Get location of Pype: | | -| 1) Test for `PYPE_PATH` environment variable | | +| 1) Test for `OPENPYPE_PATH` environment variable | | | 2) Test `pypePath` in registry setting | | | 3) Test user data directory | | | ................................................... | | @@ -67,7 +67,7 @@ So, bootstrapping Pype looks like this:: YES NO | | | | | +--------------v------------------+ | - | | Look in `PYPE_PATH`, find | | + | | Look in `OPENPYPE_PATH`, find | | | | latest version and install it | | | | to user data dir. | | | +--------------|------------------+ | @@ -191,7 +191,7 @@ def set_avalon_environments(): # Avalon mongo URL avalon_mongo_url = ( os.environ.get("AVALON_MONGO") - or os.environ["PYPE_MONGO"] + or os.environ["OPENPYPE_MONGO"] ) os.environ.update({ # Mongo url (use same as pype has) @@ -379,7 +379,7 @@ def _find_frozen_pype(use_version: str = None, import igniter return_code = igniter.open_dialog() if return_code == 2: - os.environ["PYPE_TRYOUT"] = "1" + os.environ["OPENPYPE_TRYOUT"] = "1" if return_code == 3: # run Pype after installation