Merge branch 'master' of github.com:bsdci/libioc into feature/add_config

Author: himrock922

MANIFEST.in

@@ -3,4 +3,4 @@ include LICENSE.txt
 include *.md
 include Makefile
 include *.py
-recursive-include iocage *.py
+recursive-include libioc *.py

libioc/Jail.py

@@ -1743,7 +1743,7 @@ def _exec_host_command(
                         )
                 except StopIteration as return_statement:
                     output: libioc.helpers.CommandOutput
-                    output = return_statement.value
+                    output = return_statement.value  # noqa: T484
                     return output
         except (KeyboardInterrupt, SystemExit):
             raise libioc.errors.JailExecutionAborted(

libioc/JailState.py

@@ -35,7 +35,7 @@
 
 
 def _get_userland_version() -> float:
-        return float(libioc.helpers.get_os_version()["userland"])
+    return float(libioc.helpers.get_os_version()["userland"])
 
 
 def _parse(text: str) -> JailStatesDict:

libioc/ListableResource.py

@@ -99,8 +99,8 @@ def __iter__(
             for child_dataset in children:
                 name = self._get_asset_name_from_dataset(child_dataset)
                 if has_filters and (filters.match_key("name", name) is False):
-                        # Skip all jails that do not even match the name
-                        continue
+                    # Skip all jails that do not even match the name
+                    continue
 
                 # ToDo: Do not load jail if filters do not require to
                 resource = self._get_resource_from_dataset(child_dataset)

setup.py

@@ -31,6 +31,12 @@
 except ModuleNotFoundError:
     from pip.req import parse_requirements
 
+try:
+    import setuptools_scm.integration
+    setuptools_scm.integration.find_files = lambda _: []
+except ImportError:
+    pass
+
 
 def _read_requirements(
     filename: str="requirements.txt"

tests/test_Jail.py

@@ -96,12 +96,12 @@ def cleanup() -> None:
             data = read_jail_config_json(f"{dataset.mountpoint}/config.json")
 
             try:
-                assert data["basejail"] is "no"
+                assert data["basejail"] == "no"
             except KeyError:
                 pass
 
             try:
-                assert (data["basejail"] is "") or (data["basejail"] == "none")
+                assert (data["basejail"] == "") or (data["basejail"] == "none")
             except KeyError:
                 pass