bare-script 3.8.2__tar.gz → 3.8.4__tar.gz

{bare_script-3.8.2/src/bare_script.egg-info → bare_script-3.8.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bare-script
-Version: 3.8.2
+Version: 3.8.4
 Summary: bare-script
 Home-page: https://github.com/craigahobbs/bare-script
 Author: Craig A. Hobbs

{bare_script-3.8.2 → bare_script-3.8.4}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = bare-script
-version = 3.8.2
+version = 3.8.4
 url = https://github.com/craigahobbs/bare-script
 author = Craig A. Hobbs
 author_email = craigahobbs@gmail.com

{bare_script-3.8.2 → bare_script-3.8.4}/src/bare_script/include/args.bare

@@ -1,6 +1,8 @@
 # Licensed under the MIT License
 # https://github.com/craigahobbs/bare-script/blob/main/LICENSE
 
+include <dataTable.bare>
+
 
 # The URL arguments model
 argsTypes = schemaParse( \
@@ -179,8 +181,6 @@ endfunction
 # $function: argsHelp
 # $group: args.bare
 # $doc: Generate the [arguments model's](model.html#var.vName='ArgsArguments') help content
-# $doc:
-# $doc: **NOTE:** Calling this function requires `include <dataTable.bare>`
 # $arg arguments: The [arguments model](model.html#var.vName='ArgsArguments')
 # $return: The array of help Markdown line strings
 function argsHelp(arguments):

{bare_script-3.8.2 → bare_script-3.8.4}/src/bare_script/runtime.py

@@ -153,20 +153,20 @@ def _execute_script_helper(script, statements, options, locals_):
                 if system_include:
                     include_script['system'] = True
 
+                # Execute the include script
+                include_options = options.copy()
+                include_options['urlFn'] = functools.partial(url_file_relative, include_url)
+                _execute_script_helper(include_script, include_script['statements'], include_options, None)
+
                 # Run the bare-script linter?
                 if log_fn is not None and options.get('debug'):
-                    warnings = lint_script(include_script)
+                    warnings = lint_script(include_script, globals_)
                     if warnings:
                         warning_prefix = f'BareScript: Include "{include_url}" static analysis...'
                         log_fn(f'{warning_prefix} {len(warnings)} warning{"s" if len(warnings) > 1 else ""}:')
                         for warning in warnings:
                             log_fn(f'BareScript: {warning}')
 
-                # Execute the include script
-                include_options = options.copy()
-                include_options['urlFn'] = functools.partial(url_file_relative, include_url)
-                _execute_script_helper(include_script, include_script['statements'], include_options, None)
-
         # Increment the statement counter
         ix_statement += 1
 

{bare_script-3.8.2 → bare_script-3.8.4/src/bare_script.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bare-script
-Version: 3.8.2
+Version: 3.8.4
 Summary: bare-script
 Home-page: https://github.com/craigahobbs/bare-script
 Author: Craig A. Hobbs