Switching testing to pytest

- removed tests.py unnecessary file
- switch to pytest everywhere
- fixed unittests after new errors where added

.appveyor.yml

@@ -14,7 +14,7 @@ install:
   - activate test-environment
   - python setup.py develop
 test_script:
-  - python tests.py
+  - pytest
 # build is done in build_script
 build: off
 build_script:

.gitignore

@@ -25,3 +25,4 @@ dist
 # ##########
 .coverage
 cover/
+cache/

.travis.yml

@@ -43,7 +43,7 @@ install:
   - python setup.py develop
 # execute tests
 script:
-  - python tests.py
+  - pytest
 after_success:
   # report coverage in coveralls only for linux build with python 3.6
   - if ([[ "$TRAVIS_PYTHON_VERSION" == "3.6" ]] && 

auxiclean/unittests/test_coding_standards.py

@@ -1,26 +1,28 @@
 import pep8
 import os
 import auxiclean
-from nose.tools import assert_equal
+import unittest
+
 
 # Add pep8 codes to ignore below
 PEP8_ADDITIONAL_IGNORE = []
 # add files to ignore below
 EXCLUDE_FILES = []
 
 
-def test_pep8_conformance():
+class TestPEP8(unittest.TestCase):
+    def test_pep8_conformance(self):
 
-    dirs = []
-    dirname = os.path.dirname(auxiclean.__file__)
-    dirs.append(dirname)
+        dirs = []
+        dirname = os.path.dirname(auxiclean.__file__)
+        dirs.append(dirname)
 
-    pep8style = pep8.StyleGuide()
+        pep8style = pep8.StyleGuide()
 
-    # Extends the number of pep8 guidelines which are not checked
-    pep8style.options.ignore += tuple(PEP8_ADDITIONAL_IGNORE)
-    pep8style.options.exclude.extend(EXCLUDE_FILES)
+        # Extends the number of pep8 guidelines which are not checked
+        pep8style.options.ignore += tuple(PEP8_ADDITIONAL_IGNORE)
+        pep8style.options.exclude.extend(EXCLUDE_FILES)
 
-    result = pep8style.check_files(dirs)
-    msg = "Found code syntax errors (and warnings)!"
-    assert_equal(result.total_errors, 0, msg)
+        result = pep8style.check_files(dirs)
+        msg = "Found code syntax errors (and warnings)!"
+        self.assertEqual(result.total_errors, 0, msg=msg)

auxiclean/unittests/test_excel_manager.py

@@ -1,6 +1,7 @@
 from .test_selector import TestBase
 from openpyxl import load_workbook
 from auxiclean import Selector
+from auxiclean.exceptions import ExcelError
 from collections import OrderedDict
 import warnings
 
@@ -108,5 +109,5 @@ class TestExcelCandidateChoiceError(TestBase):
                                "gpa": 3.0}}
 
     def test_raise_choice_error(self):
-        with self.assertRaises(ValueError):
+        with self.assertRaises(ExcelError):
             self.selector = Selector(self.data_path)

auxiclean/unittests/test_selector.py

@@ -150,7 +150,7 @@ class TestMultiplePosition(TestBase):
                            "discipline": "générale"},
                "Astro": {"code": "2710",
                          "disponibilities": 1,
-                         "discipline": "astro"}}
+                         "discipline": "astrophysique"}}
     # one candidate applying for two different course.
     # if the candidate is the best suited, he gets both choice
     # assuming he has two disponibilities
@@ -332,7 +332,7 @@ class TestSwitch(TestBase):
                                "nobels": 0,
                                "courses given": ["2710", "2710",
                                                  "1441", "1441"],
-                               "discipline": "particules"}}
+                               "discipline": "générale"}}
 
     def test_switch(self):
         self.selector = Selector(self.data_path, loglevel=self.loglevel)
@@ -354,14 +354,14 @@ class TestCourseGiven(TestBase):
                                "gpa": 2.0,
                                "nobels": 2,
                                "courses given": ["1441", ],
-                               "discipline": "astrophysique"},
+                               "discipline": "générale"},
                   "Claude C": {"choices": ["1441", ],
                                "maximum": 1,
                                "scolarity": 2,
                                "gpa": 2.0,
                                "nobels": 2,
                                "courses given": ["1441", "2710", ],
-                               "discipline": "particules"}}
+                               "discipline": "générale"}}
 
     def test_course_given(self):
         self.selector = Selector(self.data_path)
