Merge pull request #6 from uw-it-aca/develop

remove dependency of PWS

setup.py

@@ -22,7 +22,6 @@
     author_email="aca-it@uw.edu",
     include_package_data=True,
     install_requires=['UW-RestClients-Core<1.0',
-                      'UW-RestClients-PWS<2.0,>=1.0.1',
                       'python-dateutil'
                       ],
     license='Apache License, Version 2.0',

uw_grad/__init__.py

@@ -4,14 +4,12 @@
 
 import logging
 from dateutil.parser import parse
-from uw_pws import PWS
 from uw_grad.dao import Grad_DAO
 from restclients_core.exceptions import DataFailureException
 
 
 logger = logging.getLogger(__name__)
 DAO = Grad_DAO()
-UWPWS = PWS()
 
 
 def get_resource(url):

uw_grad/committee.py

@@ -4,24 +4,14 @@
 import logging
 import json
 from uw_grad.models import GradCommitteeMember, GradCommittee
-from uw_grad import get_resource, parse_datetime, UWPWS
+from uw_grad import get_resource, parse_datetime
 
 
 PREFIX = "/services/students/v1/api/committee?id="
 SUFFIX = "&status=active"
-
-
 logger = logging.getLogger(__name__)
 
 
-def get_committee_by_regid(regid):
-    """
-    raise: InvalidRegID, DataFailureException
-    """
-    person = UWPWS.get_person_by_regid(regid)
-    return get_committee_by_syskey(person.student_system_key)
-
-
 def get_committee_by_syskey(system_key):
     url = "%s%s%s" % (PREFIX, system_key, SUFFIX)
     return _process_json(json.loads(get_resource(url)))

uw_grad/degree.py

@@ -4,24 +4,14 @@
 import logging
 import json
 from uw_grad.models import GradDegree
-from uw_grad import get_resource, parse_datetime, UWPWS
+from uw_grad import get_resource, parse_datetime
 
 
 PREFIX = "/services/students/v1/api/request?id="
 SUFFIX = "&exclude_past_quarter=true"
-
-
 logger = logging.getLogger(__name__)
 
 
-def get_degree_by_regid(regid):
-    """
-    raise: InvalidRegID, DataFailureException
-    """
-    person = UWPWS.get_person_by_regid(regid)
-    return get_degree_by_syskey(person.student_system_key)
-
-
 def get_degree_by_syskey(system_key):
     url = "%s%s%s" % (PREFIX, system_key, SUFFIX)
     return _process_json(json.loads(get_resource(url)))

uw_grad/leave.py

@@ -4,23 +4,13 @@
 import logging
 import json
 from uw_grad.models import GradLeave, GradTerm
-from uw_grad import get_resource, parse_datetime, UWPWS
+from uw_grad import get_resource, parse_datetime
 
 
 PREFIX = "/services/students/v1/api/leave?id="
-
-
 logger = logging.getLogger(__name__)
 
 
-def get_leave_by_regid(regid):
-    """
-    raise: InvalidRegID, DataFailureException
-    """
-    person = UWPWS.get_person_by_regid(regid)
-    return get_leave_by_syskey(person.student_system_key)
-
-
 def get_leave_by_syskey(system_key):
     url = "%s%s" % (PREFIX, system_key)
     return _process_json(json.loads(get_resource(url)))

uw_grad/petition.py

@@ -4,23 +4,13 @@
 import logging
 import json
 from uw_grad.models import GradPetition
-from uw_grad import get_resource, parse_datetime, UWPWS
+from uw_grad import get_resource, parse_datetime
 
 
 PREFIX = "/services/students/v1/api/petition?id="
-
-
 logger = logging.getLogger(__name__)
 
 
-def get_petition_by_regid(regid):
-    """
-    raise: InvalidRegID, DataFailureException
-    """
-    person = UWPWS.get_person_by_regid(regid)
-    return get_petition_by_syskey(person.student_system_key)
-
-
 def get_petition_by_syskey(system_key):
     url = "%s%s" % (PREFIX, system_key)
     return _process_json(json.loads(get_resource(url)))

uw_grad/tests/test_committee.py

@@ -1,18 +1,15 @@
 import datetime
 from unittest import TestCase
 from restclients_core.exceptions import DataFailureException
