machineconfig 6.31__tar.gz → 6.33__tar.gz

{machineconfig-6.31/src/machineconfig.egg-info → machineconfig-6.33}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 6.31
+Version: 6.33
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0
@@ -23,7 +23,6 @@ Requires-Dist: psutil>=7.0.0
 Requires-Dist: gitpython>=3.1.44
 Requires-Dist: pyfzf>=0.3.1
 Requires-Dist: rclone-python>=0.1.23
-Requires-Dist: pyjson5>=1.6.9
 Requires-Dist: questionary>=2.1.1
 Requires-Dist: typer-slim>=0.19.2
 Requires-Dist: typer>=0.19.2

{machineconfig-6.31 → machineconfig-6.33}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "machineconfig"
-version = "6.31"
+version = "6.33"
 description = "Dotfiles management package"
 readme = "README.md"
 license = {text = "Apache 2.0"}
@@ -32,7 +32,6 @@ dependencies = [
     "gitpython>=3.1.44",
     "pyfzf>=0.3.1",
     "rclone-python>=0.1.23",
-    "pyjson5>=1.6.9",
     "questionary>=2.1.1",
     "typer-slim>=0.19.2",
     "typer>=0.19.2",

{machineconfig-6.31 → machineconfig-6.33}/src/machineconfig/cluster/sessions_managers/utils/maker.py

@@ -7,7 +7,6 @@ from pathlib import Path
 def get_fire_command_and_artifact_files(func: FunctionType):
     from machineconfig.utils.meta import function_to_script
     py_script =  function_to_script(func)
-    from pathlib import Path
     from machineconfig.utils.accessories import randstr
     py_script_path = Path.home().joinpath("tmp_results", "tmp_py_scripts", f"tmp_{randstr(10)}.py")
     py_script_path.parent.mkdir(parents=True, exist_ok=True)
@@ -21,8 +20,9 @@ def get_fire_command_and_artifact_files(func: FunctionType):
     return tab_config, py_script_path
 def get_fire_command_and_artifact_files_v2(func: FunctionType):
     import inspect
-    path = inspect.getfile(func)
-    command_to_run = f"""$HOME/.local/bin/fire {path} {func.__name__} """
+    path = Path(inspect.getfile(func))
+    path_relative = path.relative_to(Path.home())
+    command_to_run = f"""$HOME/.local/bin/fire {path_relative} {func.__name__} """
     tab_config: TabConfig = {
         "command": command_to_run,
         "startDir": "$HOME",

{machineconfig-6.31 → machineconfig-6.33}/src/machineconfig/utils/files/read.py

@@ -37,17 +37,11 @@ class Read:
                 raise ImportError(err) from err2
     @staticmethod
     def json(path: 'Path', r: bool = False, **kwargs: Any) -> Any:  # return could be list or dict etc
-        import json
-        try:
-            mydict = json.loads(Path(path).read_text(encoding='utf-8'), **kwargs)
-        except Exception:
-            import pyjson5
-            mydict = pyjson5.loads(Path(path).read_text(encoding='utf-8'), **kwargs)  # file has C-style comments.
-        _ = r
-        return mydict
+        from machineconfig.utils.io import read_json
+        return read_json(path, r=r, **kwargs)
     @staticmethod
     def yaml(path: 'Path', r: bool = False) -> Any:  # return could be list or dict etc
-        import yaml  # type: ignore
+        import yaml
         with open(str(path), "r", encoding="utf-8") as file:
             mydict = yaml.load(file, Loader=yaml.FullLoader)
         _ = r

{machineconfig-6.31 → machineconfig-6.33}/src/machineconfig/utils/io.py

@@ -61,9 +61,14 @@ def read_json(path: "Path", r: bool = False, **kwargs: Any) -> Any:  # return co
     try:
         mydict = json.loads(Path(path).read_text(encoding="utf-8"), **kwargs)
     except Exception:
-        import pyjson5
-
-        mydict = pyjson5.loads(Path(path).read_text(encoding="utf-8"), **kwargs)  # file has C-style comments.
+        import re
+        def remove_comments(text: str) -> str:
+            # remove all // single-line comments
+            text = re.sub(r'//.*', '', text)
+            # remove all /* … */ block comments (non-greedy)
+            text = re.sub(r'/\*.*?\*/', '', text, flags=re.DOTALL)
+            return text
+        mydict = json.loads(remove_comments(Path(path).read_text(encoding="utf-8")), **kwargs)
     _ = r
     return mydict
 

{machineconfig-6.31 → machineconfig-6.33/src/machineconfig.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 6.31
+Version: 6.33
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0
@@ -23,7 +23,6 @@ Requires-Dist: psutil>=7.0.0
 Requires-Dist: gitpython>=3.1.44
 Requires-Dist: pyfzf>=0.3.1
 Requires-Dist: rclone-python>=0.1.23
-Requires-Dist: pyjson5>=1.6.9
 Requires-Dist: questionary>=2.1.1
 Requires-Dist: typer-slim>=0.19.2
 Requires-Dist: typer>=0.19.2

{machineconfig-6.31 → machineconfig-6.33}/src/machineconfig.egg-info/requires.txt

@@ -10,7 +10,6 @@ psutil>=7.0.0
 gitpython>=3.1.44
 pyfzf>=0.3.1
 rclone-python>=0.1.23
-pyjson5>=1.6.9
 questionary>=2.1.1
 typer-slim>=0.19.2
 typer>=0.19.2