@@ -370,7 +370,7 @@ def test_course_given(self):
         self.assertEqual(dist["1441"][0].name, "Claude C")
 
 
-class TestScholarity(TestBase):
+class TestScolarity(TestBase):
     # one course for two person
     courses = {"Electro": {"code": "1441",
                            "disponibilities": 1,
@@ -382,16 +382,16 @@ class TestScholarity(TestBase):
                                "gpa": 2.0,
                                "nobels": 2,
                                "courses given": ["1441", "1652", ],
-                               "discipline": "astrophysique"},
+                               "discipline": "générale"},
                   "Claude C": {"choices": ["1441", ],
                                "maximum": 1,
                                "scolarity": 3,
                                "gpa": 2.0,
                                "nobels": 2,
                                "courses given": ["1441", "2710", ],
-                               "discipline": "particules"}}
+                               "discipline": "générale"}}
 
-    def test_scholarity(self):
+    def test_scolarity(self):
         self.selector = Selector(self.data_path)
         # results
         dist = self.selector.distribution
@@ -410,14 +410,14 @@ class TestNobel(TestBase):
                                "gpa": 2.0,
                                "nobels": 2,
                                "courses given": ["1441", "1652", ],
-                               "discipline": "astrophysique"},
+                               "discipline": "générale"},
                   "Claude C": {"choices": ["1441", ],
                                "maximum": 1,
                                "scolarity": 2,
                                "gpa": 2.0,
                                "nobels": 3,
                                "courses given": ["1441", "2710", ],
-                               "discipline": "particules"}}
+                               "discipline": "générale"}}
 
     def test_nobel(self):
         self.selector = Selector(self.data_path)
@@ -426,7 +426,7 @@ def test_nobel(self):
         self.assertEqual(dist["1441"][0].name, "Claude C")
 
 
-class TestProgram(TestBase):
+class TestDiscipline(TestBase):
     # one course for two person
     courses = {"Astro": {"code": "2710",
                          "disponibilities": 1,
@@ -438,7 +438,7 @@ class TestProgram(TestBase):
                                "gpa": 2.0,
                                "nobels": 2,
                                "courses given": ["1441", "1652", ],
-                               "discipline": "particules"},
+                               "discipline": "générale"},
                   "Claude C": {"choices": ["2710", ],
                                "maximum": 1,
                                "scolarity": 2,
@@ -467,14 +467,14 @@ class TestGPA(TestBase):
                                "gpa": 2.0,
                                "nobels": 2,
                                "courses given": ["1441", "1652", ],
-                               "discipline": "astrophysique"},
+                               "discipline": "générale"},
                   "Claude C": {"choices": ["1441", ],
                                "maximum": 1,
                                "scolarity": 2,
                                "gpa": 3.0,
                                "nobels": 2,
                                "courses given": ["1441", "2710", ],
-                               "discipline": "particules"}}
+                               "discipline": "générale"}}
 
     def test_gpa(self):
         self.selector = Selector(self.data_path, loglevel=self.loglevel)
@@ -497,15 +497,15 @@ class TestUserInput(TestBase):
                                         "gpa": 2.0,
                                         "nobels": 2,
                                         "courses given": ["1441", "1652", ],
-                                        "discipline": "astrophysique"}),
+                                        "discipline": "générale"}),
                           ("Bernard B", {"choices": ["1441", ],
                                          "maximum": 1,
                                          "scolarity": 2,
                                          "gpa": 2.0,
                                          "nobels": 2,
                                          "courses given": ["1441",
                                                            "2710", ],
-                                         "discipline": "particules"})]
+                                         "discipline": "générale"})]
 
     def test_user_input_simple(self, user_input_mock):
         # test that user input chooses first candidate over second.

setup.cfg

@@ -5,3 +5,6 @@ versionfile_source = auxiclean/_version.py
 versionfile_build = auxiclean/_version.py
 tag_prefix =
 parentdir_prefix = auxiclean
+
+[tool:pytest]
+addopts = -ra -v --cov=auxiclean --tb=long

setup.py

@@ -17,7 +17,7 @@ def win_pip_install(package, install_list):
                     ]
 
 
-develop_packages = ["nose", "pep8", "coverage"]
+develop_packages = ["pytest-cov", "pep8", "coverage"]
 print("Installing auxiclean, the following packages are required:",
       install_packages)