Launchpad itself

Merge ~cjwatson/launchpad:zope-upgrades into launchpad:master

  1. Git
  2. lp:~cjwatson/launchpad
  3. zope-upgrades
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: ebf0c6cdecfae54a0d59f85feda248410213413d
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:zope-upgrades
Merge into: launchpad:master
Prerequisite: ~cjwatson/launchpad:upgrade-z3c.pt
Diff against target: 23 lines (+4/-4)
1 file modified
constraints.txt (+4/-4)
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Thiago F. Pappacena (community) Approve
Review via email: mp+376998@code.launchpad.net

Commit message

Finish upgrading Zope packages to support Python 3

Description of the change

Upgrade to zc.zservertracelog 2.0.0, zope.app.publisher 4.2.0, zope.server 4.0.2, and zope.vocabularyregistry 1.1.1. These aren't part of the Zope Toolkit package set, so weren't in the earlier mass upgrade.

Dependencies MP: https://code.launchpad.net/~cjwatson/lp-source-dependencies/+git/lp-source-dependencies/+merge/376997

To post a comment you must log in.
Revision history for this message
Thiago F. Pappacena (pappacena) wrote :

LGTM

Revision history for this message
Thiago F. Pappacena (pappacena) :
review: Approve
Revision history for this message
Colin Watson (cjwatson) wrote :

Self-approving as well to work around review requirements, since I only added Thiago to ~launchpad-reviewers just after their review.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/constraints.txt b/constraints.txt
2index e96e5e3..a95b552 100644
3--- a/constraints.txt
4+++ b/constraints.txt
5@@ -323,14 +323,14 @@ WSGIProxy2==0.4.6
6 wsgiref==0.1.2
7 z3c.pt==3.2.0
8 z3c.ptcompat==2.2.0
9-zc.zservertracelog==1.3.2
10+zc.zservertracelog==2.0.0
11 zope.app.applicationcontrol==4.0.0
12 zope.app.appsetup==4.1.0
13 zope.app.http==4.0.1
14 zope.app.publication==4.3.1
15-zope.app.publisher==3.10.2
16+zope.app.publisher==4.2.0
17 zope.app.server==4.0.0
18 zope.app.wsgi[testlayer]==4.1.0
19-zope.server==3.8.6
20+zope.server==4.0.2
21 zope.testbrowser==5.5.1
22-zope.vocabularyregistry==1.0.0
23+zope.vocabularyregistry==1.1.1

Subscribers

People subscribed via source and target branches

to status/vote changes: