fix forgotten pype imports

This commit is contained in:
Milan Kolar 2021-04-01 19:20:08 +02:00
parent 4e54190ab8
commit 7b41968ab0
4 changed files with 17 additions and 17 deletions

View file

@ -818,7 +818,7 @@ class BootstrapRepos:
""" """
if self.is_inside_user_data(openpype_version.path) and not pype_version.path.is_file(): # noqa if self.is_inside_user_data(openpype_version.path) and not openpype_version.path.is_file(): # noqa
raise OpenPypeVersionExists( raise OpenPypeVersionExists(
"OpenPype already inside user data dir") "OpenPype already inside user data dir")

Binary file not shown.

Before

Width:  |  Height:  |  Size: 108 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Before After
Before After

View file

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
"""Setup info for building Pype 3.0.""" """Setup info for building OpenPype 3.0."""
import os import os
import sys import sys
import re import re
@ -12,7 +12,7 @@ version = {}
openpype_root = Path(os.path.dirname(__file__)) openpype_root = Path(os.path.dirname(__file__))
with open(openpype_root / "pype" / "version.py") as fp: with open(openpype_root / "openpype" / "version.py") as fp:
exec(fp.read(), version) exec(fp.read(), version)
version_match = re.search(r"(\d+\.\d+.\d+).*", version["__version__"]) version_match = re.search(r"(\d+\.\d+.\d+).*", version["__version__"])
@ -53,7 +53,7 @@ excludes = []
bin_includes = [] bin_includes = []
include_files = [ include_files = [
"igniter", "igniter",
"pype", "openpype",
"repos", "repos",
"schema", "schema",
"vendor", "vendor",

View file

@ -125,7 +125,7 @@ def set_openpype_global_environments() -> None:
"""Set global OpenPype's environments.""" """Set global OpenPype's environments."""
import acre import acre
from pype.settings import get_environments from openpype.settings import get_environments
all_env = get_environments() all_env = get_environments()
@ -181,7 +181,7 @@ def set_avalon_environments():
before avalon module is imported because avalon works with globals set with before avalon module is imported because avalon works with globals set with
environment variables. environment variables.
""" """
from pype import PACKAGE_DIR from openpype import PACKAGE_DIR
# Path to OpenPype's schema # Path to OpenPype's schema
schema_path = os.path.join( schema_path = os.path.join(
@ -212,7 +212,7 @@ def set_modules_environments():
This requires to have OpenPype in `sys.path`. This requires to have OpenPype in `sys.path`.
""" """
from pype.modules import ModulesManager from openpype.modules import ModulesManager
import acre import acre
modules_manager = ModulesManager() modules_manager = ModulesManager()
@ -398,7 +398,7 @@ def _find_frozen_openpype(use_version: str = None,
sys.exit(return_code) sys.exit(return_code)
if not openpype_versions: if not openpype_versions:
# no Pype versions found anyway, lets use then the one # no openpype versions found anyway, lets use then the one
# shipped with frozen OpenPype # shipped with frozen OpenPype
if not os.getenv("OPENPYPE_TRYOUT"): if not os.getenv("OPENPYPE_TRYOUT"):
print("*** Still no luck finding OpenPype.") print("*** Still no luck finding OpenPype.")
@ -433,7 +433,7 @@ def _find_frozen_openpype(use_version: str = None,
is_inside = openpype_version.path.resolve().relative_to( is_inside = openpype_version.path.resolve().relative_to(
bootstrap.data_dir) bootstrap.data_dir)
except ValueError: except ValueError:
# if relative path cannot be calculated, Pype version is not # if relative path cannot be calculated, openpype version is not
# inside user data dir # inside user data dir
pass pass
@ -572,7 +572,7 @@ def boot():
else: else:
os.environ["OPENPYPE_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 # Get openpype path from database and set it to environment so openpype can
# find its versions there and bootstrap them. # find its versions there and bootstrap them.
openpype_path = get_openpype_path_from_db(openpype_mongo) openpype_path = get_openpype_path_from_db(openpype_mongo)
if not openpype_path: if not openpype_path:
@ -612,7 +612,7 @@ def boot():
modules_to_del = [ modules_to_del = [
sys.modules.pop(module_name) sys.modules.pop(module_name)
for module_name in tuple(sys.modules) for module_name in tuple(sys.modules)
if module_name == "pype" or module_name.startswith("pype.") if module_name == "openpype" or module_name.startswith("openpype.")
] ]
try: try:
@ -632,9 +632,9 @@ def boot():
print(" - for modules ...") print(" - for modules ...")
set_modules_environments() set_modules_environments()
from pype import cli from openpype import cli
from pype.lib import terminal as t from openpype.lib import terminal as t
from pype.version import __version__ from openpype.version import __version__
assert version_path, "Version path not defined." assert version_path, "Version path not defined."
info = get_info() info = get_info()
@ -656,7 +656,7 @@ def boot():
t.echo(i) t.echo(i)
try: try:
cli.main(obj={}, prog_name="pype") cli.main(obj={}, prog_name="openpype")
except Exception: # noqa except Exception: # noqa
exc_info = sys.exc_info() exc_info = sys.exc_info()
print("!!! OpenPype crashed:") print("!!! OpenPype crashed:")
@ -666,8 +666,8 @@ def boot():
def get_info() -> list: def get_info() -> list:
"""Print additional information to console.""" """Print additional information to console."""
from pype.lib.mongo import get_default_components from openpype.lib.mongo import get_default_components
from pype.lib.log import PypeLogger from openpype.lib.log import PypeLogger
components = get_default_components() components = get_default_components()