release.py: use dateutil's parser

[empathy.git] / release.py

diff --git a/release.py b/release.py
index 30265723a1a0160b79843bd8335fd42d45ea71c5..59919e8f910d33275be1ece4e8815e6fe96c93be 100755 (executable)
--- a/release.py
+++ b/release.py
@@ -1,15 +1,14 @@
 #!/usr/bin/env python
 
 import os
-import re
 import urllib
 import csv
 import datetime
-import time
 from string import Template
 from optparse import OptionParser
+import dateutil.parser
 
-last_tag_patern = 'EMPATHY_2_30*'
+last_tag_pattern = 'EMPATHY_3_10*'
 upload_server = 'master.gnome.org'
 template = '''\
 $name $version is now available for download from:
@@ -67,7 +66,7 @@ class Project:
                        version_dir = self.package_version[:second]
                self.package_dl_url = 'http://download.gnome.org/sources/%s/%s/' % (self.package_name.lower(), 
                                                                                    version_dir)
-               tags_str = self.exec_cmd('git tag -l %s' % (last_tag_patern))
+               tags_str = self.exec_cmd('git tag -l %s' % (last_tag_pattern))
                tags = tags_str.splitlines()
                self.last_tag = tags[len(tags)-1]
 
@@ -88,12 +87,9 @@ class Project:
        def get_md5sums(self):
                md5sums = ''
 
-               cmd = 'md5sum %s-%s.tar.gz' % (self.package_name.lower(), self.package_version)
+               cmd = 'md5sum %s-%s.tar.xz' % (self.package_name.lower(), self.package_version)
                md5sums += self.exec_cmd(cmd)
 
-               cmd = 'md5sum %s-%s.tar.bz2' % (self.package_name.lower(), self.package_version)
-               md5sums += self.exec_cmd(cmd).strip()
-
                return md5sums
 
        def get_bugzilla_info(self):
@@ -161,9 +157,10 @@ class Project:
                return translations
 
        def get_bug_author(self, bug_number):
-               cmd = 'git log %s.. | grep -B 20 -E "(bug %s|#%s)"' \
+               cmd = 'git log %s.. | grep -B 20 -E \
+                     "(bug %s|#%s)|bugzilla.gnome.org/show_bug.cgi\?id=%s"' \
                      ' | tac | grep ^Author: | head -1' \
-                     % (self.last_tag, bug_number, bug_number)
+                     % (self.last_tag, bug_number, bug_number, bug_number)
                line = self.exec_cmd (cmd)
                p1 = line.find(" ")
                p2 = line.find("<")
@@ -174,9 +171,9 @@ class Project:
                commit_str = self.exec_cmd('git show %s' % (self.last_tag))
                for line in commit_str.splitlines():
                        if line.startswith('Date:'):
-                               time_str = line[5:line.rfind('+')].strip()
-                               t = time.strptime(time_str)
-                               last_tag_date = time.strftime('%Y-%m-%d', t)
+                               time_str = line[5:]
+                               t = dateutil.parser.parse(time_str)
+                               last_tag_date = t.strftime('%Y-%m-%d')
                                break
 
                query = 'http://bugzilla.gnome.org/buglist.cgi?' \
@@ -258,7 +255,7 @@ class Project:
 
        def upload_tarball(self):
                username = self._get_username()
-               tarball = '%s-%s.tar.gz' % (self.package_name.lower(), self.package_version)
+               tarball = '%s-%s.tar.xz' % (self.package_name.lower(), self.package_version)
 
                cmd = 'scp %s %s@%s:' % (tarball, username, upload_server)
                self.exec_cmd(cmd)
@@ -268,6 +265,7 @@ class Project:
 
        def send_email(self):
                notes = self.get_release_notes()
+                print notes
                cmd = 'xdg-email ' \
                      ' --cc telepathy@lists.freedesktop.org' \
                      ' --subject "ANNOUNCE: Empathy %s"' \