yellowdog-python-examples 7.20.2__tar.gz → 7.20.3__tar.gz

{yellowdog_python_examples-7.20.2/yellowdog_python_examples.egg-info → yellowdog_python_examples-7.20.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yellowdog-python-examples
-Version: 7.20.2
+Version: 7.20.3
 Summary: Python CLI commands using the YellowDog Python SDK
 Author-email: YellowDog Limited <support@yellowdog.co>
 License-Expression: Apache-2.0

{yellowdog_python_examples-7.20.2 → yellowdog_python_examples-7.20.3}/README.md

@@ -395,7 +395,7 @@ The **environment variables** are as follows:
 - `YD_NAMESPACE`
 - `YD_TAG`
 
-When setting the value of the above properties, a property set on the command line takes precedence over one set via an environment variable, and both take precedence over a value set in a configuration file.
+When setting the value of the above properties, a property set on the command line takes precedence over one set via the configuration file, and both take precedence over a value set in an environment variable.
 
 If all the required common properties are set using the command line or environment variables, then the entire `common` section of the TOML file can be omitted.
 
@@ -486,10 +486,10 @@ User-defined variable names must not include spaces, but are otherwise unconstra
 The precedence order for setting variables is:
 
 1. Command line
-2. `YD_VAR` environment variables
-3. General environment variables
-4. Variables in a `.env` file
-5. TOML file
+2. TOML configuration file
+3. `YD_VAR` environment variables
+4. General environment variables
+5. Variables in a `.env` file
 
 This method can also be used to override the default variables, e.g., setting `-v username="other-user"` will override the default `{{username}}` variable.
 

yellowdog_python_examples-7.20.3/yellowdog_cli/__init__.py

@@ -0,0 +1 @@
+__version__ = "7.20.3"

{yellowdog_python_examples-7.20.2 → yellowdog_python_examples-7.20.3}/yellowdog_cli/utils/args.py

@@ -127,6 +127,13 @@ class CLIParser:
             required=False,
             help="include the process ID of this CLI invocation alongside timestamp in logging messages",
         )
+        parser.add_argument(
+            "--no-config",
+            "--nc",
+            action="store_true",
+            required=False,
+            help="ignore the contents of any TOML configuration file (even if specified on the command line)",
+        )
 
         # Module-specific argument sets
         if not any(module in sys.argv[0] for module in ["compare"]):
@@ -1287,6 +1294,11 @@ class CLIParser:
     def print_pid(self) -> Optional[bool]:
         return self.args.print_pid
 
+    @property
+    @allow_missing_attribute
+    def no_config(self) -> Optional[bool]:
+        return self.args.no_config
+
     @property
     @allow_missing_attribute
     def work_req_file(self) -> Optional[str]:

{yellowdog_python_examples-7.20.2 → yellowdog_python_examples-7.20.3}/yellowdog_cli/utils/load_config.py

@@ -59,7 +59,6 @@ for norm, alt in [
 ]:
     if os.getenv(norm) is None and os.getenv(alt) is not None:
         os.environ[norm] = os.getenv(alt)
