Merge pull request #531 from EducationalTestingService/feature/make_t…

…ests_package Make tests a package; don't package it up when installing
EducationalTestingService · Sep 27, 2019 · f02862c · f02862c
2 parents 051d9c2 + 96f1c7c
commit f02862c
Show file tree

Hide file tree

Showing 13 changed files with 22 additions and 21 deletions.
diff --git a/setup.py b/setup.py
@@ -29,7 +29,7 @@ def requirements():
       author='Nitin Madnani',
       author_email='nmadnani@ets.org',
       license='BSD 3 clause',
-      packages=find_packages(),
+      packages=find_packages(exclude=['tests']),
       include_package_data=True,
       entry_points={'console_scripts':
                     ['filter_features = skll.utilities.filter_features:main',

diff --git a/tests/__init__.py b/tests/__init__.py
diff --git a/tests/test_ablation.py b/tests/test_ablation.py
@@ -19,8 +19,8 @@
 from skll.experiments import run_configuration
 from skll.learner import _DEFAULT_PARAM_GRIDS
 
-from utils import (create_jsonlines_feature_files,
-                   fill_in_config_paths)
+from tests.utils import (create_jsonlines_feature_files,
+                         fill_in_config_paths)
 
 
 _ALL_MODELS = list(_DEFAULT_PARAM_GRIDS.keys())

diff --git a/tests/test_classification.py b/tests/test_classification.py
@@ -32,8 +32,8 @@
 from skll.learner import Learner, _train_and_score
 from skll.learner import _DEFAULT_PARAM_GRIDS
 
-from utils import (make_classification_data, make_regression_data,
-                   make_sparse_data, fill_in_config_paths_for_single_file)
+from tests.utils import (make_classification_data, make_regression_data,
+                         make_sparse_data, fill_in_config_paths_for_single_file)
 
 
 _ALL_MODELS = list(_DEFAULT_PARAM_GRIDS.keys())

diff --git a/tests/test_custom_learner.py b/tests/test_custom_learner.py
@@ -21,7 +21,7 @@
 from skll.experiments import run_configuration
 from skll.learner import _DEFAULT_PARAM_GRIDS, Learner
 
-from utils import fill_in_config_paths, make_classification_data
+from tests.utils import fill_in_config_paths, make_classification_data
 
 _ALL_MODELS = list(_DEFAULT_PARAM_GRIDS.keys())
 _my_dir = abspath(dirname(__file__))

diff --git a/tests/test_cv.py b/tests/test_cv.py
@@ -33,8 +33,8 @@
 from skll.learner import _DEFAULT_PARAM_GRIDS
 from skll.experiments import _load_featureset
 from sklearn.model_selection import StratifiedKFold
-from utils import (create_jsonlines_feature_files,
-                   fill_in_config_paths_for_single_file)
+from tests.utils import (create_jsonlines_feature_files,
+                         fill_in_config_paths_for_single_file)
 from skll.experiments import run_configuration
 
 _ALL_MODELS = list(_DEFAULT_PARAM_GRIDS.keys())

diff --git a/tests/test_featureset.py b/tests/test_featureset.py
@@ -28,7 +28,7 @@
 from skll.learner import _DEFAULT_PARAM_GRIDS
 from skll.utilities import skll_convert
 
-from utils import make_classification_data, make_regression_data
+from tests.utils import make_classification_data, make_regression_data
 
 
 _ALL_MODELS = list(_DEFAULT_PARAM_GRIDS.keys())

diff --git a/tests/test_input.py b/tests/test_input.py
@@ -25,8 +25,8 @@
 from skll.data.readers import safe_float
 from skll.experiments import _load_featureset
 
-from utils import (create_jsonlines_feature_files,
-                   fill_in_config_options)
+from tests.utils import (create_jsonlines_feature_files,
+                         fill_in_config_options)
 
 _my_dir = abspath(dirname(__file__))
 

diff --git a/tests/test_metrics.py b/tests/test_metrics.py
@@ -19,7 +19,7 @@
 from skll.learner import _DEFAULT_PARAM_GRIDS
 from skll.metrics import kappa
 
-from utils import make_regression_data
+from tests.utils import make_regression_data
 
 _ALL_MODELS = list(_DEFAULT_PARAM_GRIDS.keys())
 _my_dir = abspath(dirname(__file__))

diff --git a/tests/test_output.py b/tests/test_output.py
@@ -37,12 +37,12 @@
                               run_configuration)
 from skll.learner import Learner, _DEFAULT_PARAM_GRIDS
 
-from utils import (create_jsonlines_feature_files,
-                   fill_in_config_options,
-                   fill_in_config_paths,
-                   fill_in_config_paths_for_single_file,
-                   make_classification_data,
-                   make_regression_data)
+from tests.utils import (create_jsonlines_feature_files,
+                         fill_in_config_options,
+                         fill_in_config_paths,
+                         fill_in_config_paths_for_single_file,
+                         make_classification_data,
+                         make_regression_data)
 
 
 _ALL_MODELS = list(_DEFAULT_PARAM_GRIDS.keys())

diff --git a/tests/test_preprocessing.py b/tests/test_preprocessing.py
@@ -24,7 +24,7 @@
 from skll.learner import Learner, SelectByMinCount
 from skll.learner import _DEFAULT_PARAM_GRIDS
 
-from utils import fill_in_config_paths
+from tests.utils import fill_in_config_paths
 
 
 _ALL_MODELS = list(_DEFAULT_PARAM_GRIDS.keys())

diff --git a/tests/test_regression.py b/tests/test_regression.py
@@ -33,7 +33,8 @@
 from skll.learner import Learner, rescaled
 from skll.learner import _DEFAULT_PARAM_GRIDS
 
-from utils import make_regression_data, fill_in_config_paths_for_fancy_output
+from tests.utils import (make_regression_data,
+                         fill_in_config_paths_for_fancy_output)
 
 _ALL_MODELS = list(_DEFAULT_PARAM_GRIDS.keys())
 _my_dir = abspath(dirname(__file__))

diff --git a/tests/test_utilities.py b/tests/test_utilities.py
@@ -58,7 +58,7 @@
                               run_configuration)
 from skll.learner import Learner, _DEFAULT_PARAM_GRIDS
 
-from utils import make_classification_data, make_regression_data
+from tests.utils import make_classification_data, make_regression_data
 
 
 _ALL_MODELS = list(_DEFAULT_PARAM_GRIDS.keys())