genie-python 15.1.0rc2__tar.gz → 25.2.1__tar.gz

genie_python-25.2.1/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

{genie_python-15.1.0rc2 → genie_python-25.2.1}/.github/workflows/release.yml

@@ -67,7 +67,7 @@ jobs:
         name: python-package-distributions
         path: dist/
     - name: Sign the dists with Sigstore
-      uses: sigstore/gh-action-sigstore-python@v2.1.1
+      uses: sigstore/gh-action-sigstore-python@v3.0.0
       with:
         inputs: >-
           ./dist/*.tar.gz

{genie_python-15.1.0rc2 → genie_python-25.2.1}/.gitignore

@@ -162,3 +162,6 @@ cython_debug/
 .idea/
 
 _build/
+
+# setuptools_scm-generated file
+src/genie_python/_version.py

{genie_python-15.1.0rc2/src/genie_python.egg-info → genie_python-25.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: genie_python
-Version: 15.1.0rc2
+Version: 25.2.1
 Summary: Instrument control & scripting for the ISIS Neutron & Muon source
 Author-email: ISIS Experiment Controls <ISISExperimentControls@stfc.ac.uk>
 Maintainer-email: ISIS Experiment Controls <ISISExperimentControls@stfc.ac.uk>

{genie_python-15.1.0rc2 → genie_python-25.2.1}/doc/genie_python.rst

@@ -18,4 +18,8 @@ Commands
 .. automodule:: genie_advanced
    :members:
 
+.. automodule:: genie_alerts
+   :members:
 
+.. automodule:: genie_toggle_settings
+   :members:

{genie_python-15.1.0rc2 → genie_python-25.2.1}/pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools", "setuptools_scm>=8"]
+requires = ["setuptools>=64", "setuptools_scm>=8"]
 build-backend = "setuptools.build_meta"
 
 
@@ -119,5 +119,6 @@ reportUntypedClassDecorator = true
 reportUntypedFunctionDecorator = true
 
 [tool.setuptools_scm]
+version_file = "src/genie_python/_version.py"
 
 [tool.build_sphinx]

{genie_python-15.1.0rc2 → genie_python-25.2.1}/ruff.toml

@@ -23,8 +23,6 @@ ignore = [
     "D406",  # Section name should end with a newline ("{name}")
     "D407",  # Missing dashed underline after section ("{name}")
     "N999",  # Ignore this because the repo itself would need to be renamed
-    "ANN101",  # ignore this until its removed in future versions
-    "ANN102",  # ignore this until its removed in future versions
     "ANN401", # explicit ANY type is allowed
 ]
 [lint.per-file-ignores]

genie_python-25.2.1/src/genie_python/_version.py

@@ -0,0 +1,16 @@
+# file generated by setuptools_scm
+# don't change, don't track in version control
+TYPE_CHECKING = False
+if TYPE_CHECKING:
+    from typing import Tuple, Union
+    VERSION_TUPLE = Tuple[Union[int, str], ...]
+else:
+    VERSION_TUPLE = object
+
+version: str
+__version__: str
+__version_tuple__: VERSION_TUPLE
+version_tuple: VERSION_TUPLE
+
+__version__ = version = '25.2.1'
+__version_tuple__ = version_tuple = (25, 2, 1)

{genie_python-15.1.0rc2 → genie_python-25.2.1}/src/genie_python/genie.py

@@ -47,7 +47,7 @@ PVValue = PVBaseValue | list[PVBaseValue] | npt.NDArray | None
 
 print("\ngenie_python version " + VERSION)
 
-SUPPORTED_PYTHON_VERSION = (3, 11, 6)
+SUPPORTED_PYTHON_VERSION = (3, 11, 9)
 if sys.version_info[0:3] != SUPPORTED_PYTHON_VERSION[0:3]:
     message = (
         "WARNING: genie_python only guarantees support for "
@@ -114,13 +114,13 @@ def get_block_units(block_name: str) -> str | dict | None:
 @helparglist("...")
 @log_command_and_handle_exception
 def cset(
-    *args: str,
+    *args: PVValue,
     runcontrol: bool | None = None,
     lowlimit: float | None = None,
     highlimit: float | None = None,
     wait: bool | None = None,
     verbose: bool | None = None,
-    **kwargs: bool | int | float | str | None,
+    **kwargs: PVValue,
 ) -> None:
     """
     Sets the setpoint and runcontrol settings for blocks.

{genie_python-15.1.0rc2 → genie_python-25.2.1}/src/genie_python/genie_advanced.py

@@ -328,6 +328,19 @@ def get_instrument() -> str | None:
     return __api.get_instrument()
 
 
+@usercommand
+@helparglist("")
+@log_command_and_handle_exception
+def get_instrument_full_name() -> str | None:
+    """
+    Gets the full name of the local instrument
+
+    Returns:
+        the full name of the machine
+    """
+    return __api.get_instrument_full_name()
+
+
 @usercommand
 @helparglist("verbose")
 @log_command_and_handle_exception

{genie_python-15.1.0rc2 → genie_python-25.2.1}/src/genie_python/genie_epics_api.py

@@ -74,7 +74,7 @@ class API(object):
         else:
             self._environment_details = environment_details
 
-        Wrapper.errorLogFunc = self.logger.log_ca_msg
+        Wrapper.error_log_func = self.logger.log_ca_msg
 
         # disable CA error messages to console from disconnected PVs
         import ctypes
@@ -323,12 +323,18 @@ class API(object):
 
         Args:
             name: the PV name
-            value: the value to set
+            value: the value to set. If this is None, do nothing.
             wait: wait for the value to be set before returning
             is_local (bool, optional): whether to automatically prepend the
                                        local inst prefix to the PV name
             attempts: number of attempts to try to set the pv value
         """
+        if value is None:
+            self.logger.log_info_msg(
+                f"set_pv_value called with name={name} value={value} wait={wait}"
+                f" is_local={is_local} attempts={attempts} ignoring because value is None"
+            )
+            return
         if is_local:
             if not name.startswith(self.inst_prefix):
                 name = self.prefix_pv_name(name)

{genie_python-15.1.0rc2 → genie_python-25.2.1}/src/genie_python/genie_experimental_data.py

@@ -7,8 +7,8 @@ from typing import TypedDict
 from genie_python.mysql_abstraction_layer import SQLAbstraction
 
 SELECT_FOR_EXP_DETAILS = """
-SELECT e.experimentID, u.name as userName, r.name as roleName,"""
-""" t.startDate, e.duration FROM `experimentteams` t
+SELECT e.experimentID, u.name as userName, r.name as roleName,
+t.startDate, e.duration FROM `experimentteams` t
 JOIN experiment e ON e.experimentID = t.experimentID
 JOIN user u ON u.userID = t.userID
 JOIN role r ON r.roleID = t.roleID
@@ -94,10 +94,10 @@ class GetExperimentData:
                 self._pretty_print(exp_data)
             else:
                 raise NotFoundError(
-                    f'Found no experiments that match the given criteria '
-                    f'(RB: {rb if rb != "%" else "Any"}, '
-                    f'User: {user if user != "%" else "Any"}, '
-                    f'Role: {role if role != "%" else "Any"}).\n'
+                    f"Found no experiments that match the given criteria "
+                    f"(RB: {rb if rb != '%' else 'Any'}, "
+                    f"User: {user if user != '%' else 'Any'}, "
+                    f"Role: {role if role != '%' else 'Any'}).\n"
                 )
 
         return exp_data
@@ -169,11 +169,11 @@ class GetExperimentData:
 
         for exp in exp_data:
             print(
-                f'Experiment RB number: {exp["rb_number"]:{rb_padding}} | '
-                f'User: {exp["user"]:{user_padding}} | '
-                f'Role: {exp["role"]:{role_padding}} | '
-                f'Start date: {exp["start_date"]} | '
-                f'Duration: {exp["duration"]}'
+                f"Experiment RB number: {exp['rb_number']:{rb_padding}} | "
+                f"User: {exp['user']:{user_padding}} | "
+                f"Role: {exp['role']:{role_padding}} | "
+                f"Start date: {exp['start_date']} | "
+                f"Duration: {exp['duration']}"
             )
 
 

{genie_python-15.1.0rc2 → genie_python-25.2.1}/src/genie_python/genie_simulate_impl.py

@@ -2,6 +2,7 @@ from __future__ import absolute_import, print_function
 
 import inspect
 import os
+import socket
 import xml.etree.ElementTree as ET
 from builtins import object, str
 from collections import OrderedDict
@@ -1263,3 +1264,6 @@ class API(object):
 
     def get_block_units(self, block: str) -> str:
         return "mm"
+
+    def get_instrument_full_name(self) -> str:
+        return socket.gethostname()

genie_python-25.2.1/src/genie_python/testing_utils/__init__.py

@@ -0,0 +1,4 @@
+"""
+This private module exists to allow testing utility code to be shared between genie_python's
+unit tests, and the external system tests.
+"""

genie_python-25.2.1/src/genie_python/testing_utils/script_checker.py

@@ -0,0 +1,63 @@
+import os
+import tempfile
+from types import TracebackType
+from typing import IO
+
+from genie_python.genie_script_checker import ScriptChecker
+
+
+def write_to_temp_file(message: list[str], suffix: str = "", dir: str = "") -> IO[bytes]:
+    """
+    write to temporary file for test check_script
+
+    Args:
+        message: message to write to file
+        suffix: filename suffix
+        dir: directory to write into
+
+    Returns:
+        temporary file
+    """
+    temp_file = tempfile.NamedTemporaryFile(delete=False, suffix=suffix, dir=dir)
+    for line in message:
+        temp_file.write(line.encode("utf-8"))
+    temp_file.close()
+    return temp_file
+
+
+class CreateTempScriptAndReturnErrors:
+    def __init__(
+        self,
+        script_checker: ScriptChecker,
+        machine: str,
+        script: list[str],
+        warnings_as_error: bool = True,
+        no_pyright: bool = False,
+        no_pylint: bool = False,
+        dir: str = "",
+    ) -> None:
+        self.script = script
+        self.machine = machine
+        self.dir = dir
+        self.warnings_as_error = warnings_as_error
+        self.no_pyright = no_pyright
+        self.no_pylint = no_pylint
+        self.script_checker = script_checker
+
+    def __enter__(self) -> list[str]:
+        self.temp_script_file = write_to_temp_file(self.script, dir=self.dir)
+        return self.script_checker.check_script(
+            self.temp_script_file.name,
+            self.machine,
+            warnings_as_error=self.warnings_as_error,
+            no_pyright=self.no_pyright,
+            no_pylint=self.no_pylint,
+        )
+
+    def __exit__(
+        self,
+        exc_type: type[BaseException] | None,
+        exc_value: BaseException | None,
+        exc_traceback: TracebackType,
+    ) -> None:
+        os.unlink(self.temp_script_file.name)

genie_python-25.2.1/src/genie_python/version.py

@@ -0,0 +1,6 @@
+from genie_python._version import version
+
+__all__ = ["VERSION"]
+
+# Shim for backwards-compatibility. Version now auto-generated by setuptools_scm.
+VERSION = version

{genie_python-15.1.0rc2 → genie_python-25.2.1/src/genie_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: genie_python
-Version: 15.1.0rc2
+Version: 25.2.1
 Summary: Instrument control & scripting for the ISIS Neutron & Muon source
 Author-email: ISIS Experiment Controls <ISISExperimentControls@stfc.ac.uk>
 Maintainer-email: ISIS Experiment Controls <ISISExperimentControls@stfc.ac.uk>

{genie_python-15.1.0rc2 → genie_python-25.2.1}/src/genie_python.egg-info/SOURCES.txt

@@ -6,6 +6,7 @@ README.md
 pyproject.toml
 ruff.toml
 .github/PULL_REQUEST_TEMPLATE.md
+.github/dependabot.yml
 .github/workflows/documentation.yml
 .github/workflows/lint_and_test.yml
 .github/workflows/release.yml
@@ -13,6 +14,7 @@ doc/conf.py
 doc/genie_python.rst
 src/genie_python/.pylintrc
 src/genie_python/__init__.py
+src/genie_python/_version.py
 src/genie_python/block_names.py
 src/genie_python/channel_access_exceptions.py
 src/genie_python/genie.py
@@ -49,6 +51,8 @@ src/genie_python.egg-info/requires.txt
 src/genie_python.egg-info/top_level.txt
 src/genie_python/matplotlib_backend/__init__.py
 src/genie_python/matplotlib_backend/ibex_websocket_backend.py
+src/genie_python/testing_utils/__init__.py
+src/genie_python/testing_utils/script_checker.py
 src/genie_python/typings/CaChannel/CaChannel.pyi
 src/genie_python/typings/CaChannel/__init__.pyi
 src/genie_python/typings/CaChannel/_version.pyi

{genie_python-15.1.0rc2 → genie_python-25.2.1}/tests/test_genie_epics_api.py

@@ -173,6 +173,9 @@ class TestEpicsApiSequence(unittest.TestCase):
 
         self.assertEqual(self.api.get_pv_alarm("DISCONNECTED_PV"), "UNKNOWN")
 
+    def test_GIVEN_api_is_imported_THEN_error_log_func_overwritten_on_wrapper(self):
+        self.assertEqual(self.mock_wrapper.error_log_func, self.api.logger.log_ca_msg)
+
 
 class TestEpicsApiSetInstrumentName(unittest.TestCase):
     def setUp(self):

{genie_python-15.1.0rc2 → genie_python-25.2.1}/tests/test_script_checker.py

@@ -26,52 +26,13 @@ import astroid
 
 from genie_python.genie_epics_api import API
 from genie_python.genie_script_checker import ScriptChecker
-
-
-def write_to_file(message, suffix="", dir=""):
-    """
-    write to temporary file for test check_script
-    :param message: message to write to file
-    :return: returns temporary file
-    """
-    temp_file = tempfile.NamedTemporaryFile(delete=False, suffix=suffix, dir=dir)
-    for line in message:
-        temp_file.write(line.encode("utf-8"))
-    temp_file.close()
-    return temp_file
+from genie_python.testing_utils.script_checker import (
+    CreateTempScriptAndReturnErrors,
+    write_to_temp_file,
+)
 
 
 class TestScriptChecker(unittest.TestCase):
-    class _CreateTempScriptAndReturnErrors:
-        def __init__(
-            self,
-            script_checker,
-            script,
-            warnings_as_error=True,
-            no_pyright=False,
-            no_pylint=False,
-            dir="",
-        ):
-            self.script = script
-            self.dir = dir
-            self.warnings_as_error = warnings_as_error
-            self.no_pyright = no_pyright
-            self.no_pylint = no_pylint
-            self.script_checker = script_checker
-
-        def __enter__(self):
-            self.temp_script_file = write_to_file(self.script, dir=self.dir)
-            return self.script_checker.checker.check_script(
-                self.temp_script_file.name,
-                self.script_checker.machine,
-                warnings_as_error=self.warnings_as_error,
-                no_pyright=self.no_pyright,
-                no_pylint=self.no_pylint,
-            )
-
-        def __exit__(self, exc_type, exc_value, exc_traceback):
-            os.unlink(self.temp_script_file.name)
-
     def setUp(self):
         self.checker = ScriptChecker()
         self.api = API("", None)
@@ -86,7 +47,7 @@ class TestScriptChecker(unittest.TestCase):
 
     def assertSymbolsDefined(self, script_lines, expected_symbols):
         dir_path = tempfile.mkdtemp()
-        write_to_file(script_lines, suffix=".py", dir=dir_path)
+        write_to_temp_file(script_lines, suffix=".py", dir=dir_path)
         result = self.checker.get_inst_attributes(dir_path)
         shutil.rmtree(dir_path)
         self.assertEqual(result, expected_symbols)
@@ -98,7 +59,7 @@ class TestScriptChecker(unittest.TestCase):
             "   g.end\n",
         ]
 
-        with self._CreateTempScriptAndReturnErrors(self, script_lines) as errors:
+        with CreateTempScriptAndReturnErrors(self.checker, self.machine, script_lines) as errors:
             self.assertEqual(
                 errors, ["W:  4: Statement seems to have no effect (pointless-statement)"]
             )
@@ -106,7 +67,7 @@ class TestScriptChecker(unittest.TestCase):
     def test_GIVEN_end_as_start_of_another_word_WHEN_check_THEN_no_error_message(self):
         script_lines = ["from genie_python import genie as g\n" "def test():\n", "    endAngle = 1"]
 
-        with self._CreateTempScriptAndReturnErrors(self, script_lines) as errors:
+        with CreateTempScriptAndReturnErrors(self.checker, self.machine, script_lines) as errors:
             self.assertEqual(errors, [])
 
     def test_GIVEN_end_as_end_of_another_word_WHEN_check_THEN_no_error_message(self):
@@ -115,13 +76,15 @@ class TestScriptChecker(unittest.TestCase):
             "    angle_end = 1",
         ]
 
-        with self._CreateTempScriptAndReturnErrors(self, script_lines, no_pyright=True) as errors:
+        with CreateTempScriptAndReturnErrors(
+            self.checker, self.machine, script_lines, no_pyright=True
+        ) as errors:
             self.assertEqual(errors, [])
 
     def test_GIVEN_end_without_brackets_at_start_of_line_WHEN_check_THEN_error_message(self):
         script_lines = ["from genie_python import genie as g\n" "def test():\n" "   g.end"]
 
-        with self._CreateTempScriptAndReturnErrors(self, script_lines) as errors:
+        with CreateTempScriptAndReturnErrors(self.checker, self.machine, script_lines) as errors:
             self.assertEqual(
                 errors, ["W:  3: Statement seems to have no effect (pointless-statement)"]
             )
@@ -131,7 +94,7 @@ class TestScriptChecker(unittest.TestCase):
     ):
         script_lines = ["from genie_python import genie as g\n" "g.begin(); g.end "]
 
-        with self._CreateTempScriptAndReturnErrors(self, script_lines) as errors:
+        with CreateTempScriptAndReturnErrors(self.checker, self.machine, script_lines) as errors:
             self.assertEqual(
                 errors, ["W:  2: Statement seems to have no effect (pointless-statement)"]
             )
@@ -139,13 +102,13 @@ class TestScriptChecker(unittest.TestCase):
     def test_GIVEN_end_in_string_without_brackets_WHEN_check_THEN_no_message(self):
         script_lines = ["def test():\n" '   " a string containing end "']
 
-        with self._CreateTempScriptAndReturnErrors(self, script_lines) as errors:
+        with CreateTempScriptAndReturnErrors(self.checker, self.machine, script_lines) as errors:
             self.assertEqual(errors, [])
 
     def test_GIVEN_end_in_comment_without_brackets_WHEN_check_THEN_no_message(self):
         script_lines = ["def test():\n", '   "stuff" # end "']
 
-        with self._CreateTempScriptAndReturnErrors(self, script_lines) as errors:
+        with CreateTempScriptAndReturnErrors(self.checker, self.machine, script_lines) as errors:
             self.assertEqual(errors, [])
 
     def test_GIVEN_g_assignment_WHEN_check_THEN_warning_message(self):
@@ -229,13 +192,13 @@ class TestScriptChecker(unittest.TestCase):
     def test_GIVEN_g_assignment_with_2_symbols_before_number_WHEN_check_THEN_warning_message(self):
         script_lines = ["from genie_python import genie as g\n", "def test():\n", "   g+=12"]
 
-        with self._CreateTempScriptAndReturnErrors(self, script_lines) as errors:
+        with CreateTempScriptAndReturnErrors(self.checker, self.machine, script_lines) as errors:
             self.assertEqual(errors, ["W:  3: 'g' assignment in line 3"])
 
     def test_GIVEN_variable_assignment_with_g__WHEN_check_THEN_no_message(self):
         script_lines = ["going=13"]
 
-        with self._CreateTempScriptAndReturnErrors(self, script_lines) as errors:
+        with CreateTempScriptAndReturnErrors(self.checker, self.machine, script_lines) as errors:
             self.assertEqual(errors, [])
 
     def test_GIVEN_function_with_g_WHEN_check_THEN_warn_user(self):
@@ -243,7 +206,7 @@ class TestScriptChecker(unittest.TestCase):
             "from genie_python import genie as g\n" "def test():\n" "   g.test_function()\n"
         ]
 
-        with self._CreateTempScriptAndReturnErrors(self, script_lines) as errors:
+        with CreateTempScriptAndReturnErrors(self.checker, self.machine, script_lines) as errors:
             self.assertEqual(
                 errors,
                 ["E:  3: Module 'genie_python.genie' has no 'test_function' member (no-member)"],
@@ -255,7 +218,7 @@ class TestScriptChecker(unittest.TestCase):
             "    g=17",
         ]
 
-        with self._CreateTempScriptAndReturnErrors(self, script_lines) as errors:
+        with CreateTempScriptAndReturnErrors(self.checker, self.machine, script_lines) as errors:
             self.assertEqual(
                 errors, ["W:  3: 'g' assignment in line 3", "W:  4: 'g' assignment in line 4"]
             )
@@ -265,7 +228,7 @@ class TestScriptChecker(unittest.TestCase):
             "from genie_python import genie as g\n" "def test():\n" "  g.aitfor_time(10)"
         ]
 
-        with self._CreateTempScriptAndReturnErrors(self, script_lines) as errors:
+        with CreateTempScriptAndReturnErrors(self.checker, self.machine, script_lines) as errors:
             self.assertEqual(
                 errors,
                 [
@@ -409,7 +372,7 @@ class TestScriptChecker(unittest.TestCase):
         script_lines = ["my_expr ="]
         expected = "E:  1: Parsing failed: 'invalid syntax"
 
-        with self._CreateTempScriptAndReturnErrors(self, script_lines) as errors:
+        with CreateTempScriptAndReturnErrors(self.checker, self.machine, script_lines) as errors:
             self.assertTrue(
                 errors[0].startswith(expected),
                 f"Result was {errors}, expected first line to start with {expected}",
@@ -418,20 +381,20 @@ class TestScriptChecker(unittest.TestCase):
     def test_GIVEN_valid_python_expr_WHEN_call_check_THEN_no_error(self):
         script_lines = ["my_expr = {}"]
 
-        with self._CreateTempScriptAndReturnErrors(self, script_lines) as errors:
+        with CreateTempScriptAndReturnErrors(self.checker, self.machine, script_lines) as errors:
             self.assertEqual(errors, [])
 
     def test_GIVEN_valid_python_class_WHEN_call_check_THEN_no_error(self):
         script_lines = ["class MyClass():", "pass"]
 
-        with self._CreateTempScriptAndReturnErrors(self, script_lines) as errors:
+        with CreateTempScriptAndReturnErrors(self.checker, self.machine, script_lines) as errors:
             self.assertEqual(errors, [])
 
     def test_GIVEN_invalid_python_class_WHEN_call_check_THEN_error(self):
         script_lines = ["class MyClass():"]
         expected = "E:  1: Parsing failed: 'expected an indented block"
 
-        with self._CreateTempScriptAndReturnErrors(self, script_lines) as errors:
+        with CreateTempScriptAndReturnErrors(self.checker, self.machine, script_lines) as errors:
             self.assertTrue(
                 errors[0].startswith(expected),
                 f'Result was "{errors[0]}", expected first line to start with "{expected}"',
@@ -476,7 +439,7 @@ class TestScriptChecker(unittest.TestCase):
 
         expected = "E: 2: Argument of type"
 
-        with self._CreateTempScriptAndReturnErrors(self, script_lines) as errors:
+        with CreateTempScriptAndReturnErrors(self.checker, self.machine, script_lines) as errors:
             self.assertTrue(errors[0].startswith(expected))
 
     def test_GIVEN_invalid_var_type_THEN_pyright_throws_exception(self):
@@ -484,7 +447,7 @@ class TestScriptChecker(unittest.TestCase):
 
         expected = "not assignable"
 
-        with self._CreateTempScriptAndReturnErrors(self, script_lines) as errors:
+        with CreateTempScriptAndReturnErrors(self.checker, self.machine, script_lines) as errors:
             self.assertTrue(expected in errors[0])
 
     def test_GIVEN_new_directory_WHEN_pyright_script_checker_called_THEN_pyright_json_created_then_destroyed_after_use(
@@ -512,7 +475,7 @@ class TestScriptChecker(unittest.TestCase):
 
         expected = "E: 3: Argument of type"
 
-        with self._CreateTempScriptAndReturnErrors(self, script_lines) as errors:
+        with CreateTempScriptAndReturnErrors(self.checker, self.machine, script_lines) as errors:
             self.assertTrue(errors[0].startswith(expected))
 
     # Test that if linter fails then pyright does not run
@@ -530,7 +493,7 @@ class TestScriptChecker(unittest.TestCase):
         ]
         expected = "E:  1: Parsing failed: 'invalid syntax"
 
-        with self._CreateTempScriptAndReturnErrors(self, script_lines) as errors:
+        with CreateTempScriptAndReturnErrors(self.checker, self.machine, script_lines) as errors:
             self.assertTrue(
                 errors[0].startswith(expected) and len(errors) == 1
             )  # Will be count of 2 if pyright still runs
@@ -546,7 +509,9 @@ class TestScriptChecker(unittest.TestCase):
             "   g.begin(1,2,3,4,5,6,7,8,9)\n",
         ]
 
-        with self._CreateTempScriptAndReturnErrors(self, script_lines, no_pyright=True) as errors:
+        with CreateTempScriptAndReturnErrors(
+            self.checker, self.machine, script_lines, no_pyright=True
+        ) as errors:
             self.assertEqual(errors, [])
 
     # Pyright config checks
@@ -554,7 +519,7 @@ class TestScriptChecker(unittest.TestCase):
     def test_GIVEN_unused_variable_in_script_WHEN_pyright_script_checker_called_THEN_no_error(self):
         script_lines = ["a = 10\n"]
 
-        with self._CreateTempScriptAndReturnErrors(self, script_lines) as errors:
+        with CreateTempScriptAndReturnErrors(self.checker, self.machine, script_lines) as errors:
             self.assertEqual(errors, [])
 
     def test_GIVEN_trying_to_access_member_of_optional_type_var_WHEN_pyright_script_checker_called_THEN_no_error(
@@ -566,7 +531,7 @@ class TestScriptChecker(unittest.TestCase):
             "   a.upper()\n",
         ]
 
-        with self._CreateTempScriptAndReturnErrors(self, script_lines) as errors:
+        with CreateTempScriptAndReturnErrors(self.checker, self.machine, script_lines) as errors:
             self.assertEqual(errors, [])
 
     def test_GIVEN_trying_to_index_var_of_optional_type_WHEN_pyright_script_checker_called_THEN_no_error(
@@ -578,7 +543,7 @@ class TestScriptChecker(unittest.TestCase):
             "   return elements[0]\n",
         ]
 
-        with self._CreateTempScriptAndReturnErrors(self, script_lines) as errors:
+        with CreateTempScriptAndReturnErrors(self.checker, self.machine, script_lines) as errors:
             self.assertEqual(errors, [])
 
     def test_GIVEN_trying_to_call_var_of_optional_type_WHEN_pyright_script_checker_called_THEN_no_error(
@@ -590,7 +555,7 @@ class TestScriptChecker(unittest.TestCase):
             "   callback()\n",
         ]
 
-        with self._CreateTempScriptAndReturnErrors(self, script_lines) as errors:
+        with CreateTempScriptAndReturnErrors(self.checker, self.machine, script_lines) as errors:
             self.assertEqual(errors, [])
 
     def test_GIVEN_trying_to_iterate_over_var_of_optional_type_WHEN_pyright_script_checker_called_THEN_no_error(
@@ -602,7 +567,7 @@ class TestScriptChecker(unittest.TestCase):
             "       pass\n",
         ]
 
-        with self._CreateTempScriptAndReturnErrors(self, script_lines) as errors:
+        with CreateTempScriptAndReturnErrors(self.checker, self.machine, script_lines) as errors:
             self.assertEqual(errors, [])
 
     def test_GIVEN_trying_to_define_function_with_none_type_args_type_WHEN_pyright_script_checker_called_THEN_no_error(
@@ -610,7 +575,7 @@ class TestScriptChecker(unittest.TestCase):
     ):
         script_lines = ["def none_func(arg: int = None):\n" "   print(arg)\n"]
 
-        with self._CreateTempScriptAndReturnErrors(self, script_lines) as errors:
+        with CreateTempScriptAndReturnErrors(self.checker, self.machine, script_lines) as errors:
             self.assertEqual(errors, [])
 
     def test_GIVEN_trying_to_use_optional_operand__WHEN_pyright_script_checker_called_THEN_no_error(
@@ -618,7 +583,7 @@ class TestScriptChecker(unittest.TestCase):
     ):
         script_lines = ["def none_func(arg1: int, arg2: int = None):\n" "   print(arg2 + arg1)\n"]
 
-        with self._CreateTempScriptAndReturnErrors(self, script_lines) as errors:
+        with CreateTempScriptAndReturnErrors(self.checker, self.machine, script_lines) as errors:
             self.assertEqual(errors, [])
 
     def test_GIVEN_trying_to_use_undefined_variable_WHEN_pyright_script_checker_called_THEN_no_error(
@@ -626,11 +591,15 @@ class TestScriptChecker(unittest.TestCase):
     ):
         script_lines = ["def func():\n" "   print(arg)\n"]
 
-        with self._CreateTempScriptAndReturnErrors(self, script_lines, no_pylint=True) as errors:
+        with CreateTempScriptAndReturnErrors(
+            self.checker, self.machine, script_lines, no_pylint=True
+        ) as errors:
             self.assertEqual(errors, [])
 
     def test_GIVEN_unused_import_WHEN_pyright_script_checker_called_THEN_no_error(self):
         script_lines = ["import genie\n"]
 
-        with self._CreateTempScriptAndReturnErrors(self, script_lines, no_pylint=True) as errors:
+        with CreateTempScriptAndReturnErrors(
+            self.checker, self.machine, script_lines, no_pylint=True
+        ) as errors:
             self.assertEqual(errors, [])

genie_python-15.1.0rc2/src/genie_python/version.py

@@ -1 +0,0 @@
-VERSION = "0.0.0.qualifier"