bare-script 4.0.2__tar.gz → 4.1.0__tar.gz

{bare_script-4.0.2/src/bare_script.egg-info → bare_script-4.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bare-script
-Version: 4.0.2
+Version: 4.1.0
 Summary: bare-script
 Home-page: https://github.com/craigahobbs/bare-script
 Author: Craig A. Hobbs
@@ -48,6 +48,7 @@ confident that BareScript will execute the same regardless of the underlying run
 
 - [The BareScript Language](https://craigahobbs.github.io/bare-script-py/language/)
 - [The BareScript Library](https://craigahobbs.github.io/bare-script-py/library/)
+- [The BareScript Include Library Tests](https://craigahobbs.github.io/bare-script/include/test/)
 - [API Documentation](https://craigahobbs.github.io/bare-script-py/)
 - [Source code](https://github.com/craigahobbs/bare-script-py)
 
@@ -190,6 +191,14 @@ markdownPrint('Hello, Markdown!')
 ~~~
 
 
+## C Runtime
+
+The package ships with an optional CPython C extension (`runtime_c`) that mirrors the pure-Python
+runtime for faster script execution. When the compiled extension is available, it is used
+automatically; otherwise the pure-Python runtime is used as a fallback. Set the environment
+variable `BARESCRIPT_RUNTIME_PY=1` to force the pure-Python runtime.
+
+
 ## Development
 
 This package is developed using [python-build](https://github.com/craigahobbs/python-build#readme).

{bare_script-4.0.2 → bare_script-4.1.0}/README.md

@@ -23,6 +23,7 @@ confident that BareScript will execute the same regardless of the underlying run
 
 - [The BareScript Language](https://craigahobbs.github.io/bare-script-py/language/)
 - [The BareScript Library](https://craigahobbs.github.io/bare-script-py/library/)
+- [The BareScript Include Library Tests](https://craigahobbs.github.io/bare-script/include/test/)
 - [API Documentation](https://craigahobbs.github.io/bare-script-py/)
 - [Source code](https://github.com/craigahobbs/bare-script-py)
 
@@ -165,6 +166,14 @@ markdownPrint('Hello, Markdown!')
 ~~~
 
 
+## C Runtime
+
+The package ships with an optional CPython C extension (`runtime_c`) that mirrors the pure-Python
+runtime for faster script execution. When the compiled extension is available, it is used
+automatically; otherwise the pure-Python runtime is used as a fallback. Set the environment
+variable `BARESCRIPT_RUNTIME_PY=1` to force the pure-Python runtime.
+
+
 ## Development
 
 This package is developed using [python-build](https://github.com/craigahobbs/python-build#readme).

{bare_script-4.0.2 → bare_script-4.1.0}/setup.cfg

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

bare_script-4.1.0/setup.py

@@ -0,0 +1,46 @@
+# Licensed under the MIT License
+# https://github.com/craigahobbs/bare-script-py/blob/main/LICENSE
+
+"""
+bare-script setup
+"""
+
+from setuptools import setup, Extension
+from setuptools.command.build_ext import build_ext
+
+
+class OptionalBuildExt(build_ext):
+    """
+    Build C extensions optionally - if compilation fails, the package still installs
+    and falls back to the pure-Python implementation.
+    """
+
+    def run(self):
+        try:
+            super().run()
+        except Exception: # pylint: disable=broad-except
+            self._unavailable()
+
+    def build_extension(self, ext):
+        try:
+            super().build_extension(ext)
+        except Exception: # pylint: disable=broad-except
+            self._unavailable()
+
+    @staticmethod
+    def _unavailable():
+        print('*' * 70)
+        print('WARNING: C extension could not be compiled.')
+        print('         Falling back to pure-Python implementation.')
+        print('*' * 70)
+
+
+setup(
+    ext_modules=[
+        Extension(
+            'bare_script.runtime_c',
+            sources=['src/bare_script/runtime_c.c']
+        )
+    ],
+    cmdclass={'build_ext': OptionalBuildExt}
+)

{bare_script-4.0.2 → bare_script-4.1.0}/src/bare_script/__init__.py

@@ -5,6 +5,8 @@
 bare-script package
 """
 
+import os as _os
+
 from .model import \
     lint_script, \
     validate_expression, \
@@ -25,6 +27,11 @@ from .parser import \
     parse_script
 
 from .runtime import \
-    BareScriptRuntimeError, \
-    evaluate_expression, \
-    execute_script
+    BareScriptRuntimeError
+if not _os.environ.get('BARESCRIPT_RUNTIME_PY'): # pragma: no cover
+    try:
+        from .runtime_c import evaluate_expression, execute_script
+    except ImportError:
+        from .runtime import evaluate_expression, execute_script
+else:
+    from .runtime import evaluate_expression, execute_script

{bare_script-4.0.2 → bare_script-4.1.0}/src/bare_script/bare.py

@@ -7,14 +7,22 @@ bare-script command-line interface (CLI)
 
 import argparse
 from functools import partial
+import os as _os
 import sys
 import time
 
 from .model import lint_script
 from .options import FETCH_SYSTEM_PREFIX, fetch_read_write, fetch_system, log_stdout, url_file_relative
 from .parser import parse_expression, parse_script
-from .runtime import SYSTEM_GLOBAL_INCLUDES_NAME, evaluate_expression, execute_script
+from .runtime import SYSTEM_GLOBAL_INCLUDES_NAME
 from .value import value_boolean
+if not _os.environ.get('BARESCRIPT_RUNTIME_PY'): # pragma: no cover
+    try:
+        from .runtime_c import evaluate_expression, execute_script
+    except ImportError:
+        from .runtime import evaluate_expression, execute_script
+else:
+    from .runtime import evaluate_expression, execute_script
 
 
 def main(argv=None):

{bare_script-4.0.2 → bare_script-4.1.0}/src/bare_script/include/dataLineChart.bare

@@ -174,12 +174,18 @@ endfunction
 # $arg options: - **fontSize** - The font size, in pixels
 # $return: The line chart [element model](https://github.com/craigahobbs/element-model#readme)
 function dataLineChartElements(data, lineChart, options):
-    chartFontSize = if(options, objectGet(options, 'fontSize', dataLineChartChartFontDefaultSizePx), dataLineChartChartFontDefaultSizePx)
     xField = objectGet(lineChart, 'x')
     yFields = objectGet(lineChart, 'y')
     colorField = objectGet(lineChart, 'color')
     colorOrder = objectGet(lineChart, 'colorOrder')
 
+    # Determine the font size
+    fontSize = if(options, objectGet(options, 'fontSize'))
+    if !fontSize:
+        documentFontSize = systemGlobalGet('documentFontSize')
+        fontSize = if(documentFontSize, documentFontSize(), dataLineChartChartFontDefaultSizePx)
+    endif
+
     # Sort the rows by the X field
     arraySort(data, systemPartial(dataLineChartSortCompare, xField))
 
@@ -331,13 +337,13 @@ function dataLineChartElements(data, lineChart, options):
     endif
 
     # Chart title calculations
-    chartBorderSize = chartFontSize
-    chartTitleFontSize = 1.1 * chartFontSize
+    chartBorderSize = fontSize
+    chartTitleFontSize = 1.1 * fontSize
     chartTitleHeight = if(chartTitle != null, 1.5 * chartTitleFontSize, 0)
 
     # Y-axis calculations
-    axisTitleFontSize = 1 * chartFontSize
-    axisLabelFontSize = chartFontSize
+    axisTitleFontSize = 1 * fontSize
+    axisLabelFontSize = fontSize
     yAxisTitle = if(arrayLength(yFields) == 1, arrayGet(yFields, 0))
     yAxisTitleWidth = if(yAxisTitle != null, 1.8 * axisTitleFontSize, 0)
     yAxisLabelWidth = 0
@@ -370,7 +376,7 @@ function dataLineChartElements(data, lineChart, options):
     xAnnotationLabelOffsetY = 0.1 * annotationLabelFontSize
 
     # Color legend calculations
-    colorLegendFontSize = chartFontSize
+    colorLegendFontSize = fontSize
     colorLegendGap = 0.5 * colorLegendFontSize
     colorLegendLabelHeight = colorLegendFontSize
     colorLegendLabelGap = 0.35 * colorLegendLabelHeight

{bare_script-4.0.2 → bare_script-4.1.0}/src/bare_script/library.py

@@ -11,6 +11,7 @@ import functools
 import importlib
 import json
 import math
+import os as _os
 import random
 import re
 import urllib
@@ -27,16 +28,18 @@ from .value import R_NUMBER_CLEANUP, ValueArgsError, value_args_model, value_arg
 # Helper to dynamically import evaluate_expression to avoid the circular dependency
 def _import_evaluate_expression():
     if not _EVALUATE_EXPRESSION:
-        _EVALUATE_EXPRESSION.append(importlib.import_module('bare_script.runtime').evaluate_expression)
+        if not _os.environ.get('BARESCRIPT_RUNTIME_PY'): # pragma: no cover
+            try:
+                _EVALUATE_EXPRESSION.append(importlib.import_module('bare_script.runtime_c').evaluate_expression)
+            except (ImportError, AttributeError):
+                _EVALUATE_EXPRESSION.append(importlib.import_module('bare_script.runtime').evaluate_expression)
+        else:
+            _EVALUATE_EXPRESSION.append(importlib.import_module('bare_script.runtime').evaluate_expression)
     return _EVALUATE_EXPRESSION[0]
 
 _EVALUATE_EXPRESSION = []
 
 
-# The default maximum statements for executeScript
-DEFAULT_MAX_STATEMENTS = 1e9
-
-
 #
 # Array functions
 #

{bare_script-4.0.2 → bare_script-4.1.0}/src/bare_script/runtime.py

@@ -8,13 +8,17 @@ The BareScript runtime
 import datetime
 import functools
 
-from .library import DEFAULT_MAX_STATEMENTS, EXPRESSION_FUNCTIONS, SCRIPT_FUNCTIONS
+from .library import EXPRESSION_FUNCTIONS, SCRIPT_FUNCTIONS
 from .model import lint_script
 from .options import url_file_relative
 from .parser import parse_script
 from .value import ValueArgsError, value_boolean, value_compare, value_normalize_datetime, value_round_number, value_string
 
 
+# The default maximum statements for executeScript
+DEFAULT_MAX_STATEMENTS = 1e9
+
+
 # Coverage configuration object global variable name
 SYSTEM_GLOBAL_COVERAGE_NAME = '__barescriptCoverage'