diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..95365f0 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,3 @@ +sympy +transitions +numpy \ No newline at end of file diff --git a/setup.py b/setup.py index e01325a..ddd0811 100644 --- a/setup.py +++ b/setup.py @@ -29,7 +29,6 @@ setup( name=f"{agent_package}agent", version=__version__, - install_requires=["volttron", "sympy", "transitions", "numpy"], packages=packages, package_dir={'': 'src'}, entry_points={"setuptools.installation": [f"eggsecutable = {agent_module}:main"]}, @@ -40,7 +39,7 @@ "Topic :: Home Automation", "Topic :: Software Development :: Embedded Systems", "License :: OSI Approved :: Apache Software License", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", ], ) diff --git a/src/ilc/control_handler.py b/src/ilc/control_handler.py index 3e13fdd..89d7552 100644 --- a/src/ilc/control_handler.py +++ b/src/ilc/control_handler.py @@ -29,7 +29,6 @@ from importlib.metadata import distribution, PackageNotFoundError try: distribution('volttron-core') - from volttron.client.logs import setup_logging from volttron.client.messaging import headers as headers_mod from volttron.client.vip.agent import Agent from volttron.utils import format_timestamp, get_aware_utc_now @@ -37,12 +36,11 @@ except PackageNotFoundError: from volttron.platform.vip.agent import Agent from volttron.platform.messaging import headers as headers_mod - from volttron.platform.agent.utils import format_timestamp, get_aware_utc_now, setup_logging + from volttron.platform.agent.utils import format_timestamp, get_aware_utc_now from volttron.platform.jsonrpc import RemoteError from ilc.utils import parse_sympy, sympy_evaluate, create_device_topic_map, fix_up_point_name -setup_logging() _log = logging.getLogger(__name__) diff --git a/src/ilc/criteria_handler.py b/src/ilc/criteria_handler.py index d28b9ee..749d75f 100644 --- a/src/ilc/criteria_handler.py +++ b/src/ilc/criteria_handler.py @@ -32,17 +32,15 @@ from importlib.metadata import distribution, PackageNotFoundError try: distribution('volttron-core') - from volttron.client.logs import setup_logging from volttron.client.messaging import headers as headers_mod from volttron.utils import get_aware_utc_now, format_timestamp except PackageNotFoundError: from volttron.platform.messaging import headers as headers_mod - from volttron.platform.agent.utils import format_timestamp, get_aware_utc_now, setup_logging + from volttron.platform.agent.utils import format_timestamp, get_aware_utc_now from ilc.ilc_matrices import (build_score, input_matrix) from ilc.utils import sympy_evaluate, create_device_topic_map, fix_up_point_name -setup_logging() _log = logging.getLogger(__name__) criterion_registry = {} diff --git a/src/ilc/ilc_matrices.py b/src/ilc/ilc_matrices.py index a1338ce..4b7285f 100644 --- a/src/ilc/ilc_matrices.py +++ b/src/ilc/ilc_matrices.py @@ -29,18 +29,7 @@ from collections import defaultdict from functools import reduce -from importlib.metadata import distribution, PackageNotFoundError -try: - distribution('volttron-core') - from volttron.client.logs import setup_logging -except PackageNotFoundError: - from volttron.platform.agent.utils import setup_logging - -setup_logging() _log = logging.getLogger(__name__) -logging.basicConfig(level=logging.DEBUG, - format='%(asctime)s %(levelname)-8s %(message)s', - datefmt='%m-%d-%y %H:%M:%S') def extract_criteria(filename):