Reorganise python code

I don't know whether this is the correct way to structure a python project, but it was getting a bit messy in that dir so I have moved things around. Also the Welder package can probably be refactored one day.
liquidmetal-dev · Nov 15, 2021 · 7fa2c10 · 7fa2c10
1 parent 0413a15
commit 7fa2c10
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 6 deletions.
diff --git a/test/tools/config/__init__.py b/test/tools/config/__init__.py
diff --git a/test/tools/config.py → test/tools/config/config.py b/test/tools/config.py → test/tools/config/config.py
@@ -8,7 +8,7 @@
 class Config:
     def __init__(self):
         self.dir = dirname(abspath(__file__))
-        self.base = dirname(dirname(dirname(abspath(__file__))))
+        self.base = dirname(dirname(dirname(dirname(abspath(__file__)))))
         self.schema = self.dir + '/schema.yaml'
         self.params = {}
         self.set_default_config()
@@ -108,7 +108,7 @@ def default_device_config(self):
         }
 
     def default_user_data(self):
-        files = ["hack/scripts/bootstrap.sh", "test/tools/userdata.sh"]
+        files = ["hack/scripts/bootstrap.sh", "test/tools/config/userdata.sh"]
         userdata = ""
         for file in files:
             with open(self.base + "/" + file) as f:

diff --git a/test/tools/schema.yaml → test/tools/config/schema.yaml b/test/tools/schema.yaml → test/tools/config/schema.yaml
diff --git a/test/tools/userdata.sh → test/tools/config/userdata.sh b/test/tools/userdata.sh → test/tools/config/userdata.sh
diff --git a/test/tools/metal/__init__.py b/test/tools/metal/__init__.py
diff --git a/test/tools/metal.py → test/tools/metal/welder.py b/test/tools/metal.py → test/tools/metal/welder.py
diff --git a/test/tools/run.py b/test/tools/run.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python3
 
-from test import Test
-from metal import Welder
-from config import Config
+from test.runner import Test
+from metal.welder import Welder
+from config.config import Config
 import click
 import os
 import sys

diff --git a/test/tools/test/__init__.py b/test/tools/test/__init__.py
diff --git a/test/tools/test.py → test/tools/test/runner.py b/test/tools/test.py → test/tools/test/runner.py
@@ -1,4 +1,4 @@
-from metal import Welder
+from metal.welder import Welder
 
 
 class Test: