Merge pull request #480 from willcl-ark/remove-cli-subtree

Author: willcl-ark

pyproject.toml

@@ -21,7 +21,7 @@ dependencies = [
 ]
 
 [project.scripts]
-warcli = "warnet.cli.main:cli"
+warcli = "warnet.main:cli"
 
 [project.urls]
 Homepage = "https://warnet.dev"
@@ -42,4 +42,8 @@ build-backend = "setuptools.build_meta"
 include-package-data = true
 
 [tool.setuptools.packages.find]
-where = ["src", "resources"]
+where = ["src", "."]
+include = ["warnet*", "test_framework*", "resources*"]
+
+[tool.setuptools.package-data]
+"resources" = ["**/*"]

src/warnet/cli/__init__.py renamed to resources/scenarios/__init__.py

@@ -3,7 +3,10 @@
 from time import sleep
 
 # The base class exists inside the commander container
-from commander import Commander
+try:
+    from commander import Commander
+except ImportError:
+    from resources.scenarios.commander import Commander
 
 
 def cli_help():

src/warnet/scenarios/commander.py renamed to resources/scenarios/commander.py

@@ -3,7 +3,10 @@
 from time import sleep
 
 # The base class exists inside the commander container
-from commander import Commander
+try:
+    from commander import Commander
+except ImportError:
+    from resources.scenarios.commander import Commander
 
 
 def cli_help():

src/warnet/scenarios/ln_init.py renamed to resources/scenarios/ln_init.py

@@ -1,7 +1,10 @@
 #!/usr/bin/env python3
 
 # The base class exists inside the commander container
-from commander import Commander
+try:
+    from commander import Commander
+except ImportError:
+    from resources.scenarios.commander import Commander
 
 
 def cli_help():

src/warnet/scenarios/miner_std.py renamed to resources/scenarios/miner_std.py

@@ -4,7 +4,10 @@
 from time import sleep
 
 # The base class exists inside the commander container
-from commander import Commander
+try:
+    from commander import Commander
+except ImportError:
+    from resources.scenarios.commander import Commander
 
 
 def cli_help():