Merge pull request #6 from untergeek/docker_test/1.1.0

Lots of small changes:

Author: untergeek

docker_test/VERSION

@@ -1,4 +1,4 @@
-Version: 1.0.2
-Released: 23 August 2024
+Version: 1.1.0
+Released: 24 August 2024
 
 # License and Changelog at https://github.com/untergeek/es-docker-test-scripts

docker_test/env_var.yaml

@@ -0,0 +1,8 @@
+---
+elasticsearch:
+  client:
+    hosts: ${ESCLIENT_HOSTS}
+    ca_certs: ${ESCLIENT_CA_CERTS}
+  other_settings:
+    username: ${ESCLIENT_USERNAME}
+    password: ${ESCLIENT_PASSWORD}

pyproject.toml

@@ -76,7 +76,7 @@ cov = [
   'cov-report',
 ]
 
-[[tool.hatch.envs.all.matrix]]
+[[tool.hatch.envs.test.matrix]]
 python = ['3.8', '3.9', '3.10', '3.11', '3.12']
 
 [tool.hatch.envs.test.scripts]

pytest.ini

@@ -1,5 +1,5 @@
 [pytest]
-log_cli=true
+log_cli=false
 env_files =
     .env
 log_format = %(asctime)s %(levelname)-9s %(name)22s %(funcName)22s:%(lineno)-4d %(message)s

src/es_testbed/__init__.py

@@ -1,6 +1,6 @@
 """Make classes easier to import here"""
 
-__version__ = '0.8.2'
+__version__ = '0.8.3'
 
 from es_testbed._base import TestBed
 from es_testbed._plan import PlanBuilder

src/es_testbed/defaults.py

@@ -80,7 +80,20 @@
 TIMEOUT_DEFAULT: str = '30'
 TIMEOUT_ENVVAR: str = 'ES_TESTBED_TIMEOUT'
 
-IlmPhase: t.TypeAlias = t.Dict[
+# Define IlmPhase as a typing alias to be reused multiple times
+#
+# In all currently supported Python versions (3.8 -> 3.12), the syntax:
+#
+#   IlmPhase = t.Dict[
+#
+# is supported. In 3.10 and up, you can use the more explicit syntax:
+#
+#   IlmPhase: t.TypeAlias = t.Dict[
+#
+# making use of the TypeAlias class.
+#
+# To support Python versions 3.8 and 3.9 (still), the older syntax is used.
+IlmPhase = t.Dict[
     str, t.Union[str, t.Dict[str, str], t.Dict[str, t.Dict[str, t.Dict[str, str]]]]
 ]
 

src/es_testbed/helpers/utils.py

@@ -163,15 +163,21 @@ def prettystr(*args, **kwargs) -> str:
     'Return the formatted representation of object as a string. indent, width, depth,
     compact, sort_dicts and underscore_numbers are passed to the PrettyPrinter
     constructor as formatting parameters' (from pprint documentation).
+
+    The keyword arg, ``underscore_numbers`` is only available in Python versions
+    3.10 and up, so there is a test here to add it when that is the case.
     """
     defaults = [
         ('indent', 2),
         ('width', 80),
         ('depth', None),
         ('compact', False),
         ('sort_dicts', False),
-        ('underscore_numbers', False),
     ]
+    vinfo = python_version()
+    if vinfo[0] == 3 and vinfo[1] >= 10:
+        # underscore_numbers only works in 3.10 and up
+        defaults.append(('underscore_numbers', False))
     kw = {}
     for tup in defaults:
         key, default = tup
@@ -225,6 +231,14 @@ def process_preset(
     return modpath, tmpdir
 
 
+def python_version() -> t.Tuple:
+    """
+    Return running Python version tuple, e.g. 3.12.2 would be (3, 12, 2)
+    """
+    _ = sys.version_info
+    return (_[0], _[1], _[2])
+
+
 def raise_on_none(**kwargs):
     """Raise if any kwargs have a None value"""
     for key, value in kwargs.items():

src/es_testbed/presets/searchable_test/definitions.py

@@ -25,6 +25,7 @@ def get_plan(scenario: str = None) -> dict:
     retval.update(buildlist())
     if not scenario:
         return retval
+    retval['uniq'] = f'scenario-{scenario}'
     newvals = getattr(scenarios, scenario)
     ilm = {}
     if 'ilm' in newvals: