← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] ~pappacena/turnip:pyramid-cornice-upgrade into turnip:master

 

Thiago F. Pappacena has proposed merging ~pappacena/turnip:pyramid-cornice-upgrade into turnip:master.

Commit message:
Upgrading cornice, pyramid and zope libs for better compatibility with python 3.

Deps repository MP: https://code.launchpad.net/~pappacena/turnip/+git/turnip-dependencies/+merge/380131

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~pappacena/turnip/+git/turnip/+merge/380130
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~pappacena/turnip:pyramid-cornice-upgrade into turnip:master.
diff --git a/requirements.txt b/requirements.txt
index b706f3c..678ace6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@ beautifulsoup4==4.3.2
 cffi==1.11.4
 constantly==15.1.0
 contextlib2==0.4.0
-cornice==0.19.0
+cornice==3.6.1
 cryptography==2.1.4
 docutils==0.14
 enum34==1.1.6
@@ -34,7 +34,7 @@ pycparser==2.10
 pycrypto==2.6.1
 pyflakes==0.8.1
 pygit2==0.27.4
-pyramid==1.5.4
+pyramid==1.10.4
 python-mimeparse==0.1.4
 # XXX: deryck 2012-08-10
 # See lp:~deryck/python-openid/python-openid-fix1034376 which
@@ -52,9 +52,9 @@ Twisted[conch]==18.4.0
 unittest2==1.0.1
 venusian==1.0
 waitress==0.8.9
-WebOb==1.4
+WebOb==1.8.6
 WebTest==2.0.18
 zope.component==4.2.1
-zope.deprecation==4.1.2
+zope.deprecation==4.4.0
 zope.event==4.0.3
-zope.interface==4.5.0
+zope.interface==4.7.1
diff --git a/turnip/api/views.py b/turnip/api/views.py
index adede04..2e8a082 100644
--- a/turnip/api/views.py
+++ b/turnip/api/views.py
@@ -43,7 +43,7 @@ class BaseAPI(object):
 class RepoAPI(BaseAPI):
     """Provides HTTP API for repository actions."""
 
-    def __init__(self, request):
+    def __init__(self, request, context=None):
         super(RepoAPI, self).__init__()
         self.request = request
 
@@ -127,7 +127,7 @@ class RepoAPI(BaseAPI):
 class RepackAPI(BaseAPI):
     """Provides HTTP API for repository repacking."""
 
-    def __init__(self, request):
+    def __init__(self, request, context=None):
         super(RepackAPI, self).__init__()
         self.request = request
 
@@ -158,7 +158,7 @@ class RepackAPI(BaseAPI):
 class RefAPI(BaseAPI):
     """Provides HTTP API for git references."""
 
-    def __init__(self, request):
+    def __init__(self, request, context=None):
         super(RefAPI, self).__init__()
         self.request = request
 
@@ -190,7 +190,7 @@ class DiffAPI(BaseAPI):
     to `git diff $(git-merge-base A B) B`.
     {name} can be two : separated repositories, for a cross repository diff.
     """
-    def __init__(self, request):
+    def __init__(self, request, context=None):
         super(DiffAPI, self).__init__()
         self.request = request
 
@@ -222,7 +222,7 @@ class DiffMergeAPI(BaseAPI):
     {head} will be merged into {base} and the diff from {base} returned.
     {name} can be two : separated repositories, for a cross repository diff.
     """
-    def __init__(self, request):
+    def __init__(self, request, context=None):
         super(DiffMergeAPI, self).__init__()
         self.request = request
 
@@ -247,7 +247,7 @@ class DiffMergeAPI(BaseAPI):
 class CommitAPI(BaseAPI):
     """Provides HTTP API for git commits."""
 
-    def __init__(self, request):
+    def __init__(self, request, context=None):
         super(CommitAPI, self).__init__()
         self.request = request
 
@@ -275,7 +275,7 @@ class CommitAPI(BaseAPI):
 class LogAPI(BaseAPI):
     """Provides HTTP API for git logs."""
 
-    def __init__(self, request):
+    def __init__(self, request, context=None):
         super(LogAPI, self).__init__()
         self.request = request
 
@@ -297,7 +297,7 @@ class LogAPI(BaseAPI):
 class DetectMergesAPI(BaseAPI):
     """Provides HTTP API for detecting merges."""
 
-    def __init__(self, request):
+    def __init__(self, request, context=None):
         super(DetectMergesAPI, self).__init__()
         self.request = request
 
@@ -326,7 +326,7 @@ class DetectMergesAPI(BaseAPI):
 class BlobAPI(BaseAPI):
     """Provides HTTP API for fetching blobs."""
 
-    def __init__(self, request):
+    def __init__(self, request, context=None):
         super(BlobAPI, self).__init__()
         self.request = request