From 8eb3c0c05043f88733ef86865a70979e880bd787 Mon Sep 17 00:00:00 2001 From: Jacob Goldverg Date: Tue, 24 Sep 2024 07:42:56 -0400 Subject: [PATCH] fixed import errors --- odscli/sdk/measure.py | 6 +++--- odscli/sdk/metrics/measure_host_network.py | 2 +- setup.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/odscli/sdk/measure.py b/odscli/sdk/measure.py index 9cd656d..6067795 100644 --- a/odscli/sdk/measure.py +++ b/odscli/sdk/measure.py @@ -1,9 +1,9 @@ import click import logging import os -from odscli.sdk.measure.measure_carbon import traceroute, compute_carbon_per_ip, geo_locate_ips -from odscli.sdk.measure.measure_host_network import begin_measuring -logging.getLogger("scapy.runtime").setLevel(logging.ERROR) +from odscli.sdk.metrics.measure_carbon import traceroute, compute_carbon_per_ip, geo_locate_ips +from odscli.sdk.metrics.measure_host_network import begin_measuring + @click.group('measure_cli') diff --git a/odscli/sdk/metrics/measure_host_network.py b/odscli/sdk/metrics/measure_host_network.py index 52489aa..9f7dbb5 100644 --- a/odscli/sdk/metrics/measure_host_network.py +++ b/odscli/sdk/metrics/measure_host_network.py @@ -2,7 +2,7 @@ from datetime import datetime, timedelta -from odscli.sdk.measure.metrics_pojo import ODS_Metrics +from odscli.sdk.metrics.metrics_pojo import ODS_Metrics def begin_measuring(file_path, interface, measure_tcp=True, measure_udp=True, diff --git a/setup.py b/setup.py index c562933..d191c9f 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ setuptools.setup( name="odscli", - version="1.0.1", + version=version, author="OneDataShare", author_email="onedatashare@gmail.com", description="The onedatashare.org cli", @@ -25,7 +25,7 @@ packages=setuptools.find_packages(exclude=['tests']), entry_points={ 'console_scripts': [ - 'ods = odscli.odscli:main' + 'ods = odscli.ods_cli:main' ] }, install_requires=requirements,