Upgrade tests to Kinto master

Kinto · Apr 12, 2017 · 49863e4 · 49863e4
1 parent 09db81f
commit 49863e4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/kinto_emailer/tests/test_includeme.py b/kinto_emailer/tests/test_includeme.py
@@ -39,8 +39,9 @@ class EmailerTest(BaseWebTest, unittest.TestCase):
     api_prefix = "v1"
     config = 'config/kinto.ini'
 
-    def get_app_settings(self, extras=None):
-        ini_path = os.path.join(HERE, self.config)
+    @classmethod
+    def get_app_settings(cls, extras=None):
+        ini_path = os.path.join(HERE, cls.config)
         config = configparser.ConfigParser()
         config.read(ini_path)
         settings = dict(config.items('app:main'))
@@ -325,8 +326,9 @@ def test_send_notification_calls_the_mailer_queue_if_configured(self):
 
 
 class SignerEventsTest(EmailerTest):
-    def get_app_settings(self, extras=None):
-        settings = super(SignerEventsTest, self).get_app_settings(extras)
+    @classmethod
+    def get_app_settings(cls, extras=None):
+        settings = super().get_app_settings(extras)
         settings['kinto.includes'] += ' kinto_signer'
         settings['kinto.signer.resources'] = (
             '/buckets/staging/collections/addons;'

diff --git a/setup.py b/setup.py
@@ -16,8 +16,7 @@ def read_file(filename):
 
 
 REQUIREMENTS = [
-    'kinto>5',
-    'pyramid<1.8',
+    'kinto > 5',
     'pyramid_mailer',
 ]