saving some stuff here

_version.py

@@ -1 +1 @@
-__version__ = "0.0.1"
+__version__ = "0.0.3"

odscli/odscli.py

@@ -0,0 +1,12 @@
+import click
+from odscli.sdk.schedule_job import schedule_cli
+from odscli.sdk.credential import credential_cli
+from odscli.sdk.endpoint_management import endpoint_cli
+from odscli.sdk.query_transfer_data import query_cli
+from odscli.sdk.login import auth_cli
+from odscli.sdk.carbon_measure import measure_cli
+
+odscli = click.CommandCollection(sources=[schedule_cli, credential_cli, endpoint_cli, query_cli, auth_cli, measure_cli])
+
+if __name__ == '__main__':
+    odscli()

sdk/carbon_measure.py → odscli/sdk/carbon_measure.py

@@ -11,7 +11,6 @@
 
 import requests
 import pandas as pd
-import math
 
 
 @click.group('measure_cli')

sdk/credential.py → odscli/sdk/credential.py

@@ -1,6 +1,6 @@
 import click
-import sdk.constants as constants
-import sdk.token_utils as token_utils
+import odscli.sdk.constants as constants
+import odscli.sdk.token_utils as token_utils
 import requests
 from rich.console import Console
 from rich.table import Table

sdk/endpoint_management.py → odscli/sdk/endpoint_management.py

@@ -1,8 +1,8 @@
 import click
 from rich.table import Table
 from rich.console import Console
-import sdk.token_utils as token_utils
-import sdk.constants as constants
+import odscli.sdk.token_utils as token_utils
+import odscli.sdk.constants as constants
 import requests
 
 console = Console()

sdk/login.py → odscli/sdk/login.py

@@ -1,5 +1,5 @@
 import click
-import sdk.token_utils as token_utils
+import odscli.sdk.token_utils as token_utils
 import os
 
 

sdk/meta_query.py → odscli/sdk/meta_query.py

@@ -1,8 +1,8 @@
 import os
 
 import requests
-import sdk.constants as constants
-import sdk.token_utils as tok
+import odscli.sdk.constants as constants
+import odscli.sdk.token_utils as tok
 
 BASEPATH = "/api/metadata"
 JOB = "/job"

sdk/meta_query_gui.py → odscli/sdk/meta_query_gui.py

@@ -1,14 +1,8 @@
-import os
-import csv
-
 import pandas as pd
-from sdk.meta_query import MetaQueryAPI
-from tabulate import tabulate
-from datetime import datetime
-import time
+from odscli.sdk.meta_query import MetaQueryAPI
 from pathlib import Path
 import csv
-from sdk.log import Log
+from odscli.sdk.log import Log
 
 COMPLETED = "COMPLETED"
 csv_headers = ['jobId', 'jobSize (MB)', 'totalSeconds', 'throughput (Mbps)', 'concurrency', 'parallelism', 'pipelining',

sdk/query_transfer_data.py → odscli/sdk/query_transfer_data.py

@@ -7,11 +7,10 @@
 from rich.progress import DownloadColumn
 from rich.console import Console
 from rich.table import Table
-from sdk.meta_query_gui import QueryGui, MetaQueryAPI
+from odscli.sdk.meta_query_gui import QueryGui, MetaQueryAPI
 import json
 from datetime import datetime
 from math import ceil
-from dateutil import parser
 
 BASEPATH = "/api/metadata"
 JOB = "/job"

sdk/schedule_job.py → odscli/sdk/schedule_job.py

@@ -1,7 +1,7 @@
 import click
-import sdk.token_utils as token_utils
+import odscli.sdk.token_utils as token_utils
 import requests
-import sdk.constants as constants
+import odscli.sdk.constants as constants
 import json
 from datetime import datetime
 

sdk/token_utils.py → odscli/sdk/token_utils.py

@@ -1,8 +1,7 @@
 import os
 import requests
 import configparser
-import sdk.constants as constants
-import json
+import odscli.sdk.constants as constants
 
 # Adds the hostname, username, password and user token for the ACTIVE onedatashare backend
 # odsConfig.ini

requirements.txt

@@ -9,5 +9,5 @@ plotext~=5.2.7
 click
 rich
 scapy
-basemap==1.3.3
+# basemap==1.3.3
 

setup.py

@@ -1,9 +1,9 @@
-import setuptools, os
+import setuptools
 
 with open("README.md", "r", encoding="utf-8") as fh:
     long_description = fh.read()
 with open('requirements.txt') as f:
-    requirements = f.readlines()
+    requirements = f.read().splitlines()
 with open("_version.py", encoding='utf-8') as f:
     version = f.read().strip().split(" = ")[1][1:-1]
 
@@ -25,9 +25,9 @@
     packages=setuptools.find_packages(exclude=['tests']),
     entry_points={
         'console_scripts': [
-            'ods = odscli:main'
+            'ods = odscli.odscli:main'
         ]
     },
-    install_requires=[requirements],
-    python_requires=">=3.10",
+    install_requires=requirements,
+    python_requires=">=3.9",
 )