Merge lp:~cjwatson/storm/allow-newer-zope-component into lp:storm

Proposed by Colin Watson
Status: Merged
Merged at revision: 493
Proposed branch: lp:~cjwatson/storm/allow-newer-zope-component
Merge into: lp:storm
Diff against target: 14 lines (+0/-5)
1 file modified
setup.py (+0/-5)
To merge this branch: bzr merge lp:~cjwatson/storm/allow-newer-zope-component
Reviewer Review Type Date Requested Status
Adam Collard (community) Approve
Review via email: mp+368252@code.launchpad.net

Commit message

Drop zope.component < 3.11.0 restriction for tests.

Description of the change

This was only ever a convenience for running tests on certain Ubuntu series, and it's now an anti-convenience since Ubuntu 13.04 and newer have zope.component >= 3.11.0 and zope.interface >= 3.8.0. tox does a better job of isolating tests from the system where needed anyway.

To post a comment you must log in.
Revision history for this message
Adam Collard (adam-collard) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'setup.py'
2--- setup.py 2019-05-30 13:21:20 +0000
3+++ setup.py 2019-06-03 10:15:46 +0000
4@@ -29,11 +29,6 @@
5 "transaction >= 1.0.0",
6 "twisted >= 10.0.0",
7 "zope.component >= 3.8.0",
8- # zope.component 3.11.0 requires a version of zope.interface that no
9- # version of Ubuntu yet packages. The following rule exists for the
10- # sake of convenience rather than necessity, for the situation where
11- # zope.interface is installed via a package but zope.component is not.
12- "zope.component < 3.11.0",
13 "zope.security >= 3.7.2",
14 ]
15

Subscribers

People subscribed via source and target branches

to status/vote changes: