Merge pull request #88 from dayyass/develop

release v0.1.6

.coveragerc

@@ -1,6 +1,6 @@
 [run]
 branch = True
-source = text_clf
+source = src/text_clf
 
 [report]
 exclude_lines =
@@ -12,7 +12,7 @@ exclude_lines =
     ...
 
 omit =
-    text_clf/__main__.py
+    src/text_clf/__main__.py
 
 show_missing = True
 ignore_errors = False

Makefile

@@ -15,6 +15,6 @@ pypi_build:
 pypi_twine:
 	python -m twine upload --repository testpypi dist/*
 pypi_clean:
-	rm -rf dist text_classification_baseline.egg-info
+	rm -rf dist src/text_classification_baseline.egg-info
 clean:
 	rm -rf models/*

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = text-classification-baseline
-version = 0.1.5
+version = 0.1.6
 author = Dani El-Ayyass
 author_email = dayyass@yandex.ru
 description = TF-IDF + LogReg baseline for text classification
@@ -15,6 +15,8 @@ classifiers =
     Operating System :: OS Independent
 
 [options]
+package_dir =
+    = src
 packages = find:
 python_requires = >=3.6
 install_requires =
@@ -26,6 +28,9 @@ install_requires =
     pymorphy2 >= 0.9.1
     PyYAML >= 5.4.1
 
+[options.packages.find]
+where = src
+
 [options.entry_points]
 console_scripts =
     text-clf-train = text_clf.__main__:main

src/text_clf/__init__.py

@@ -0,0 +1,9 @@
+from . import pr_roc_curve, token_frequency
+from .__main__ import train
+
+__version__ = "0.1.6"
+__all__ = [
+    "train",
+    "pr_roc_curve",
+    "token_frequency",
+]

tests/test_lemmatizer.py

@@ -2,7 +2,7 @@
 
 from parameterized import parameterized
 
-from text_clf.lemmatizer import LemmatizerPymorphy2, Preprocessor
+from src.text_clf.lemmatizer import LemmatizerPymorphy2, Preprocessor
 
 
 class TestLemmatizer(unittest.TestCase):

tests/test_pipeline.py

@@ -5,7 +5,7 @@
 from parameterized import parameterized
 
 from data.load_20newsgroups import load_20newsgroups
-from text_clf import train
+from src.text_clf import train
 
 
 class TestUsage(unittest.TestCase):
@@ -17,6 +17,8 @@ def setUpClass(cls) -> None:
 
         load_20newsgroups()
 
+        cls._remove_models_folder()
+
     @parameterized.expand(
         [
             ("tests/config/config.yaml",),
@@ -48,6 +50,12 @@ def test_train_error(self) -> None:
     def tearDownClass(cls) -> None:
         """tearDown tests with models remove."""
 
+        cls._remove_models_folder()
+
+    @staticmethod
+    def _remove_models_folder():
+        """Remove models folder."""
+
         path_to_models_folder = "tests/models"
         if os.path.exists(path_to_models_folder):
             shutil.rmtree(path_to_models_folder)

tests/test_pr_roc_curve.py

@@ -7,8 +7,8 @@
 from sklearn.metrics import auc
 
 from data.load_20newsgroups import load_20newsgroups
-from text_clf import train
-from text_clf.pr_roc_curve import (
+from src.text_clf import train
+from src.text_clf.pr_roc_curve import (
     get_precision_recall_curve,
     get_roc_curve,
     plot_precision_recall_curve,
@@ -26,9 +26,7 @@ def setUpClass(cls) -> None:
 
         load_20newsgroups()
 
-        path_to_models_folder = "tests/models"
-        if os.path.exists(path_to_models_folder):
-            shutil.rmtree(path_to_models_folder)
+        cls._remove_models_folder()
 
         train(path_to_config="tests/config/config.yaml")
         train(path_to_config="tests/config/config_russian.yaml")
@@ -86,6 +84,12 @@ def test_get_plot_curve(self, path_to_model_folder_pattern) -> None:
     def tearDownClass(cls) -> None:
         """tearDown tests with models remove."""
 
+        cls._remove_models_folder()
+
+    @staticmethod
+    def _remove_models_folder():
+        """Remove models folder."""
+
         path_to_models_folder = "tests/models"
         if os.path.exists(path_to_models_folder):
             shutil.rmtree(path_to_models_folder)

tests/test_token_frequency.py

@@ -3,7 +3,7 @@
 from parameterized import parameterized
 
 from data.load_20newsgroups import load_20newsgroups
-from text_clf.token_frequency import get_token_frequency
+from src.text_clf.token_frequency import get_token_frequency
 
 
 class TestTokenFrequency(unittest.TestCase):