Finally remove specific profession phrasing

This removes the specific kinds of profession that were previously here as a hangover from the old days. From here on in, users can subclass Mentor or Mentee if they have specific needs.

Author: jonodrew

matching/mentee.py

@@ -10,20 +10,15 @@
 class Mentee(Person):
     def __init__(self, **kwargs):
         """
-        Mentees should have a target profession. If they don't have a target profession, we assume it's the same one
-        they're in at the moment
+        Base class for mentees
         :param kwargs:
         """
-        if (profession := kwargs.get("target profession")) is not None:
+        if kwargs.get("target_profession") or kwargs.get("target profession"):
             warnings.warn(
-                "In version 7, 'target profession' will be deprecated in favour of"
-                " 'profession'. If you need to keep using 'target profession', please"
-                " subclass Mentee",
-                PendingDeprecationWarning,
+                "`target_profession` is now deprecated. Please use `profession`"
+                " instead",
+                DeprecationWarning,
             )
-            self.target_profession = profession
-        else:
-            self.profession = self.target_profession = kwargs.get("profession", "")
         super(Mentee, self).__init__(**kwargs)
 
     @property
@@ -36,7 +31,6 @@ def mentors(self, new_mentor: "Mentor"):
 
     def core_to_dict(self):
         core = super(Mentee, self).core_to_dict()
-        core[self.class_name()]["target profession"] = self.target_profession
         return core
 
     @classmethod

matching/person.py

@@ -14,16 +14,12 @@ def __init__(self, **kwargs):
         """
         self.grade: int = int(kwargs.get("grade"))
         self.organisation: str = kwargs.get("organisation", None)
-        if (profession := kwargs.get("current profession")) is not None:
+        self.profession = kwargs.get("profession", None)
+        if kwargs.get("current_profession") or kwargs.get("current profession"):
             warnings.warn(
-                "In version 7, 'current profession' will be deprecated in favour of"
-                " 'profession'. If you need to keep using 'current profession', please"
-                " subclass Person",
-                PendingDeprecationWarning,
+                "`current_profession` is deprecated. Use `profession` instead",
+                DeprecationWarning,
             )
-            self.current_profession = self.profession = profession
-        else:
-            self.profession = self.current_profession = kwargs.get("profession", "")
         self.email = kwargs.get("email", None)
         self.first_name = kwargs.get("first name", None)
         self.last_name = kwargs.get("last name", None)
@@ -66,7 +62,6 @@ def core_to_dict(self) -> CorePersonDict:
                 "organisation": self.organisation,
                 "grade": self.grade,
                 "profession": self.profession,
-                "current profession": self.current_profession,
             }
         }
 

tests/conftest.py

@@ -21,8 +21,6 @@ def _known_file(path_to_file, role_type: str, quantity=50):
                 "role",
                 "organisation",
                 "grade",
-                "current profession",
-                "target profession",
             ]
             data = [headings]
             for i in range(quantity):
@@ -34,8 +32,6 @@ def _known_file(path_to_file, role_type: str, quantity=50):
                         "Some role",
                         f"Department of {role_type.capitalize()}s",
                         "2" if role_type == "mentor" else "0",
-                        "Policy",
-                        "Policy",
                     ]
                 )
             file_writer = csv.writer(test_data)
@@ -74,7 +70,7 @@ def base_data() -> dict:
 @pytest.fixture
 def base_mentee(base_data):
     mentee = Mentee(**base_data)
-    mentee.target_profession = "Policy"
+    mentee.profession = "Policy"
     return mentee
 
 

tests/test_rules.py

@@ -16,8 +16,7 @@ class TestRules:
     def test_matching_scores_scores_correct_points(self, test_match):
         profession_rule = rl.Generic(
             {True: 4, False: 0},
-            lambda match: match.mentee.target_profession
-            == match.mentor.current_profession,
+            lambda match: match.mentee.profession == match.mentor.profession,
         )
         assert profession_rule.apply(test_match) == 4