← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] ~cjwatson/launchpad:storm-0.24+lp416 into launchpad:master

 

Colin Watson has proposed merging ~cjwatson/launchpad:storm-0.24+lp416 into launchpad:master.

Commit message:
Upgrade to storm 0.24+lp416

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/385651

This merges the 0.24 release.

Dependencies MP: https://code.launchpad.net/~cjwatson/lp-source-dependencies/+git/lp-source-dependencies/+merge/385650
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:storm-0.24+lp416 into launchpad:master.
diff --git a/constraints.txt b/constraints.txt
index 2683ecf..141b65b 100644
--- a/constraints.txt
+++ b/constraints.txt
@@ -299,7 +299,7 @@ SimpleTAL==4.3
 soupmatchers==0.4
 soupsieve==1.9
 # lp:~launchpad-committers/storm/lp
-storm==0.23+lp415
+storm==0.24+lp416
 subprocess32==3.2.6
 subvertpy==0.9.1
 tenacity==6.1.0
diff --git a/lib/lp/services/webapp/configure.zcml b/lib/lp/services/webapp/configure.zcml
index 9e30570..bfbb9cb 100644
--- a/lib/lp/services/webapp/configure.zcml
+++ b/lib/lp/services/webapp/configure.zcml
@@ -217,12 +217,6 @@
     <class class="lp.services.database.sqlbase.SQLBase">
         <implements interface="lp.services.database.interfaces.IDBObject" />
     </class>
-    <!-- XXX cjwatson 2020-05-19: Revert this once
-         https://code.launchpad.net/~cjwatson/storm/reference-set-getslice
-         is merged into our version of Storm. -->
-    <class class="storm.references.BoundReferenceSet">
-        <allow attributes="__getslice__" />
-    </class>
 
     <!-- Default favicon -->
     <browser:favicon for="*" file="../../../canonical/launchpad/images/launchpad.png" />