From a9ce683c8667766131ce9fa14a1451b691598a1f Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 4 Dec 2020 17:06:37 +0100 Subject: [PATCH 01/17] removed path getting functions --- pype/lib/anatomy.py | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/pype/lib/anatomy.py b/pype/lib/anatomy.py index 9c3c308862..8857ff2147 100644 --- a/pype/lib/anatomy.py +++ b/pype/lib/anatomy.py @@ -33,33 +33,8 @@ else: log = PypeLogger().get_logger(__name__) -def overrides_dir_path(): - value = os.environ.get("PYPE_PROJECT_CONFIGS") - if value: - value = os.path.normpath(value) - return value -def project_overrides_dir_path(project_name): - return os.path.join( - overrides_dir_path(), - project_name - ) - - -def project_anatomy_overrides_dir_path(project_name): - return os.path.join( - project_overrides_dir_path(project_name), - "anatomy" - ) - - -def default_anatomy_dir_path(): - return os.path.join( - os.environ["PYPE_CONFIG"], - "anatomy" - ) - class RootCombinationError(Exception): """This exception is raised when templates has combined root types.""" From 991c4d968659ee4ba25dc061bb1fbfbbed4e0ef9 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 4 Dec 2020 17:08:02 +0100 Subject: [PATCH 02/17] removed ruamel import --- pype/lib/anatomy.py | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/pype/lib/anatomy.py b/pype/lib/anatomy.py index 8857ff2147..8869b2d463 100644 --- a/pype/lib/anatomy.py +++ b/pype/lib/anatomy.py @@ -10,25 +10,13 @@ try: except NameError: StringType = str +from pype.settings.lib import ( + get_default_anatomy_settings, + get_anatomy_settings +) from . import config from .log import PypeLogger -try: - import ruamel.yaml as yaml -except ImportError: - print("yaml module wasn't found, skipping anatomy") -else: - directory = os.path.join( - os.environ.get("PYPE_ENV", ""), "Lib", "site-packages", "ruamel" - ) - file_path = os.path.join(directory, "__init__.py") - if os.path.exists(directory) and not os.path.exists(file_path): - print( - "{0} found but not {1}. Patching ruamel.yaml...".format( - directory, file_path - ) - ) - open(file_path, "a").close() log = PypeLogger().get_logger(__name__) From 6c5b0ea93e0c528c8cd7a78d0723d188bffd0a49 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 4 Dec 2020 17:08:26 +0100 Subject: [PATCH 03/17] moved globals variable out of import scope --- pype/lib/anatomy.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pype/lib/anatomy.py b/pype/lib/anatomy.py index 8869b2d463..183a4f7157 100644 --- a/pype/lib/anatomy.py +++ b/pype/lib/anatomy.py @@ -1,14 +1,9 @@ import os import re -import json import copy import platform import collections import numbers -try: - StringType = basestring -except NameError: - StringType = str from pype.settings.lib import ( get_default_anatomy_settings, @@ -17,9 +12,12 @@ from pype.settings.lib import ( from . import config from .log import PypeLogger - log = PypeLogger().get_logger(__name__) +try: + StringType = basestring +except NameError: + StringType = str From f3f75d96153f4804a458e41b5ae3fd699d92eba4 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 4 Dec 2020 17:09:50 +0100 Subject: [PATCH 04/17] Anatomy object can work as dictionary --- pype/lib/anatomy.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pype/lib/anatomy.py b/pype/lib/anatomy.py index 183a4f7157..038a98ff7f 100644 --- a/pype/lib/anatomy.py +++ b/pype/lib/anatomy.py @@ -60,6 +60,24 @@ class Anatomy: self._templates_obj = Templates(parent=self) self._roots_obj = Roots(parent=self) + # Anatomy used as dictionary + # - implemented only getters returning copy + def __getitem__(self, key): + return copy.deepcopy(self._data[key]) + + def get(self, key, default=None): + return copy.deepcopy(self._data).get(key, default) + + def keys(self): + return copy.deepcopy(self._data).keys() + + def values(self): + return copy.deepcopy(self._data).values() + + def items(self): + return copy.deepcopy(self._data).items() + + def reset(self): """Reset values of cached data in templates and roots objects.""" self.templates_obj.reset() From d019b656db568d2203fac5a3f3cbfb4946877816 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 4 Dec 2020 17:14:21 +0100 Subject: [PATCH 05/17] removed save methods from templates and roots --- pype/lib/anatomy.py | 78 --------------------------------------------- 1 file changed, 78 deletions(-) diff --git a/pype/lib/anatomy.py b/pype/lib/anatomy.py index 038a98ff7f..dc77d948e7 100644 --- a/pype/lib/anatomy.py +++ b/pype/lib/anatomy.py @@ -508,41 +508,6 @@ class Templates: """Returns path to project's overide template file.""" return Templates.project_overrides_path(self.project_name) - @staticmethod - def save_project_overrides(project_name, templates=None, override=False): - """Save templates values into projects overrides. - - Creates or replace "default.yaml" file in project overrides. - - Args: - project_name (str): Project name for which overrides will be saved. - templates (dict, optional): Templates values to save into - project's overrides. Filled with `default_templates_raw` when - set to None. - override (bool): Allows to override already existing templates - file. This option is set to False by default. - """ - if templates is None: - templates = Templates.default_templates_raw() - - yaml_path = Templates.project_overrides_path(project_name) - if os.path.exists(yaml_path) and not override: - log.warning(( - "Template overrides for project \"{}\" already exists." - ).format(project_name)) - return - - yaml_dir_path = os.path.dirname(yaml_path) - if not os.path.exists(yaml_dir_path): - log.debug( - "Creating Anatomy folder: \"{}\"".format(yaml_dir_path) - ) - os.makedirs(yaml_dir_path) - - yaml_obj = yaml.YAML() - yaml_obj.indent(mapping=4, sequence=4, offset=4) - with open(yaml_path, "w") as yaml_file: - yaml_obj.dump(templates, yaml_file) def _discover(self): """ Loads anatomy templates from yaml. @@ -1645,46 +1610,3 @@ class Roots: _parent_keys.append(key) output[key] = Roots._parse_dict(value, key, _parent_keys, parent) return output - - @staticmethod - def save_project_overrides(project_name, roots_data=None, override=False): - """Save root values into projects overrides. - - Creates or replace "roots.json" file in project overrides. - - Args: - project_name (str): Project name for which overrides will be saved. - roots_data (dict, optional): Root values to save into - project's overrides. Filled with `default_roots_raw` when - set to None. - override (bool): Allows to override already existing roots file. - This option is set to False by default. - - Example: - `roots_data` should contain platform specific keys:: - { - "windows": "P:/projects", - "linux": "/mnt/share/projects", - "darwin": "/Volumes/projects" - } - """ - - if roots_data is None: - roots_data = Roots.default_roots_raw() - - json_path = Roots.project_overrides_path(project_name) - if os.path.exists(json_path) and not override: - log.warning(( - "Roots overrides for project \"{}\" already exists." - ).format(project_name)) - return - - json_dir_path = os.path.dirname(json_path) - if not os.path.exists(json_dir_path): - log.debug( - "Creating Anatomy folder: \"{}\"".format(json_dir_path) - ) - os.makedirs(json_dir_path) - - with open(json_path, "w") as json_file: - json.dump(roots_data, json_file) From 5471af47658ac197096b943afb026ead882e76ba Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 4 Dec 2020 17:14:58 +0100 Subject: [PATCH 06/17] anatomy expect only anatomy object as argument --- pype/lib/anatomy.py | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pype/lib/anatomy.py b/pype/lib/anatomy.py index dc77d948e7..091e4f26c1 100644 --- a/pype/lib/anatomy.py +++ b/pype/lib/anatomy.py @@ -1292,20 +1292,9 @@ class Roots: env_prefix = "PYPE_ROOT" roots_filename = "roots.json" - def __init__( - self, project_name=None, keep_updated=False, parent=None - ): + def __init__(self, anatomy): + self.anatomy = anatomy self.loaded_project = None - self._project_name = project_name - self._keep_updated = keep_updated - - if parent is None and project_name is None: - log.warning(( - "It is expected to enter project_name if Roots are created" - " out of Anatomy." - )) - - self.parent = parent self._roots = None def __format__(self, *args, **kwargs): From 97a96f88f0f99ea8515e3792c019895934cc4fcf Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 4 Dec 2020 17:15:42 +0100 Subject: [PATCH 07/17] Anatomy does not have keep_updated attribute anymore --- pype/lib/anatomy.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pype/lib/anatomy.py b/pype/lib/anatomy.py index 091e4f26c1..f754dc497e 100644 --- a/pype/lib/anatomy.py +++ b/pype/lib/anatomy.py @@ -44,21 +44,27 @@ class Anatomy: Args: project_name (str): Project name to look on overrides. - keep_updated (bool): Project name is updated by AVALON_PROJECT environ. """ root_key_regex = re.compile(r"{(root?[^}]+)}") root_name_regex = re.compile(r"root\[([^]]+)\]") - def __init__(self, project_name=None, keep_updated=False): + def __init__(self, project_name=None): if not project_name: project_name = os.environ.get("AVALON_PROJECT") - self.project_name = project_name - self.keep_updated = keep_updated + if not project_name: + raise ProjectNotSet(( + "Implementation bug: Project name is not set. Anatomy requires" + " to load data for specific project." + )) - self._templates_obj = Templates(parent=self) - self._roots_obj = Roots(parent=self) + self.project_name = project_name + + self._data = get_anatomy_settings(project_name) + + self._templates_obj = Templates(self) + self._roots_obj = Roots(self) # Anatomy used as dictionary # - implemented only getters returning copy From 091a786515134656279d716a2e525416c4035661 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 4 Dec 2020 17:18:05 +0100 Subject: [PATCH 08/17] Roots and Templates objects can't be self contained objects but require anatomy as parent --- pype/lib/anatomy.py | 167 +++++--------------------------------------- 1 file changed, 16 insertions(+), 151 deletions(-) diff --git a/pype/lib/anatomy.py b/pype/lib/anatomy.py index f754dc497e..4b29e90901 100644 --- a/pype/lib/anatomy.py +++ b/pype/lib/anatomy.py @@ -422,21 +422,8 @@ class Templates: inner_key_pattern = re.compile(r"(\{@.*?[^{}0]*\})") inner_key_name_pattern = re.compile(r"\{@(.*?[^{}0]*)\}") - templates_file_name = "default.yaml" - - def __init__( - self, project_name=None, keep_updated=False, roots=None, parent=None - ): - self._keep_updated = keep_updated - self._project_name = project_name - self._roots = roots - self.parent = parent - if parent is None and project_name is None: - log.warning(( - "It is expected to enter project_name if Templates are created" - " out of Anatomy." - )) - + def __init__(self, anatomy): + self.anatomy = anatomy self.loaded_project = None self._templates = None @@ -451,29 +438,14 @@ class Templates: @property def project_name(self): - if self.parent: - return self.parent.project_name - return self._project_name - - @property - def keep_updated(self): - if self.parent: - return self.parent.keep_updated - return self._keep_updated + return self.anatomy.project_name @property def roots(self): - if self.parent: - return self.parent.roots - return self._roots + return self.anatomy.roots @property def templates(self): - if self.parent is None and self.keep_updated: - project = os.environ.get("AVALON_PROJECT", None) - if project is not None and project != self.project_name: - self._project_name = project - if self.project_name != self.loaded_project: self._templates = None @@ -482,39 +454,12 @@ class Templates: self.loaded_project = self.project_name return self._templates - @staticmethod - def default_templates_raw(): - """Return default templates raw data.""" - path = os.path.join( - default_anatomy_dir_path(), - Templates.templates_file_name - ) - with open(path, "r") as stream: - # QUESTION Should we not raise exception if file is invalid? - default_templates = yaml.load( - stream, Loader=yaml.loader.Loader - ) - return default_templates - - @staticmethod - def default_templates(): + def default_templates(self): """Return default templates data with solved inner keys.""" return Templates.solve_template_inner_links( - Templates.default_templates_raw() + self.anatomy["templates"] ) - @staticmethod - def project_overrides_path(project_name): - return os.path.join( - project_anatomy_overrides_dir_path(project_name), - Templates.templates_file_name - ) - - def _project_overrides_path(self): - """Returns path to project's overide template file.""" - return Templates.project_overrides_path(self.project_name) - - def _discover(self): """ Loads anatomy templates from yaml. Default templates are loaded if project is not set or project does @@ -526,24 +471,14 @@ class Templates: default templates. """ - if self.project_name is not None: - project_templates_path = self._project_overrides_path() - if os.path.exists(project_templates_path): - # QUESTION Should we not raise exception if file is invalid? - with open(project_templates_path, "r") as stream: - proj_templates = yaml.load( - stream, Loader=yaml.loader.Loader - ) - return Templates.solve_template_inner_links(proj_templates) + if self.project_name is None: + # QUESTION create project specific if not found? + raise AssertionError(( + "Project \"{0}\" does not have his own templates." + " Trying to use default." + ).format(self.project_name)) - else: - # QUESTION create project specific if not found? - log.warning(( - "Project \"{0}\" does not have his own templates." - " Trying to use default." - ).format(self.project_name)) - - return self.default_templates() + return Templates.solve_template_inner_links(self.anatomy["templates"]) @classmethod def replace_inner_keys(cls, matches, value, key_values, key): @@ -1287,12 +1222,7 @@ class Roots: """Object which should be used for formatting "root" key in templates. Args: - project_name (str, optional): Project name to look on overrides. - keep_updated (bool, optional): Project name is updated by - AVALON_PROJECT environ. - parent (object, optional): Expected that parent is Anatomy object. - When parent is set then values of attributes `project_name` and - `keep_updated` are ignored and are used parent's values. + anatomy Anatomy: Anatomy object created for a specific project. """ env_prefix = "PYPE_ROOT" @@ -1472,33 +1402,7 @@ class Roots: @property def project_name(self): """Return project name which will be used for loading root values.""" - if self.parent: - return self.parent.project_name - return self._project_name - - @property - def keep_updated(self): - """Keep updated property helps to keep roots updated. - - Returns: - bool: Return True when roots should be updated for project set - in "AVALON_PROJECT" environment variable. - """ - if self.parent: - return self.parent.keep_updated - return self._keep_updated - - @staticmethod - def project_overrides_path(project_name): - """Returns path to project overrides roots file.""" - project_config_items = [ - project_anatomy_overrides_dir_path(project_name), - Roots.roots_filename - ] - return os.path.sep.join(project_config_items) - - def _project_overrides_path(self): - return Roots.project_overrides_path(self.project_name) + return self.anatomy.project_name @property def roots(self): @@ -1510,39 +1414,14 @@ class Roots: roots settings. That may happend when project use multiroot templates but default roots miss their keys. """ - if self.parent is None and self.keep_updated: - project_name = os.environ.get("AVALON_PROJECT") - if self.project_name != project_name: - self._project_name = project_name - if self.project_name != self.loaded_project: self._roots = None if self._roots is None: self._roots = self._discover() self.loaded_project = self.project_name - # Backwards compatibility - if self._roots is None: - self._roots = Roots.default_roots(self) return self._roots - @staticmethod - def default_roots_raw(): - """Loads raw default roots data from roots.json.""" - default_roots_path = os.path.normpath(os.path.join( - default_anatomy_dir_path(), - Roots.roots_filename - )) - with open(default_roots_path, "r") as default_roots_file: - raw_default_roots = json.load(default_roots_file) - - return raw_default_roots - - @staticmethod - def default_roots(parent=None): - """Returns parsed default roots.""" - return Roots._parse_dict(Roots.default_roots_raw()) - def _discover(self): """ Loads current project's roots or default. @@ -1553,21 +1432,7 @@ class Roots: setting is used. """ - # Return default roots if project is not set - if self.project_name is None: - return Roots.default_roots(self) - - # Return project specific roots - project_roots_path = self._project_overrides_path() - - # If path does not exist we assume it is older project without roots - if not os.path.exists(project_roots_path): - return None - - with open(project_roots_path, "r") as project_roots_file: - raw_project_roots = json.load(project_roots_file) - - return self._parse_dict(raw_project_roots, parent=self) + return self._parse_dict(self.anatomy["roots"], parent=self) @staticmethod def _parse_dict(data, key=None, parent_keys=None, parent=None): From d61c060242136184c22d81df14e4e160f40bc4a5 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 4 Dec 2020 17:18:16 +0100 Subject: [PATCH 09/17] added ProjectNotSet exception --- pype/lib/anatomy.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pype/lib/anatomy.py b/pype/lib/anatomy.py index 4b29e90901..e6934bfdf9 100644 --- a/pype/lib/anatomy.py +++ b/pype/lib/anatomy.py @@ -20,6 +20,8 @@ except NameError: StringType = str +class ProjectNotSet(Exception): + """Exception raised when is created Anatomy without project name.""" class RootCombinationError(Exception): @@ -29,12 +31,13 @@ class RootCombinationError(Exception): joined_roots = ", ".join( ["\"{}\"".format(_root) for _root in roots] ) + # TODO better error message msg = ( "Combination of root with and" " without root name in Templates. {}" ).format(joined_roots) - return super(self.__class__, self).__init__(msg) + super(RootCombinationError, self).__init__(msg) class Anatomy: From 5058d5b303837100e01e4a03353d84bf166fcd4f Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 4 Dec 2020 17:18:30 +0100 Subject: [PATCH 10/17] fixed overriding variable value --- pype/lib/anatomy.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pype/lib/anatomy.py b/pype/lib/anatomy.py index e6934bfdf9..8297c97d2e 100644 --- a/pype/lib/anatomy.py +++ b/pype/lib/anatomy.py @@ -1468,8 +1468,8 @@ class Roots: return RootItem(data, key, parent_keys, parent=parent) output = {} - for key, value in data.items(): + for _key, value in data.items(): _parent_keys = list(parent_keys) - _parent_keys.append(key) - output[key] = Roots._parse_dict(value, key, _parent_keys, parent) + _parent_keys.append(_key) + output[_key] = Roots._parse_dict(value, _key, _parent_keys, parent) return output From f8fe17599265afd8dbe96f5f7dce2380a7d0f04c Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 4 Dec 2020 17:18:49 +0100 Subject: [PATCH 11/17] anatomy reset also resets loaded data --- pype/lib/anatomy.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pype/lib/anatomy.py b/pype/lib/anatomy.py index 8297c97d2e..b34b369783 100644 --- a/pype/lib/anatomy.py +++ b/pype/lib/anatomy.py @@ -89,6 +89,7 @@ class Anatomy: def reset(self): """Reset values of cached data in templates and roots objects.""" + self._data = get_anatomy_settings(self.project_name) self.templates_obj.reset() self.roots_obj.reset() From 4740310d5c7c3cce6d33f71fdff74d412d3065e8 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 4 Dec 2020 17:19:08 +0100 Subject: [PATCH 12/17] anatomy has `default_data` to get raw anatomy data --- pype/lib/anatomy.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pype/lib/anatomy.py b/pype/lib/anatomy.py index b34b369783..1fed573cb9 100644 --- a/pype/lib/anatomy.py +++ b/pype/lib/anatomy.py @@ -86,6 +86,15 @@ class Anatomy: def items(self): return copy.deepcopy(self._data).items() + @staticmethod + def default_data(): + """Default project anatomy data. + + Always return fresh loaded data. May be used as data for new project. + + Not used inside Anatomy itself. + """ + return get_default_anatomy_settings(clear_metadata=False) def reset(self): """Reset values of cached data in templates and roots objects.""" From 34418e1195051c99b52b508354741d3bf8444c79 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 4 Dec 2020 17:19:29 +0100 Subject: [PATCH 13/17] environment root prefix changed to PYPE_PROJECT_ROOT --- pype/lib/anatomy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pype/lib/anatomy.py b/pype/lib/anatomy.py index 1fed573cb9..cf907729c4 100644 --- a/pype/lib/anatomy.py +++ b/pype/lib/anatomy.py @@ -1238,7 +1238,7 @@ class Roots: anatomy Anatomy: Anatomy object created for a specific project. """ - env_prefix = "PYPE_ROOT" + env_prefix = "PYPE_PROJECT_ROOT" roots_filename = "roots.json" def __init__(self, anatomy): From a96c2f4ea669cf58b61d1df5591c8c89e67cd408 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 4 Dec 2020 17:21:54 +0100 Subject: [PATCH 14/17] default metadata are not resolved on get_anatomy_settings --- pype/settings/lib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pype/settings/lib.py b/pype/settings/lib.py index d7395e7f1a..dfd4707dbf 100644 --- a/pype/settings/lib.py +++ b/pype/settings/lib.py @@ -458,7 +458,7 @@ def get_anatomy_settings(project_name, clear_metadata=True): "`get_default_anatomy_settings` to get project defaults." ) - studio_overrides = get_default_anatomy_settings() + studio_overrides = get_default_anatomy_settings(False) project_overrides = get_project_anatomy_overrides(project_name) result = apply_overrides(studio_overrides, project_overrides) From 45b5cdb8a19c32836334bbdcd34c23865f0c58dd Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 4 Dec 2020 17:24:04 +0100 Subject: [PATCH 15/17] disabled anatomy usage in prepare project action --- pype/modules/ftrack/actions/action_prepare_project.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pype/modules/ftrack/actions/action_prepare_project.py b/pype/modules/ftrack/actions/action_prepare_project.py index b3a2a20151..71c19ffd1e 100644 --- a/pype/modules/ftrack/actions/action_prepare_project.py +++ b/pype/modules/ftrack/actions/action_prepare_project.py @@ -374,13 +374,9 @@ class PrepareProject(BaseAction): for key, value in root_values.items(): root_data[key] = value - project_name = entities[0]["full_name"] - anatomy = Anatomy(project_name) - anatomy.templates_obj.save_project_overrides(project_name) - anatomy.roots_obj.save_project_overrides( - project_name, root_data, override=True - ) - anatomy.reset() + # TODO implement creating of anatomy for new projects + # project_name = entities[0]["full_name"] + # anatomy = Anatomy(project_name) # pop out info about creating project structure create_proj_struct = in_data.pop(self.create_project_structure_key) From e8f50b1fe6552f415a1c078d35bf16d7f3a2c42c Mon Sep 17 00:00:00 2001 From: Milan Kolar Date: Wed, 9 Dec 2020 10:56:11 +0100 Subject: [PATCH 16/17] remove pype-config from submodules --- repos/pype-config | 1 - 1 file changed, 1 deletion(-) delete mode 160000 repos/pype-config diff --git a/repos/pype-config b/repos/pype-config deleted file mode 160000 index 9589ee5f7c..0000000000 --- a/repos/pype-config +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9589ee5f7cf279c612a4121b63724924ce0d6310 From 08a259c4ae0884d4cbb7e32d1fe7d633f2f2eb24 Mon Sep 17 00:00:00 2001 From: Milan Kolar Date: Wed, 9 Dec 2020 12:40:13 +0100 Subject: [PATCH 17/17] remove pype-config and switch avalon-core to develop --- .gitmodules | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 1209b475e4..cb3627aa20 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "repos/avalon-core"] path = repos/avalon-core url = git@github.com:pypeclub/avalon-core.git - branch = v2.11.8-pype + branch = develop [submodule "repos/pyblish-base"] path = repos/pyblish-base url = git@github.com:pyblish/pyblish-base.git @@ -11,9 +11,6 @@ [submodule "repos/maya-look-assigner"] path = repos/maya-look-assigner url = git@github.com:pypeclub/maya-look-assigner.git -[submodule "repos/pype-config"] - path = repos/pype-config - url = git@github.com:pypeclub/pype-config.git [submodule "repos/acre"] path = repos/acre url = git@github.com:antirotor/acre.git