changed import names

regina/__init__.py

@@ -1,5 +1,7 @@
 """Gather analytics from nginx access logs and visualize them through generated images and a generated html"""
 # __package__ = 'regina'
 
-from db_operation import database, visualize, collect
+# from db_operation import database, visualize, collect
+import regina.db_operation
+import regina.utility
 print("running __init__.py")

regina/db_operation/__init__.py

@@ -1,2 +1,3 @@
 """Gather analytics from nginx access logs and visualize them through generated images and a generated html"""
 # __package__ = 'regina'
+import regina.utility

regina/db_operation/database.py

@@ -6,7 +6,6 @@ from os import path, listdir
 from utility.sql_util import sanitize, sql_select, sql_exists, sql_insert, sql_tablesize
 from utility.utility import pdebug
 
-
 """
 create reginas database as shown in the uml diagram database.uxf
 """

regina/main.py

@@ -3,10 +3,10 @@
 # __package__="."
 from sys import argv, exit
 from os.path import isfile
-from db_operation.visualize import visualize
-from utility.settings_manager import read_settings_file
 from db_operation.collect import parse_log, add_requests_to_db
 from db_operation.database import create_db
+from db_operation.visualize import visualize
+from utility.settings_manager import read_settings_file
 from utility.globals import settings, version
 
 """

setup.py

@@ -1,4 +1,4 @@
-from setuptools import setup
+from setuptools import setup, find_packages
 
 setup(
         name="regina",
@@ -12,7 +12,7 @@ setup(
 
         license="GPLv3",
 
-        packages=["regina"],
+        packages=find_packages(),
         install_requires=[],
         python_requires='>=3.10',
 
@@ -26,6 +26,6 @@ setup(
 
         # scripts=["bin/nicole"],
         entry_points={
-            "console_scripts": [ "regina=regina.regina:main" ],
+            "console_scripts": [ "regina=regina.main:main" ],
             },
 )