changeset 714:9aebdc00f58f

Merged.
author Mikkel Krøigård <mk@daimi.au.dk>
date Wed, 23 Apr 2008 16:18:25 +0200
parents 1f813a287ec5 c8f0898aff9d
children 55a855aa41e9
files
diffstat 8 files changed, 9 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsigs	Wed Apr 23 15:58:17 2008 +0200
+++ b/.hgsigs	Wed Apr 23 16:18:25 2008 +0200
@@ -1,2 +1,3 @@
 7e47fd0abed9673230a456e2f1b12794f6cf9d23 0 iD8DBQBHc/jr6nfwy35F3TgRAgxWAKDSuNK9UQtG01GqzmLZ5wwVKKlaygCfeA4xgSigRCOi3OOzXMdv4wmEcps=
 081094c8a3fb6ea46eb4e698e5038f1315b0ec69 0 iD8DBQBH2DMz6nfwy35F3TgRAnJ0AJ0fK1NE1J79kDOGW16Mae4d30AFUgCgzcuVGQn05U42FC+CZ+pmJUSkt9A=
+46636debbbe310bd6428fc4e6f3e0d412d991a29 0 iD8DBQBIDtlM6nfwy35F3TgRAv2FAJ9jNfLhwU1yhQ3yVAwa3jEmIkb85ACgmldTcT4VE1x1JuTONGQx0V8Dk2o=
--- a/.hgtags	Wed Apr 23 15:58:17 2008 +0200
+++ b/.hgtags	Wed Apr 23 16:18:25 2008 +0200
@@ -3,3 +3,4 @@
 63b4a2939abe4ec196a44919ba6306f247550ec0 0.2
 7e47fd0abed9673230a456e2f1b12794f6cf9d23 0.3
 081094c8a3fb6ea46eb4e698e5038f1315b0ec69 0.4
+46636debbbe310bd6428fc4e6f3e0d412d991a29 0.5rc1
--- a/MANIFEST.in	Wed Apr 23 15:58:17 2008 +0200
+++ b/MANIFEST.in	Wed Apr 23 16:18:25 2008 +0200
@@ -1,5 +1,3 @@
-include doc/design-talk/design-talk.pdf
-
 include doc/api/*.html
 include doc/api/*.gif
 include doc/api/*.png
--- a/NEWS	Wed Apr 23 15:58:17 2008 +0200
+++ b/NEWS	Wed Apr 23 16:18:25 2008 +0200
@@ -13,8 +13,8 @@
   http://tracker.viff.dk/
 
 
-Version 0.5, not yet released
------------------------------
+Version 0.5rc1, released on 2008-04-23
+--------------------------------------
 
 Added preliminary support for preprocessing and an efficient
 multiplication protocol which is secure against active adversaries.
--- a/apps/benchmark.py	Wed Apr 23 15:58:17 2008 +0200
+++ b/apps/benchmark.py	Wed Apr 23 16:18:25 2008 +0200
@@ -127,6 +127,7 @@
         self.operation = operation
 
         if isinstance(self.rt, ActiveRuntime) and self.operation == operator.mul:
+            # TODO: Make this optional and extend it to other operations.
             print "Starting preprocessing"
             program_desc = {
                 ("generate_triples", (Zp,)):
--- a/run.py	Wed Apr 23 15:58:17 2008 +0200
+++ b/run.py	Wed Apr 23 16:18:25 2008 +0200
@@ -104,18 +104,12 @@
     # Generate API docs in doc/api.
     epydoc('doc')
 
-    # First PDFLaTeX run...
-    execute(["pdflatex", "--interaction", "nonstopmode", "design-talk.tex"],
-            work_dir="doc/design-talk")
-    # Second run to update the table of contents.
-    execute(["pdflatex", "--interaction", "nonstopmode", "design-talk.tex"],
-            work_dir="doc/design-talk")
-
     # Retrieve the latest version of install.txt and authors.txt from
     # the website repository, and ship them as INSTALL and AUTHORS.
     for filename in ('install.txt', 'authors.txt'):
         url = 'http://hg.viff.dk/viff.dk/raw-file/tip/%s' % filename
-        print "Fetching %s" % url,
+        print "Fetching %s..." % url,
+        sys.stdout.flush()
         urlretrieve(url, filename[:-4].upper())
         print "done."
 
--- a/viff/__init__.py	Wed Apr 23 15:58:17 2008 +0200
+++ b/viff/__init__.py	Wed Apr 23 16:18:25 2008 +0200
@@ -124,5 +124,5 @@
 @see: U{http://viff.dk/}
 """
 
-__version__ = '0.4'
+__version__ = '0.5rc1'
 __license__ = 'GNU GPL'
--- a/viff/util.py	Wed Apr 23 15:58:17 2008 +0200
+++ b/viff/util.py	Wed Apr 23 16:18:25 2008 +0200
@@ -201,7 +201,7 @@
     If a prime is given as the lower bound, then this prime is
     returned:
 
-    >> find_prime(37)
+    >>> find_prime(37)
     37L
 
     The bound can be a Python expression as a string. This makes it