-from uw_grad.committee import get_committee_by_regid
-from uw_pws.util import fdao_pws_override
+from uw_grad.committee import get_committee_by_syskey
 from uw_grad.util import fdao_grad_override
 
 
 @fdao_grad_override
-@fdao_pws_override
 class CommitteeTest(TestCase):
 
-    def test_get_committee_by_regid(self):
-        requests = get_committee_by_regid(
-            "9136CCB8F66711D5BE060004AC494FFE")
+    def test_get_committee_by_syskey(self):
+        requests = get_committee_by_syskey("000083856")
 
         self.assertEqual(len(requests), 3)
 
@@ -91,5 +88,4 @@ def test_get_committee_by_regid(self):
 
     def test_error(self):
         self.assertRaises(DataFailureException,
-                          get_committee_by_regid,
-                          "00000000000000000000000000000001")
+                          get_committee_by_syskey, "0000000001")

uw_grad/tests/test_degree.py

@@ -1,18 +1,15 @@
 import datetime
 from unittest import TestCase
 from restclients_core.exceptions import DataFailureException
-from uw_grad.degree import get_degree_by_regid
-from uw_pws.util import fdao_pws_override
+from uw_grad.degree import get_degree_by_syskey
 from uw_grad.util import fdao_grad_override
 
 
 @fdao_grad_override
-@fdao_pws_override
 class DegreeTest(TestCase):
 
     def test_get_request_by_regid(self):
-        requests = get_degree_by_regid(
-            "9136CCB8F66711D5BE060004AC494FFE")
+        requests = get_degree_by_syskey("000083856")
 
         self.assertEqual(len(requests), 6)
         degree = requests[0]
@@ -42,5 +39,4 @@ def test_get_request_by_regid(self):
 
     def test_error(self):
         self.assertRaises(DataFailureException,
-                          get_degree_by_regid,
-                          "00000000000000000000000000000001")
+                          get_degree_by_syskey, "000000001")

uw_grad/tests/test_leave.py

@@ -1,18 +1,15 @@
 import datetime
 from unittest import TestCase
 from restclients_core.exceptions import DataFailureException
-from uw_grad.leave import get_leave_by_regid
-from uw_pws.util import fdao_pws_override
+from uw_grad.leave import get_leave_by_syskey
 from uw_grad.util import fdao_grad_override
 
 
 @fdao_grad_override
-@fdao_pws_override
 class LeaveTest(TestCase):
 
-    def test_get_leave_by_regid(self):
-        requests = get_leave_by_regid(
-            "9136CCB8F66711D5BE060004AC494FFE")
+    def test_get_leave_by_syskey(self):
+        requests = get_leave_by_syskey("000083856")
 
         self.assertEqual(len(requests), 5)
         leave = requests[0]
@@ -33,5 +30,4 @@ def test_get_leave_by_regid(self):
 
     def test_error(self):
         self.assertRaises(DataFailureException,
-                          get_leave_by_regid,
-                          "00000000000000000000000000000001")
+                          get_leave_by_syskey, "000000001")

uw_grad/tests/test_petition.py

@@ -1,18 +1,15 @@
 import datetime
 from unittest import TestCase
 from restclients_core.exceptions import DataFailureException
-from uw_grad.petition import get_petition_by_regid
-from uw_pws.util import fdao_pws_override
+from uw_grad.petition import get_petition_by_syskey
 from uw_grad.util import fdao_grad_override
 
 
 @fdao_grad_override
-@fdao_pws_override
 class PetitionTest(TestCase):
 
-    def test_get_petition_by_regid(self):
-        requests = get_petition_by_regid(
-            "9136CCB8F66711D5BE060004AC494FFE")
+    def test_get_petition_by_syskey(self):
+        requests = get_petition_by_syskey("000083856")
 
         self.assertEqual(len(requests), 4)
         petition = requests[0]
@@ -79,5 +76,4 @@ def test_get_petition_by_regid(self):
 
     def test_error(self):
         self.assertRaises(DataFailureException,
-                          get_petition_by_regid,
-                          "00000000000000000000000000000001")
+                          get_petition_by_syskey, "000000001")