merge

pyramid_rest/tests/functional/__init__.py

@@ -19,7 +19,10 @@ def setUp(self):
     def mongo_db(self):
         from pyramid_mongokit import IMongoConnection
         return getattr(
-            self.app.app.registry.getUtility(IMongoConnection),
+            self.app.app.registry.getUtility(
+                IMongoConnection,
+                'mongo_connection',
+                ),
             os.environ['MONGO_DB_NAME']
             )
 

pyramid_rest/tests/unittests/test_renderer.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import unittest
 from decimal import Decimal
 from bson.objectid import ObjectId
@@ -29,9 +30,3 @@ def test_encode_decode(self):
         result = bson_loads(bson_dumps(o))
 
         self.assertEqual(o, result)
-
-
-class TestRestFactory(unittest.TestCase):
-
-    def test_call(self):
-        from pyramid_rest.renderer import Factory

setup.py

@@ -1,9 +1,6 @@
 #!/usr/bin/env python
 import setuptools
 
-if not getattr(setuptools, "_distribute", False):
-    raise SystemExit("""Setuptools is not supported. Please use Distribute""")
-
 setup_requires = [
     'd2to1',
     ]
@@ -19,7 +16,7 @@
     'yanc',
     ]
 
-extras_require = {'mongo': ['pyramid_mongokit']}
+extras_require = {'mongo': ['pyramid_mongokit==0.0.4']}
 
 setuptools.setup(
     setup_requires=setup_requires,