From 35327d8b245feab276f0eadfa612893ea3c7bfd1 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Tue, 16 Feb 2021 12:27:56 +0100 Subject: [PATCH] added get_global_environments to pype.api --- pype/api.py | 6 ++++-- pype/lib/__init__.py | 4 +++- pype/lib/env_tools.py | 6 +++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/pype/api.py b/pype/api.py index d7003bffa7..bc99ba7246 100644 --- a/pype/api.py +++ b/pype/api.py @@ -19,7 +19,8 @@ from .lib import ( get_version_from_path, get_last_version_from_path, source_hash, - get_latest_version + get_latest_version, + get_global_environments ) from .lib.mongo import ( @@ -104,5 +105,6 @@ __all__ = [ "source_hash", "run_subprocess", - "get_latest_version" + "get_latest_version", + "get_global_environments" ] diff --git a/pype/lib/__init__.py b/pype/lib/__init__.py index bbc32a5e8a..6516805521 100644 --- a/pype/lib/__init__.py +++ b/pype/lib/__init__.py @@ -34,7 +34,8 @@ from .config import get_datetime_data from .env_tools import ( env_value_to_bool, - get_paths_from_environ + get_paths_from_environ, + get_global_environments ) from .python_module_tools import ( @@ -121,6 +122,7 @@ __all__ = [ "env_value_to_bool", "get_paths_from_environ", + "get_global_environments", "modules_from_path", "recursive_bases_from_class", diff --git a/pype/lib/env_tools.py b/pype/lib/env_tools.py index 50c1f7df00..7e392fad6e 100644 --- a/pype/lib/env_tools.py +++ b/pype/lib/env_tools.py @@ -80,8 +80,8 @@ def get_global_environments(env=None): modules. Args: - env (dict, optional): Initial environments. `os.environ` is used when - not entered. + env (dict, optional): Initial environments. Empty dictionary is used + when not entered. Returns; dict of str: Loaded and processed environments. @@ -91,7 +91,7 @@ def get_global_environments(env=None): from pype.modules import ModulesManager if env is None: - env = os.environ.copy() + env = {} # Get global environments from settings all_settings_env = get_environments()