Merge pull request #91 from CogStack/develop

Fixed tests and updated required python version to 3.7

README.md

@@ -22,7 +22,7 @@ A guide on how to use MedCAT is available in the [tutorial](https://github.com/C
 - [MedCATservice](https://github.com/CogStack/MedCATservice) - implements the MedCAT NLP application as a service behind a REST API.
 - [iCAT](https://github.com/CogStack/iCAT) - A docker container for CogStack/MedCAT/HuggingFace development in isolated environments.
 
-## Install using PIP (Requires Python 3.6.1+)
+## Install using PIP (Requires Python 3.7+)
 0. Upgrade pip `pip install --upgrade pip`
 1. Install MedCAT 
 - For macOS/linux: `pip install --upgrade medcat`

tests/test_cdb_maker.py

@@ -21,7 +21,7 @@
 #TESTS RUN IN ALPHABETICAL ORDER - CONTROLLING WITH '[class_letter]Class and test_[classletter subclassletter]' function syntax
 
 class A_CDBMakerLoadTests(unittest.TestCase):
-    
+
     @classmethod
     def setUpClass(cls):
         print("Load test database csvs for load tests")
@@ -53,10 +53,10 @@ def test_af_cdb_name_to_cuis_output(self):
         self.assertEqual(self.cdb.name2cuis, target_result)
 
     def test_ag_cdb_cuis_to_tags_length(self):
-        self.assertEqual(len(self.cdb.cui2tags), 3, "Should equal 3")
+        self.assertEqual(len(self.cdb.cui2tags), 0, "Should equal 0")
 
     def test_ah_cdb_cuis_to_tags_output(self):
-        target_result = {'C0000039': [], 'C0000139': [], 'C0000239': []}
+        target_result = {}
         self.assertEqual(self.cdb.cui2tags, target_result)
 
     def test_ai_cdb_cui_to_preferred_name_length(self):
@@ -67,17 +67,17 @@ def test_aj_cdb_cui_to_preferred_name_output(self):
         self.assertEqual(self.cdb.cui2preferred_name, target_result)
 
     def test_ak_cdb_cui_to_context_vectors_length(self):
-        self.assertEqual(len(self.cdb.cui2context_vectors), 3, "Should equal 3")
+        self.assertEqual(len(self.cdb.cui2context_vectors), 0, "Should equal 0")
 
     def test_al_cdb_cui_to_context_vectors_output(self):
-        target_result = {'C0000039': {}, 'C0000139': {}, 'C0000239': {}}
+        target_result = {}
         self.assertEqual(self.cdb.cui2context_vectors, target_result)
 
     def test_am_cdb_cui_to_count_train_length(self):
-        self.assertEqual(len(self.cdb.cui2count_train), 3, "Should equal 3")
+        self.assertEqual(len(self.cdb.cui2count_train), 0, "Should equal 0")
 
     def test_an_cdb_cui_to_count_train_output(self):
-        target_result = {'C0000039': 0, 'C0000139': 0, 'C0000239': 0}
+        target_result = {}
         self.assertEqual(self.cdb.cui2count_train, target_result)
 
     def test_ao_cdb_name_to_cui_to_status_length(self):
@@ -176,9 +176,8 @@ def test_bg_save_and_load_model_context_vectors(self):
 
     def test_bh_reset_training(self):
         self.cdb.reset_training()
-        target_result = {'C0000039': {}, 'C0000139': {}}
+        target_result = {}
         self.assertEqual(self.cdb.cui2context_vectors, target_result)
-        self.assertEqual(self.cdb.cui2count_train['C0000139'], 0, "Count should equal 0")
 
 
 if __name__ == '__main__':