move json files out of subfolders

Author: pinheadmz

MANIFEST.in

@@ -1,4 +1,3 @@
-include src/warnet/schema/*.json
 graft images
 graft manifests
 graft scripts

src/warnet/__init__.py

@@ -0,0 +1,3 @@
+from pathlib import Path
+
+SRC_DIR = Path(__file__).parent

src/warnet/schema/graph_schema.json renamed to src/warnet/graph_schema.json

@@ -1,7 +1,6 @@
 import argparse
 import base64
 import importlib
-import importlib.resources as pkg_resources
 import io
 import json
 import logging
@@ -27,6 +26,7 @@
 from .services import ServiceType
 from .utils import gen_config_dir
 from .warnet import Warnet
+from warnet import SRC_DIR
 
 WARNET_SERVER_PORT = 9276
 CONFIG_DIR_ALREADY_EXISTS = 32001
@@ -96,7 +96,7 @@ def healthy(self):
 
     def setup_logging(self):
         os.makedirs(os.path.dirname(self.log_file_path), exist_ok=True)
-        with pkg_resources.open_text("warnet.logging_config", "config.json") as f:
+        with open(SRC_DIR / "logging_config.json") as f:
             logging_config = json.load(f)
         logging_config["handlers"]["file"]["filename"] = str(self.log_file_path)
         logging.config.dictConfig(logging_config)

src/warnet/logging_config/config.json renamed to src/warnet/logging_config.json

@@ -16,8 +16,7 @@
 from jsonschema import validate
 from test_framework.messages import ser_uint256
 from test_framework.p2p import MESSAGEMAP
-
-from .schema import SCHEMA
+from warnet import SRC_DIR
 
 logger = logging.getLogger("utils")
 
@@ -27,7 +26,6 @@
 WEIGHTED_TAGS = [
     tag for index, tag in enumerate(reversed(SUPPORTED_TAGS)) for _ in range(index + 1)
 ]
-GRAPH_SCHEMA_PATH = SCHEMA / "graph_schema.json"
 
 
 class NonErrorFilter(logging.Filter):
@@ -465,7 +463,7 @@ def convert_unsupported_attributes(graph: nx.Graph):
 
 
 def load_schema():
-    with open(GRAPH_SCHEMA_PATH) as schema_file:
+    with open(SRC_DIR / "graph_schema.json") as schema_file:
         return json.load(schema_file)
 
 

src/warnet/schema/__init__.py

@@ -1,5 +1,4 @@
 import atexit
-import importlib.resources as pkg_resources
 import json
 import logging
 import logging.config
@@ -11,6 +10,7 @@
 from tempfile import mkdtemp
 from time import sleep
 
+from warnet import SRC_DIR
 from warnet.cli.rpc import rpc_call
 from warnet.utils import exponential_backoff
 from warnet.warnet import Warnet
@@ -39,7 +39,7 @@ def setup_environment(self):
         self.network = True
 
     def setup_logging(self):
-        with pkg_resources.open_text("warnet.logging_config", "config.json") as f:
+        with open(SRC_DIR / "logging_config.json") as f:
             logging_config = json.load(f)
         logging_config["handlers"]["file"]["filename"] = str(self.logfilepath)
         logging.config.dictConfig(logging_config)