admin/release-twisted expects zope tarballs under old names

[zooko]

I have no idea if this is relevant to the modern build system, but trunk's "admin/release-twisted" checks for zope tarballs named ZopeInterface-*.tgz, but modern ones are named "zope.interface-*.tar.gz". Here is a patch that accepts both new and old zope.interface tarballs.

Index: admin/release-twisted
===================================================================
--- admin/release-twisted	(revision 21764)
+++ admin/release-twisted	(working copy)
@@ -224,8 +224,9 @@
         raise Exception("Please create a 'twistedballs' directory and "
                         "populate it with tarballs of Twisted projects "
                         "and Zope Interface.")
-    zig = glob.glob('twistedballs/ZopeInterface-*.tgz')
-    if not zig:
+    zig = glob.glob('twistedballs/zope.interface-*.tar.*')
+    oldzig = glob.glob('twistedballs/ZopeInterface-*.tgz')
+    if not zig and not oldzig:
         raise Exception(
             "Creating sumo distribution requires a ZopeInterface tarball - "
             "Please download one from "
@@ -234,7 +235,10 @@
     twistedBalls = glob.glob('twistedballs/Twisted*.tar.bz2')
     for tb in twistedBalls:
         sh('tar xjf %s -C %s' % (tb, tdir))
-    sh('tar xzf %s -C %s' % (zig[0], tdir))
+    if zig:
+        sh('tar xzf %s -C %s' % (zig[0], tdir))
+    elif oldzig:
+        sh('tar xzf %s -C %s' % (oldzig[0], tdir))
     sh('''
     cp `pwd`/README %(tdir)s/
     cp `pwd`/LICENSE %(tdir)s/

[exarkun]

Fixing description markup

[exarkun]

I believe admin/release-twisted has been obsoleted by the new code in twisted/python/_release.py? Can we close this?

[zooko]

I guess we can close this, but oughtn't we first delete the obsolete admin/release-twisted and remove mention of it from instructions?

I get the following hits on grep in trunk -r24262 (excluding doc/historic):

./admin/release-procedure.txt: ./admin/release-twisted --commands=exportTemp,makeDocProj,makeBallProj ./admin/release-procedure.txt:5. './admin/release-twisted --commands=makeBallSumo --sumo-version=a.b.x.y' ./admin/release-procedure.txt: author: release-twisted, reviewer: you. ./doc/development/release.xhtml:<h3>Run release-twisted</h3> ./doc/development/release.xhtml:./Twisted.CVS/admin/release-twisted -V $VERSION -o $LASTVERSION \ ./doc/development/release.xhtml:$SOMEWHERE/admin/release-twisted -V $VERSION -o $LASTVERSION --checkout \ ./doc/development/release.xhtml:$SOMEWHERE/admin/release-twisted -n $SFNAME -V $VERSION --sourceforge \

[exarkun]

There's #3165, which one might construe as covering the complete removal of release-twisted and related materials.

[radix]

well, we're not even including Zope Interface in the Twisted tarball any more, so I guess this is basically an obsolete ticket.

[exarkun]

Okay, thanks!