From 48ae4107c57d479bfbe04e892c3754c93ee034cf Mon Sep 17 00:00:00 2001
From: Robert Kolner <robert.kolner@gmail.com>
Date: Thu, 21 Mar 2013 13:15:37 +0100
Subject: [PATCH] Updated requirements: django to 1.5 and tastypie to 0.9.14.
 Removed unused tests which didn't work.

---
 dusken/main/tests/__init__.py        |  2 -
 dusken/main/tests/groupmembership.py | 47 --------------------
 dusken/main/tests/membership.py      | 66 ----------------------------
 requirements.txt                     |  4 +-
 4 files changed, 2 insertions(+), 117 deletions(-)
 delete mode 100644 dusken/main/tests/groupmembership.py
 delete mode 100644 dusken/main/tests/membership.py

diff --git a/dusken/main/tests/__init__.py b/dusken/main/tests/__init__.py
index c91c9dc..2eadad9 100644
--- a/dusken/main/tests/__init__.py
+++ b/dusken/main/tests/__init__.py
@@ -1,4 +1,2 @@
 from member import *
-from membership import *
 from group import *
-from groupmembership import *
diff --git a/dusken/main/tests/groupmembership.py b/dusken/main/tests/groupmembership.py
deleted file mode 100644
index 0236930..0000000
--- a/dusken/main/tests/groupmembership.py
+++ /dev/null
@@ -1,47 +0,0 @@
-import logging
-
-from support.test import ResourceTestCase
-from main.models import GroupMembership
-
-class GroupMembershipTest(ResourceTestCase):
-	fixtures = [ 'testdata.json' ]
-
-	def assertValidGroupgroupmembershipshipData(self, groupmembership):
-		self.assertEquals(type(groupmembership), dict)	
-		self.assertKeys(groupmembership, [ 
-			u'id',
-			u'groupmembership',
-			u'group',
-			u'created',
-			u'updated',
-			u'resource_uri' 
-		])
-		self.assertNotEquals(None,groupmembership['id'])
-		self.assertNotEquals(None,groupmembership['groupmembership'])
-		self.assertNotEquals(None,groupmembership['group'])
-		self.assertNotEquals(None,groupmembership['created'])
-		self.assertNotEquals(None,groupmembership['updated'])
-		self.assertNotEquals(None,groupmembership['resource_uri'])
-
-	def setUp(self):
-		super(GroupMembershipTest, self).setUp()
-
-		# URI to get all groups
-		self.groupmembership_url = '/api/v1/groupmembership/'
-
-	def test_request_types(self):
-		"""
-		Tests that the endpoint responds to correct types of requests.
-		"""
-		resp = self.api_client.get(self.groupmembership_url, format='json')
-		self.assertNotEquals(resp.status_code, 405)
-
-		resp = self.api_client.post(self.groupmembership_url)
-		self.assertNotEquals(resp.status_code, 405)
-
-		resp = self.api_client.put(self.groupmembership_url)
-		self.assertNotEquals(resp.status_code, 405)
-
-		resp = self.api_client.delete(self.groupmembership_url)
-		self.assertNotEquals(resp.status_code, 405)
-
diff --git a/dusken/main/tests/membership.py b/dusken/main/tests/membership.py
deleted file mode 100644
index 56d7f49..0000000
--- a/dusken/main/tests/membership.py
+++ /dev/null
@@ -1,66 +0,0 @@
-import logging
-
-from support.test import ResourceTestCase
-from main.models import Membership
-
-class MembershipTest(ResourceTestCase):
-    fixtures = [ 'testdata.json' ]
-
-    def assertValidMembershipData(self, membership):
-        self.assertEquals(type(membership), dict)
-        self.assertKeys(membership, [ 
-            u'id', 
-			u'start_date',
-			u'expires',
-			u'mtype',
-			u'payment',
-			u'member',
-            u'created',
-            u'updated',
-            u'resource_uri' 
-            ])
-        self.assertNotEquals(None,membership['id'])
-        self.assertNotEquals(None,membership['start_date'])
-        self.assertNotEquals(None,membership['expires'])
-        self.assertNotEquals(None,membership['mtype'])
-        self.assertNotEquals(None,membership['member'])
-        self.assertNotEquals(None,membership['created'])
-        self.assertNotEquals(None,membership['updated'])
-        self.assertNotEquals(None,membership['resource_uri'])
-
-    def setUp(self):
-        super(MembershipTest, self).setUp()
-
-        # URI to get the existing member. We'll probably 
-        # need it at one point or another.
-        self.membership_url = '/api/v1/membership/'
-
-
-    def test_check_request_types(self):
-        """
-        Tests that the endpoint responds to correct types of requests.
-        """
-        resp = self.api_client.get(self.membership_url, format='json')
-        self.assertNotEquals(resp.status_code, 405)
-
-        resp = self.api_client.post(self.membership_url)
-        self.assertNotEquals(resp.status_code, 405)
-
-        resp = self.api_client.put(self.membership_url)
-        self.assertHttpMethodNotAllowed(resp)
-
-        resp = self.api_client.delete(self.membership_url)
-        self.assertHttpMethodNotAllowed(resp)
-
-    def test_get_memberships(self):
-        """
-        Tests that we can get a premade user correctly.
-        """
-        resp = self.api_client.get(self.membership_url +'1/', format='json')
-        self.assertValidJSONResponse(resp)
-
-        # Check if the returned data is correct:
-        membership = self.deserialize(resp)
-        self.assertValidMembershipData(membership)
-
-
diff --git a/requirements.txt b/requirements.txt
index 5596314..d5b452d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,9 +1,9 @@
-Django==1.4.2
+Django==1.5
 MySQL-python==1.2.4
 South==0.7.6
 argparse==1.2.1
 distribute==0.6.34
-django-tastypie==0.9.11
+django-tastypie==0.9.14
 mimeparse==0.1.3
 psycopg2==2.4.5
 python-dateutil==1.5