-        print_log(f"Setting environment variable '{norm}' using value of '{alt}'")
 
 # CLI > YD_CONF > 'config.toml'
 CONFIG_FILE = relpath(
@@ -68,42 +67,50 @@ CONFIG_FILE = relpath(
     else ARGS_PARSER.config_file
 )
 
-try:
-    CONFIG_FILE_DIR = dirname(CONFIG_FILE)
-    config_dir_abs = abspath(CONFIG_FILE_DIR)
-    config_dir_short = Path(config_dir_abs).parts[-1]
-    VARIABLE_SUBSTITUTIONS.update(
-        {"config_dir_abs": config_dir_abs, "config_dir_name": config_dir_short}
-    )
-    print_log(f"Loading configuration data from: '{CONFIG_FILE}'")
-    CONFIG_TOML: Dict = load_toml_file_with_variable_substitutions(CONFIG_FILE)
+if ARGS_PARSER.no_config:
+    # Suppress use of any TOML config file
+    print_log(f"Configuration file ('{CONFIG_FILE}') ignored")
+    CONFIG_TOML = {COMMON_SECTION: {}}
+    CONFIG_FILE_DIR = os.getcwd()
+
+else:
+    # Attempt to load configuration data from TOML file
     try:
-        validate_properties(CONFIG_TOML, f"'{CONFIG_FILE}'")
-    except Exception as e:
-        print_error(e)
+        CONFIG_FILE_DIR = dirname(CONFIG_FILE)
+        config_dir_abs = abspath(CONFIG_FILE_DIR)
+        config_dir_short = Path(config_dir_abs).parts[-1]
+        VARIABLE_SUBSTITUTIONS.update(
+            {"config_dir_abs": config_dir_abs, "config_dir_name": config_dir_short}
+        )
+        print_log(f"Loading configuration data from: '{CONFIG_FILE}'")
+        CONFIG_TOML: Dict = load_toml_file_with_variable_substitutions(CONFIG_FILE)
+        try:
+            validate_properties(CONFIG_TOML, f"'{CONFIG_FILE}'")
+        except Exception as e:
+            print_error(e)
+            exit(1)
+
+    except FileNotFoundError as e:
+        if ARGS_PARSER.config_file is not None:
+            print_error(e)
+            exit(1)
+        # No config file, so create a stub config dictionary
+        print_log(
+            "No configuration file; expecting configuration data on command line "
+            "or in environment variables"
+        )
+        CONFIG_TOML = {COMMON_SECTION: {}}
+        CONFIG_FILE_DIR = os.getcwd()
+
+    except (PermissionError, TomlDecodeError) as e:
+        print_error(
+            f"Unable to load configuration data from '{CONFIG_FILE}': {e}",
+        )
         exit(1)
 
-except FileNotFoundError as e:
-    if ARGS_PARSER.config_file is not None:
+    except Exception as e:
         print_error(e)
         exit(1)
-    # No config file, so create a stub config dictionary
-    print_log(
-        "No configuration file; expecting configuration data on command line "
-        "or in environment variables"
-    )
-    CONFIG_TOML = {COMMON_SECTION: {}}
-    CONFIG_FILE_DIR = os.getcwd()
-
-except (PermissionError, TomlDecodeError) as e:
-    print_error(
-        f"Unable to load configuration data from '{CONFIG_FILE}': {e}",
-    )
-    exit(1)
-
-except Exception as e:
-    print_error(e)
-    exit(1)
 
 
 def load_config_common() -> ConfigCommon:
@@ -123,7 +130,7 @@ def load_config_common() -> ConfigCommon:
 
         # Replace common section properties with command line or
         # environment variable overrides. Precedence is:
-        # command line > environment variable > config file
+        # command line > config file > environment variable
         for key_name, args_parser_value, env_var_name in [
             (KEY, ARGS_PARSER.key, YD_KEY),
             (SECRET, ARGS_PARSER.secret, YD_SECRET),
@@ -137,7 +144,10 @@ def load_config_common() -> ConfigCommon:
                     f"Using '{key_name}' provided on command line "
                     "(or automatically set)"
                 )
-            elif os.environ.get(env_var_name, None) is not None:
+            elif (
+                common_section.get(key_name, None) is None
+                and os.environ.get(env_var_name, None) is not None
+            ):
                 common_section[key_name] = os.environ[env_var_name]
                 print_log(f"Using '{key_name}' provided via the environment")
 

{yellowdog_python_examples-7.20.2 → yellowdog_python_examples-7.20.3/yellowdog_python_examples.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yellowdog-python-examples
-Version: 7.20.2
+Version: 7.20.3
 Summary: Python CLI commands using the YellowDog Python SDK
 Author-email: YellowDog Limited <support@yellowdog.co>
 License-Expression: Apache-2.0

yellowdog_python_examples-7.20.2/yellowdog_cli/__init__.py

@@ -1 +0,0 @@
-__version__ = "7.20.2"