envstack 0.7.3__tar.gz → 0.7.4__tar.gz

{envstack-0.7.3/lib/envstack.egg-info → envstack-0.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: envstack
-Version: 0.7.3
+Version: 0.7.4
 Summary: Stacked environment variable management system
 Home-page: http://github.com/rsgalloway/envstack
 Author: Ryan Galloway

{envstack-0.7.3 → envstack-0.7.4}/lib/envstack/__init__.py

@@ -34,6 +34,6 @@ Stacked environment variable management system.
 """
 
 __prog__ = "envstack"
-__version__ = "0.7.3"
+__version__ = "0.7.4"
 
 from envstack.env import clear, init, revert, save

{envstack-0.7.3 → envstack-0.7.4}/lib/envstack/cli.py

@@ -38,14 +38,7 @@ import sys
 import traceback
 
 from envstack import __version__, config
-from envstack.env import (
-    clear,
-    export,
-    get_sources,
-    load_environ,
-    resolve_environ,
-    trace_var,
-)
+from envstack.env import clear, export, load_environ, resolve_environ, trace_var
 from envstack.wrapper import run_command
 
 

{envstack-0.7.3 → envstack-0.7.4}/lib/envstack/env.py

@@ -38,6 +38,8 @@ import re
 import string
 from pathlib import Path
 
+import yaml  # noqa
+
 from envstack import config, logger, path, util
 from envstack.exceptions import *
 
@@ -605,14 +607,14 @@ def init(*name, ignore_missing: bool = config.IGNORE_MISSING):
     # save environment to restore later using envstack.revert()
     save()
 
-    # clear old sys.path values
+    # clear old sys.path values from PYTHONPATH
     util.clear_sys_path()
 
     # load the stack and update the environment
     env = resolve_environ(load_environ(name, ignore_missing=ignore_missing))
     os.environ.update(util.encode(env))
 
-    # update sys.path from PYTHONPATH
+    # update sys.path from resolved PYTHONPATH
     util.load_sys_path()
 
 
@@ -665,7 +667,7 @@ def load_environ(
         name = [config.DEFAULT_NAMESPACE]
 
     # TODO: do we need to add a revert here?
-    #revert()
+    # revert()
 
     # create the environment to be returned
     env = Env()

{envstack-0.7.3 → envstack-0.7.4}/lib/envstack/util.py

@@ -33,13 +33,17 @@ __doc__ = """
 Contains common utility functions and classes.
 """
 
+import glob
 import os
 import re
 import sys
+from ast import literal_eval
+from collections import OrderedDict
+
+import yaml
 
 from envstack import config
 from envstack.exceptions import CyclicalReference
-from collections import OrderedDict
 
 # value for unresolvable variables
 null = ""
@@ -287,8 +291,6 @@ def safe_eval(value: str):
     :returns: evaluated value.
     """
     try:
-        from ast import literal_eval
-
         eval_func = literal_eval
     except ImportError:
         # warning: security issue
@@ -310,8 +312,6 @@ def get_stacks():
     """
     Returns a list of all stack names found in the environment paths.
     """
-    import glob
-
     paths = get_paths_from_var("ENVPATH")
     stacks = set()
 
@@ -374,8 +374,6 @@ def validate_yaml(file_path: str):
 
     :param file_path: Path to the YAML file to validate.
     """
-    import yaml
-
     required_keys = {"all", "darwin", "linux", "windows"}
 
     try:

{envstack-0.7.3 → envstack-0.7.4/lib/envstack.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: envstack
-Version: 0.7.3
+Version: 0.7.4
 Summary: Stacked environment variable management system
 Home-page: http://github.com/rsgalloway/envstack
 Author: Ryan Galloway

{envstack-0.7.3 → envstack-0.7.4}/setup.py

@@ -40,7 +40,7 @@ with open(os.path.join(here, "README.md")) as f:
 
 setup(
     name="envstack",
-    version="0.7.3",
+    version="0.7.4",
     description="Stacked environment variable management system",
     long_description=long_description,
     long_description_content_type="text/markdown",

{envstack-0.7.3 → envstack-0.7.4}/tests/test_env.py

@@ -338,6 +338,26 @@ class TestIssues(unittest.TestCase):
         ]
         self.assertEqual(paths, expected_paths)
 
+    def test_issue_36(self):
+        """Tests issue #36 with init and yaml import."""
+        envpath = os.path.join(os.path.dirname(__file__), "..", "env")
+        os.environ["ENVPATH"] = envpath
+
+        # clear sys path to simulate no yaml module
+        sys.path = []
+
+        # init the dev environment
+        try:
+            envstack.init("dev")
+            import yaml
+            success = yaml is not None
+        except ImportError:
+            success = False
+
+        self.assertTrue(success)
+        self.assertTrue("yaml" in sys.modules)
+        self.assertTrue(len(sys.path) > 0)
+
 
 if __name__ == "__main__":
     unittest.main()