merge default into release

3 files changed, 26 insertions, 24 deletions

diff --git a/pypy/doc/release-2.3.1.rst b/pypy/doc/release-2.3.1.rst
index 1e4ad1e405..5b8a06b96f 100644
--- a/pypy/doc/release-2.3.1.rst
+++ b/pypy/doc/release-2.3.1.rst
@@ -1,6 +1,6 @@
-=======================================
-PyPy 2.3 - Terrestrial Arthropod Trap
-=======================================
+=================================================
+PyPy 2.3.1 - Terrestrial Arthropod Trap Revisited
+=================================================
 
 We're pleased to announce PyPy 2.3.1, a feature-and-bugfix improvement over our
 recent release last month.
@@ -23,11 +23,12 @@ so we can finish those projects!  The three sub-projects are:
 * `STM`_ (software transactional memory): a preview will be released very soon,
   once we fix a few bugs
 
-* `NumPy`_ which is included in the PyPy 2.3 release. More details below.
+* `NumPy`_ which requires installation of our fork of upstream numpy, available `on bitbucket`_
 
 .. _`Py3k`: http://pypy.org/py3donate.html
 .. _`STM`: http://pypy.org/tmdonate2.html
-.. _ `NumPy`: http://pypy.org/numpydonate.html
+.. _`NumPy`: http://pypy.org/numpydonate.html
+.. _`on bitbucket`: https://www.bitbucket.org/pypy/numpy   
 
 What is PyPy?
 =============
@@ -56,7 +57,7 @@ our new issue tracker at https://bitbucket.org/pypy/pypy/issues or on IRC at
 #pypy. Here is a summary of the user-facing changes;
 for more information see `whats-new`_:
 
-* The builting ``struct`` module was renamed to ``_struct``, solving issues
+* The built-in ``struct`` module was renamed to ``_struct``, solving issues
   with IDLE and other modules.
 
 * Support for compilation with gcc-4.9
@@ -67,9 +68,10 @@ for more information see `whats-new`_:
 
 * A CFFI-based version of the gdbm module is now included in our downloads
 
-.. _`HippyVM`: http://www.hippyvm.com
-.. _`whats-new`: http://doc.pypy.org/en/latest/whatsnew-2.3.0.html
+* Many issues were resolved_ since the 2.3 release on May 8
 
+.. _`whats-new`: http://doc.pypy.org/en/latest/whatsnew-2.3.1.html
+.. _resolved: https://bitbucket.org/pypy/pypy/issues?status=resolved
 Please try it out and let us know what you think. We especially welcome
 success stories, we know you are using PyPy, please tell us about it!
 
diff --git a/pypy/doc/whatsnew-2.3.1.rst b/pypy/doc/whatsnew-2.3.1.rst
index 57eee23f89..6cd0827ae7 100644
--- a/pypy/doc/whatsnew-2.3.1.rst
+++ b/pypy/doc/whatsnew-2.3.1.rst
@@ -9,8 +9,6 @@ Move builtin ``struct`` module to ``_struct`` to allow ``pypy "-m idlelib.idle"`
 
 Support compilation with gcc-4.9
 
-Fixes for issues #1769, #1764, #1762, #1752
-
 Added support for the stdlib gdbm module via cffi
 
 Annotator cleanups
diff --git a/pypy/tool/release/package.py b/pypy/tool/release/package.py
index 7d26036a53..41cc59ed8c 100755
--- a/pypy/tool/release/package.py
+++ b/pypy/tool/release/package.py
@@ -52,7 +52,8 @@ def fix_permissions(dirname):
 
 sep_template = "\nThis copy of PyPy includes a copy of %s, which is licensed under the following terms:\n\n"
 
-def generate_license_linux(base_file, options):
+def generate_license_linux(basedir, options):
+    base_file = str(basedir.join('LICENSE'))
     with open(base_file) as fid:
         txt = fid.read()
     searches = [("bzip2","libbz2-*", "copyright", '---------'),
@@ -63,7 +64,8 @@ def generate_license_linux(base_file, options):
         txt += "License for '%s'" %name
         txt += '\n' + "="*(14 + len(name)) + '\n'
         txt += sep_template % name
-        with open('lib_pypy/_tkinter/license.terms', 'r') as fid:
+        base_file = str(basedir.join('lib_pypy/_tkinter/license.terms'))
+        with open(base_file, 'r') as fid:
             txt += fid.read()
     for name, pat, fname, first_line in searches:
         txt += "License for '" + name + "'"
@@ -90,7 +92,8 @@ def generate_license_linux(base_file, options):
     txt += gdbm_bit
     return txt
 
-def generate_license_windows(base_file, options):
+def generate_license_windows(basedir, options):
+    base_file = str(basedir.join('LICENSE'))
     with open(base_file) as fid:
         txt = fid.read()
     # shutil.copyfileobj(open("crtlicense.txt"), out) # We do not ship msvc runtime files
@@ -99,7 +102,8 @@ def generate_license_windows(base_file, options):
         txt += "License for '%s'" %name
         txt += '\n' + "="*(14 + len(name)) + '\n'
         txt += sep_template % name
-        with open('lib_pypy/_tkinter/license.terms', 'r') as fid:
+        base_file = str(basedir.join('lib_pypy/_tkinter/license.terms'))
+        with open(base_file, 'r') as fid:
             txt += fid.read()
     for name, pat, file in (("bzip2","bzip2-*", "LICENSE"),
                       ("openssl", "openssl-*", "LICENSE")):
@@ -114,16 +118,9 @@ def generate_license_windows(base_file, options):
             txt += fid.read()
     return txt
 
-def generate_license_darwin(base_file, options):
+def generate_license_darwin(basedir, options):
     # where are copyright files on macos?
-    try:
-        return generate_license_linux(base_file, options)
-    except:
-        import traceback; traceback.print_exc()
-        pass
-    with open(base_file) as fid:
-        txt = fid.read()
-    return txt
+    return generate_license_linux(basedir, options)
 
 if sys.platform == 'win32':
     generate_license = generate_license_windows
@@ -254,12 +251,17 @@ directory next to the dlls, as per build instructions."""
         shutil.copyfile(str(basedir.join('lib_pypy', file)),
                         str(pypydir.join('lib_pypy', file)))
     try:
-        license = generate_license(str(basedir.join('LICENSE')), options)
+        license = generate_license(basedir, options)
         with open(str(pypydir.join('LICENSE')), 'w') as LICENSE:
             LICENSE.write(license)
     except:
         # Non-fatal error, use original LICENCE file
         import traceback;traceback.print_exc()
+        base_file = str(basedir.join('LICENSE'))
+        with open(base_file) as fid:
+            license = fid.read()
+        with open(str(pypydir.join('LICENSE')), 'w') as LICENSE:
+            LICENSE.write(license)
         retval = -1
     #
     spdir = pypydir.ensure('site-packages', dir=True)