Merge pull request samgiles#67 from merwok/master

Release 0.6.0

.gitignore

@@ -1,4 +1,5 @@
+dist/*
 docs/_build/*
 .tox
 *.pyc
-*.egg-info
+slumber.egg-info

MANIFEST.in

@@ -2,4 +2,4 @@ recursive-include docs *.rst
 include README.rst
 include LICENSE.txt
 include CHANGELOG.rst
-prune tests
+include tests

README.rst

@@ -34,9 +34,9 @@ Requirements
 
 Slumber requires the following modules.
 
-* Python 2.5+
+* Python 2.6+
 * requests
-* simplejson (If using Python 2.5, or you desire the speedups for JSON serialization)
+* simplejson (If you desire the speedups for JSON serialization)
 * pyyaml (If you are using the optional yaml serialization)
 
 .. _Pip: http://pip.openplans.org/

requirements.txt

@@ -1,2 +1 @@
 requests
-simplejson

setup.py

@@ -1,12 +1,8 @@
-import os.path
-from setuptools import setup, find_packages
-import sys
+import os
+from setuptools import setup
 
 install_requires = ["requests"]
 
-if sys.version_info < (2, 6):
-    install_requires.append("simplejson")
-
 base_dir = os.path.dirname(os.path.abspath(__file__))
 
 setup(
@@ -20,7 +16,7 @@
     url = "http://slumber.in/",
     author = "Donald Stufft",
     author_email = "[email protected]",
-    packages = find_packages(),
+    packages = ["slumber"],
     zip_safe = False,
     install_requires = install_requires,
     test_suite = "tests.get_tests",

tests/resource.py

@@ -31,6 +31,7 @@ def test_get_200_json(self):
             "GET",
             "http://example/api/v1/test",
             data=None,
+            files=None,
             params=None,
             headers={"content-type": self.base_resource._store["serializer"].get_content_type(), "accept": self.base_resource._store["serializer"].get_content_type()}
         )
@@ -59,6 +60,7 @@ def test_get_200_text(self):
             "GET",
             "http://example/api/v1/test",
             data=None,
+            files=None,
             params=None,
             headers={"content-type": self.base_resource._store["serializer"].get_content_type(), "accept": self.base_resource._store["serializer"].get_content_type()}
         )
@@ -92,6 +94,7 @@ def test_post_201_redirect(self):
             "POST",
             "http://example/api/v1/test",
             data=None,
+            files=None,
             params=None,
             headers={"content-type": self.base_resource._store["serializer"].get_content_type(), "accept": self.base_resource._store["serializer"].get_content_type()}
         )
@@ -120,6 +123,7 @@ def test_post_decodable_response(self):
             "POST",
             "http://example/api/v1/test",
             data=None,
+            files=None,
             params=None,
             headers={"content-type": self.base_resource._store["serializer"].get_content_type(), "accept": self.base_resource._store["serializer"].get_content_type()}
         )
@@ -153,6 +157,7 @@ def test_patch_201_redirect(self):
             "PATCH",
             "http://example/api/v1/test",
             data=None,
+            files=None,
             params=None,
             headers={"content-type": self.base_resource._store["serializer"].get_content_type(), "accept": self.base_resource._store["serializer"].get_content_type()}
         )
@@ -181,6 +186,7 @@ def test_patch_decodable_response(self):
             "PATCH",
             "http://example/api/v1/test",
             data=None,
+            files=None,
             params=None,
             headers={"content-type": self.base_resource._store["serializer"].get_content_type(), "accept": self.base_resource._store["serializer"].get_content_type()}
         )
@@ -214,6 +220,7 @@ def test_put_201_redirect(self):
             "PUT",
             "http://example/api/v1/test",
             data=None,
+            files=None,
             params=None,
             headers={"content-type": self.base_resource._store["serializer"].get_content_type(), "accept": self.base_resource._store["serializer"].get_content_type()}
         )
@@ -242,6 +249,7 @@ def test_put_decodable_response(self):
             "PUT",
             "http://example/api/v1/test",
             data=None,
+            files=None,
             params=None,
             headers={"content-type": self.base_resource._store["serializer"].get_content_type(), "accept": self.base_resource._store["serializer"].get_content_type()}
         )