Clean package structure ahead of tests

.gitignore

@@ -0,0 +1,3 @@
+.venv
+*.pyc
+__pycache__/

Containerfile

@@ -1,4 +1,4 @@
 FROM debian
 
-COPY machine_admin /machine_admin
+COPY src/machine_admin /machine_admin
-COPY machine_setup.py /
+COPY src/machine_setup.py /

src/machine_admin/firewall.py

@@ -1,5 +1,6 @@
 import logging
-from util import run_op
+
+from .util import run_op
 
 class UfwInterface:
 

src/machine_admin/machine.py

@@ -1,7 +1,7 @@
-from firewall import Firewall
+from .firewall import Firewall
-from user import User, UserManager
+from .user import User, UserManager
-from ssh_config import SshConfig
+from .ssh_config import SshConfig
-from package_manager import PackageManager
+from .package_manager import PackageManager
 
 class Machine:
 

src/machine_admin/package_manager.py

@@ -1,5 +1,6 @@
 import logging
-from util import run_op
+
+from .util import run_op
 
 class AptInterface:
 

src/machine_admin/ssh_config.py

@@ -1,6 +1,7 @@
 from pathlib import Path
 import logging
-from util import run_op
+
+from .util import run_op
 
 class SshConfig:
 

src/machine_admin/user.py

@@ -1,5 +1,5 @@
 import logging 
-from util import run_op
+from .util import run_op
 
 class User:
     def __init__(self, name, has_sudo=False):