diff --git a/lm_test/__init__.py b/lmtest/__init__.py similarity index 100% rename from lm_test/__init__.py rename to lmtest/__init__.py diff --git a/lm_test/base/__init__.py b/lmtest/base/__init__.py similarity index 100% rename from lm_test/base/__init__.py rename to lmtest/base/__init__.py diff --git a/lm_test/base/controller.py b/lmtest/base/controller.py similarity index 97% rename from lm_test/base/controller.py rename to lmtest/base/controller.py index 9dfd3b5..d9363da 100644 --- a/lm_test/base/controller.py +++ b/lmtest/base/controller.py @@ -5,8 +5,8 @@ from tempfile import gettempdir from time import sleep -from lm_test.base.daemon import Daemon, DaemonCommands -from lm_test.base.test_base import LmTest, LmTestFailure, LmTestWarning +from lmtest.base.daemon import Daemon, DaemonCommands +from lmtest.base.test_base import LmTest, LmTestFailure, LmTestWarning CONTROLLER_PID_FILE = os.path.join(gettempdir(), 'controller.pid') DEFAULT_SLEEP_TIME = 10 diff --git a/lm_test/base/daemon.py b/lmtest/base/daemon.py similarity index 100% rename from lm_test/base/daemon.py rename to lmtest/base/daemon.py diff --git a/lm_test/base/test_base.py b/lmtest/base/test_base.py similarity index 100% rename from lm_test/base/test_base.py rename to lmtest/base/test_base.py diff --git a/lm_test/base/test_finder.py b/lmtest/base/test_finder.py similarity index 100% rename from lm_test/base/test_finder.py rename to lmtest/base/test_finder.py diff --git a/lm_test/tests/__init__.py b/lmtest/tests/__init__.py similarity index 100% rename from lm_test/tests/__init__.py rename to lmtest/tests/__init__.py diff --git a/lm_test/tests/cpu_usage_test.py b/lmtest/tests/cpu_usage_test.py similarity index 98% rename from lm_test/tests/cpu_usage_test.py rename to lmtest/tests/cpu_usage_test.py index 24abbda..0602c5d 100644 --- a/lm_test/tests/cpu_usage_test.py +++ b/lmtest/tests/cpu_usage_test.py @@ -1,5 +1,5 @@ """Test memory usage.""" -import lm_test.base.test_base as test_base +import lmtest.base.test_base as test_base import psutil diff --git a/lm_test/tests/disk_usage_test.py b/lmtest/tests/disk_usage_test.py similarity index 98% rename from lm_test/tests/disk_usage_test.py rename to lmtest/tests/disk_usage_test.py index 8ee00a8..538a9c9 100644 --- a/lm_test/tests/disk_usage_test.py +++ b/lmtest/tests/disk_usage_test.py @@ -1,7 +1,7 @@ """Test disk usage.""" import shutil -import lm_test.base.test_base as test_base +import lmtest.base.test_base as test_base # ............................................................................. diff --git a/lm_test/tests/lm_client_test.py b/lmtest/tests/lm_client_test.py similarity index 95% rename from lm_test/tests/lm_client_test.py rename to lmtest/tests/lm_client_test.py index ae520c0..2d7cd64 100644 --- a/lm_test/tests/lm_client_test.py +++ b/lmtest/tests/lm_client_test.py @@ -1,7 +1,7 @@ """Test class for lm_client.""" -import lm_test.base.test_base as test_base -from lm_client.client.client import LmApiClient +import lmtest.base.test_base as test_base +from lmclient.client.client import LmApiClient # ............................................................................. diff --git a/lm_test/tests/memory_usage_test.py b/lmtest/tests/memory_usage_test.py similarity index 98% rename from lm_test/tests/memory_usage_test.py rename to lmtest/tests/memory_usage_test.py index 2abd7ff..c2af997 100644 --- a/lm_test/tests/memory_usage_test.py +++ b/lmtest/tests/memory_usage_test.py @@ -1,7 +1,7 @@ """Test memory usage.""" import os -import lm_test.base.test_base as test_base +import lmtest.base.test_base as test_base # ............................................................................. diff --git a/lm_test/tests/open_api_test.py b/lmtest/tests/open_api_test.py similarity index 98% rename from lm_test/tests/open_api_test.py rename to lmtest/tests/open_api_test.py index 04b455d..a894987 100644 --- a/lm_test/tests/open_api_test.py +++ b/lmtest/tests/open_api_test.py @@ -9,7 +9,7 @@ """ import json -import lm_test.base.test_base as test_base +import lmtest.base.test_base as test_base import open_api_tools.test.full_test as full_test diff --git a/lm_test/tests/ot_client_test.py b/lmtest/tests/ot_client_test.py similarity index 98% rename from lm_test/tests/ot_client_test.py rename to lmtest/tests/ot_client_test.py index cef0c58..040caee 100644 --- a/lm_test/tests/ot_client_test.py +++ b/lmtest/tests/ot_client_test.py @@ -1,7 +1,7 @@ """Test class for lm_client.""" from random import randint, shuffle -import lm_test.base.test_base as test_base +import lmtest.base.test_base as test_base from ot_service_wrapper.open_tree import ( get_ottids_from_gbifids, induced_subtree, diff --git a/requirements.txt b/requirements.txt index e69de29..a4d92cc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -0,0 +1 @@ +psutil diff --git a/setup.py b/setup.py index 9af1787..7e862a4 100644 --- a/setup.py +++ b/setup.py @@ -10,21 +10,23 @@ module_license = f.read() setup( - name='lm_test', - version='1.0.0b2', + name='lmtest', + version='1.0.0b3', description='Lifemapper Testing Library', long_description=readme, author='CJ Grady', author_email='cjgrady@ku.edu', url='https://github.com/lifemapper/lm_test', license=module_license, - #package_dir={'': 'lm_test'}, packages=find_packages(), + package_dir={ + 'example_tests': ['*.json'], + }, python_requires='>=3.6, <4', - #entry_points={ - # 'console_scripts': [ - # 'run_controller=scripts/run_controller:main', - # ], - #}, - scripts=['scripts/run_controller.py'], + entry_points={ + 'console_scripts': [ + 'run_controller=scripts.run_controller:main', + ], + }, + #scripts=['scripts/run_controller.py'], ) diff --git a/tests/test_base/test_controller.py b/tests/test_base/test_controller.py index 0cdd076..b8384f9 100644 --- a/tests/test_base/test_controller.py +++ b/tests/test_base/test_controller.py @@ -1,5 +1,5 @@ """Test the controller module.""" -from lm_test.base.controller import CONTROLLER_PID_FILE, Controller +from lmtest.base.controller import CONTROLLER_PID_FILE, Controller # .....................................................................................