Merge pull request #422 from chrisburr/client-regen-test

Fix test for if the client needs to be regenerated

Author: chrisburr

diracx-client/tests/test_regenerate.py

@@ -44,7 +44,8 @@ def test_regenerate_client(test_client, tmp_path):
     assert (repo_root / "diracx-client" / "src").is_dir()
     assert (repo_root / ".git").is_dir()
     repo = git.Repo(repo_root)
-    if repo.is_dirty(path=repo_root / "diracx-client" / "src" / "diracx" / "client"):
+    client_src = repo_root / "diracx-client" / "src" / "diracx" / "client"
+    if repo.is_dirty(path=client_src):
         raise AssertionError(
             "Client is currently in a modified state, skipping regeneration"
         )
@@ -70,7 +71,7 @@ def test_regenerate_client(test_client, tmp_path):
     subprocess.run(cmd, check=False, cwd=repo_root)
     print("Re-running pre-commit...")
     subprocess.run(cmd, check=True, cwd=repo_root)
-    if repo.is_dirty(path=repo_root / "src" / "diracx" / "client"):
+    if repo.is_dirty(path=client_src):
         raise AssertionError("Client was regenerated with changes")
 
 

extensions/gubbins/gubbins-client/src/gubbins/client/generated/__init__.py

@@ -1,14 +1,20 @@
 # coding=utf-8
 # --------------------------------------------------------------------------
-# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.0, generator: @autorest/python@6.26.0)
+# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.4, generator: @autorest/python@6.31.0)
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
+# pylint: disable=wrong-import-position
 
-from ._client import Dirac
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._client import Dirac  # type: ignore
 
 try:
     from ._patch import __all__ as _patch_all
-    from ._patch import *  # pylint: disable=unused-wildcard-import
+    from ._patch import *
 except ImportError:
     _patch_all = []
 from ._patch import patch_sdk as _patch_sdk

extensions/gubbins/gubbins-client/src/gubbins/client/generated/_client.py

@@ -1,6 +1,6 @@
 # coding=utf-8
 # --------------------------------------------------------------------------
-# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.0, generator: @autorest/python@6.26.0)
+# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.4, generator: @autorest/python@6.31.0)
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 

extensions/gubbins/gubbins-client/src/gubbins/client/generated/_configuration.py

@@ -1,6 +1,6 @@
 # coding=utf-8
 # --------------------------------------------------------------------------
-# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.0, generator: @autorest/python@6.26.0)
+# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.4, generator: @autorest/python@6.31.0)
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------