Remove underscore from lm_test. add console script

lifemapper · May 19, 2021 · 7c37a79 · 7c37a79
1 parent 154a064
commit 7c37a79
Show file tree

Hide file tree

Showing 16 changed files with 22 additions and 19 deletions.
diff --git a/lm_test/__init__.py → lmtest/__init__.py b/lm_test/__init__.py → lmtest/__init__.py
diff --git a/lm_test/base/__init__.py → lmtest/base/__init__.py b/lm_test/base/__init__.py → lmtest/base/__init__.py
diff --git a/lm_test/base/controller.py → lmtest/base/controller.py b/lm_test/base/controller.py → 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 → lmtest/base/daemon.py b/lm_test/base/daemon.py → lmtest/base/daemon.py
diff --git a/lm_test/base/test_base.py → lmtest/base/test_base.py b/lm_test/base/test_base.py → lmtest/base/test_base.py
diff --git a/lm_test/base/test_finder.py → lmtest/base/test_finder.py b/lm_test/base/test_finder.py → lmtest/base/test_finder.py
diff --git a/lm_test/tests/__init__.py → lmtest/tests/__init__.py b/lm_test/tests/__init__.py → lmtest/tests/__init__.py
diff --git a/lm_test/tests/cpu_usage_test.py → lmtest/tests/cpu_usage_test.py b/lm_test/tests/cpu_usage_test.py → 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 → lmtest/tests/disk_usage_test.py b/lm_test/tests/disk_usage_test.py → 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 → lmtest/tests/lm_client_test.py b/lm_test/tests/lm_client_test.py → 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 → lmtest/tests/memory_usage_test.py b/lm_test/tests/memory_usage_test.py → 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 → lmtest/tests/open_api_test.py b/lm_test/tests/open_api_test.py → 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 → lmtest/tests/ot_client_test.py b/lm_test/tests/ot_client_test.py → 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
@@ -0,0 +1 @@
+psutil
diff --git 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
@@ -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
 
 
 # .....................................................................................