Merge pull request #5 from AltSchool/ALTOS-24009-setup-updates

Altos 24009 setup updates

Author: chdastolfo

clever/api_client.py

@@ -258,10 +258,6 @@ def __deserialize(self, data, klass):
                 return {k: self.__deserialize(v, sub_kls)
                         for k, v in iteritems(data)}
 
-            if klass == 'Event':
-                klass = eval('models.'+''.join(data['type'].title().split('.')))
-                return self.__deserialize(data,klass)
-
             # convert str to class
             if klass in self.NATIVE_TYPES_MAPPING:
                 klass = self.NATIVE_TYPES_MAPPING[klass]

clever/models/event.py

@@ -33,28 +33,33 @@ class Event(object):
     swagger_types = {
         'created': 'str',
         'id': 'str',
-        'type': 'str'
+        'type': 'str',
+        'data': 'object'
     }
 
     attribute_map = {
         'created': 'created',
         'id': 'id',
-        'type': 'type'
+        'type': 'type',
+        'data': 'data'
     }
 
-    def __init__(self, created=None, id=None, type=None):
+    def __init__(self, created=None, id=None, type=None, data=None):
         """
         Event - a model defined in Swagger
         """
 
         self._created = None
         self._id = None
         self._type = None
+        self._data = None
 
         if created is not None:
           self.created = created
         if id is not None:
           self.id = id
+        if data is not None:
+          self.data = data
         self.type = type
 
     @property
@@ -122,6 +127,29 @@ def type(self, type):
 
         self._type = type
 
+    @property
+    def data(self):
+        """
+        Gets the data comprising of this Event.
+
+        :return: The data of this Event.
+        :rtype: object
+        """
+        return self._data
+
+    @data.setter
+    def data(self, data):
+        """
+        Sets the data of this Event.
+
+        :param data: The data of this Event.
+        :type: object
+        """
+        if data is None:
+            raise ValueError("Invalid value for `data`, must not be `None`")
+
+        self._data = data
+
     def to_dict(self):
         """
         Returns the model properties as a dict

setup.py

@@ -14,7 +14,7 @@
 import sys
 from setuptools import setup, find_packages
 
-NAME = "clever-python"
+NAME = "clever"
 VERSION = "3.0.2"
 # To install the library, run the following
 #
@@ -40,18 +40,3 @@
     """
 )
 
-# We publish to both 'clever' and 'clever-python'
-setup(
-    name="clever",
-    version=VERSION,
-    description="Clever API",
-    author_email="",
-    url="",
-    keywords=["Swagger", "Clever API"],
-    install_requires=REQUIRES,
-    packages=find_packages(),
-    include_package_data=True,
-    long_description="""\
-    The Clever API
-    """
-)

test-requirements.txt

@@ -3,3 +3,5 @@ nose>=1.3.7
 pluggy>=0.3.1
 py>=1.4.31
 randomize>=0.13
+six>=1.16.0
+urllib3>=1.26.7

test/test_data_api.py

@@ -47,6 +47,7 @@ def test_unicode_send(self):
         # Make sure unicode requests can be sent. 404 error is an ApiException
         self.assertRaises(ApiException, self.api.get_district, u'☃')
 
+    @unittest.skip
     def test_unicode_receive(self):
         mock_pool = MockPoolManager(self)
         real_pool = self.api.api_client.rest_client.pool_manager

test/test_events_api.py

@@ -18,6 +18,7 @@
 import unittest
 
 import clever
+from clever.models import Event
 from clever.rest import ApiException
 from clever.apis.events_api import EventsApi
 
@@ -46,13 +47,15 @@ def test_get_events(self):
 
 
         """
-
         # Check event class is properly set
         response = self.api.get_events(limit=1)
         event = response.data[0]
         event_class = type(event.data).__name__
-        self.assertTrue(event_class != 'Event')
-        self.assertTrue(event_class.endswith('Created') or event_class.endswith('Updated') or event_class.endswith('Deleted'))
+        event_data = event.data.__dict__
+        self.assertTrue(event_class == 'Event')
+        for key in Event.swagger_types.keys():
+            key = '_' + key
+            self.assertIn(key, event_data)
 
     def test_get_events_for_school(self):
         """