Author: Brian Kearns <bdkea...@gmail.com>
Branch: 
Changeset: r73166:0628cfb76bd5
Date: 2014-08-29 10:38 -0400
http://bitbucket.org/pypy/pypy/changeset/0628cfb76bd5/

Log:    merge heads

diff --git a/pypy/doc/contributor.rst b/pypy/doc/contributor.rst
--- a/pypy/doc/contributor.rst
+++ b/pypy/doc/contributor.rst
@@ -25,8 +25,8 @@
   Manuel Jacob
   Anders Chrigstrom
   Eric van Riet Paap
+  Ronan Lamy
   Wim Lavrijsen
-  Ronan Lamy
   Richard Emslie
   Alexander Schremmer
   Dan Villiom Podlaski Christiansen
@@ -35,10 +35,10 @@
   Anders Lehmann
   Aurelien Campeas
   Niklaus Haldimann
+  Remi Meier
   Camillo Bruni
   Laura Creighton
   Toon Verwaest
-  Remi Meier
   Leonardo Santagada
   Seo Sanghyeon
   Romain Guillebert
@@ -50,6 +50,7 @@
   Guido Wesdorp
   Lawrence Oluyede
   Bartosz Skowron
+  Gregor Wegberg
   Daniel Roberts
   Niko Matsakis
   Adrien Di Mascio
@@ -63,6 +64,7 @@
   stian
   Michael Foord
   Stephan Diehl
+  Tyler Wade
   Stefan Schwarzer
   Valentino Volonghi
   Tomek Meka
@@ -75,43 +77,45 @@
   Alexandre Fayolle
   Simon Burton
   Marius Gedminas
+  Martin Matusiak
+  Konstantin Lopuhin
   John Witulski
-  Konstantin Lopuhin
+  wenzhu man
   Greg Price
   Dario Bertini
   Mark Pearse
   Simon Cross
+  Ivan Sichmann Freitas
   Andreas St&#252;hrk
   Jean-Philippe St. Pierre
   Guido van Rossum
   Pavel Vinogradov
+  Stefano Rivera
   Pawe&#322; Piotr Przeradowski
   Paul deGrandis
   Ilya Osadchiy
   Tobias Oberstein
   Adrian Kuhn
   Boris Feigin
-  Stefano Rivera
   tav
   Taavi Burns
   Georg Brandl
+  Laurence Tratt
   Bert Freudenberg
   Stian Andreassen
-  Laurence Tratt
   Wanja Saatkamp
-  Ivan Sichmann Freitas
   Gerald Klix
   Mike Blume
   Oscar Nierstrasz
   Stefan H. Muller
+  Edd Barrett
   Jeremy Thurgood
-  Gregor Wegberg
   Rami Chowdhury
   Tobias Pape
-  Edd Barrett
   David Malcolm
   Eugene Oden
   Henry Mason
+  Vasily Kuznetsov
   Preston Timmons
   Jeff Terrace
   David Ripton
@@ -128,12 +132,11 @@
   Nicholas Riley
   Jason Chu
   Igor Trindade Oliveira
+  Tim Felgentreff
   Rocco Moretti
   Gintautas Miliauskas
   Michael Twomey
   Lucian Branescu Mihaila
-  Tim Felgentreff
-  Tyler Wade
   Gabriel Lavoie
   Olivier Dormond
   Jared Grubb
@@ -149,22 +152,22 @@
   Aaron Iles
   Michael Cheng
   Justas Sadzevicius
+  Gasper Zejn
+  anatoly techtonik
+  Neil Shepperd
   Mikael Sch&#246;nenberg
-  Gasper Zejn
-  Neil Shepperd
-  Elmo M&#228;ntynen
+  Elmo M?ntynen
   Jonathan David Riehl
   Stanislaw Halik
   Anders Qvist
+  Corbin Simpson
   Chirag Jadwani
   Beatrice During
   Alex Perry
   Vincent Legoll
   Alan McIntyre
   Alexander Sedov
-  Corbin Simpson
   Christopher Pope
-  wenzhuman
   Christian Tismer 
   Marc Abramowitz
   Dan Stromberg
@@ -174,29 +177,33 @@
   Carl Meyer
   Karl Ramm
   Pieter Zieschang
+  Sebastian Pawlu&#347;
   Gabriel
   Lukas Vacek
   Andrew Dalke
   Sylvain Thenault
   Nathan Taylor
   Vladimir Kryachko
+  Arjun Naik
+  Attila Gobi
   Jacek Generowicz
   Alejandro J. Cura
   Jacob Oscarson
   Travis Francis Athougies
   Ryan Gonzalez
+  Ian Foote
   Kristjan Valur Jonsson
-  Sebastian Pawlu&#347;
   Neil Blakey-Milner
-  anatoly techtonik
   Lutz Paelike
   Lucio Torre
   Lars Wassermann
+  Valentina Mukhamedzhanova
   Henrik Vendelbo
   Dan Buch
   Miguel de Val Borro
   Artur Lisiecki
   Sergey Kishchenko
+  Yichao Yu
   Ignas Mikalajunas
   Christoph Gerum
   Martin Blais
@@ -209,6 +216,7 @@
   Bobby Impollonia
   t...@eistee.fritz.box
   Andrew Thompson
+  Yusei Tahara
   Ben Darnell
   Roberto De Ioris
   Juan Francisco Cantero Hurtado
@@ -219,6 +227,7 @@
   Michael Hudson-Doyle
   Anders Sigfridsson
   Yasir Suhail
+  Jason Michalski
   rafalgalczyn...@gmail.com
   Floris Bruynooghe
   Laurens Van Houtven
@@ -226,7 +235,6 @@
   Gustavo Niemeyer
   Stephan Busemann
   Rafa&#322; Ga&#322;czy&#324;ski
-  Yusei Tahara
   Christian Muirhead
   James Lan
   shoma hosaka
@@ -238,7 +246,6 @@
   Chris Lambacher
   coolbutusel...@gmail.com
   Rodrigo Ara&#250;jo
-  w31rd0
   Jim Baker
   James Robert
   Armin Ronacher
@@ -252,6 +259,7 @@
   Asmo Soinio
   Stefan Marr
   jiaaro
+  Mads Kiilerich
   opassembler.py
   Antony Lee
   Jim Hunziker
@@ -261,11 +269,13 @@
   soareschen
   Kurt Griffiths
   Mike Bayer
+  Matthew Miller
   Flavio Percoco
   Kristoffer Kleine
   yasirs
   Michael Chermside
   Anna Ravencroft
+  Dan Crosta
   Julien Phalip
   Dan Loewenherz
 
diff --git a/pypy/doc/release-2.4.rst b/pypy/doc/release-2.4.rst
new file mode 100644
--- /dev/null
+++ b/pypy/doc/release-2.4.rst
@@ -0,0 +1,107 @@
+=================================================
+PyPy 2.4 - ????????
+=================================================
+
+We're pleased to announce PyPy 2.4, a significant milestone on it's own right
+and the proud parent of our recent PyPy3 and STM releases.
+
+This release contains several improvements and bugfixes.
+
+You can download the PyPy 2.4 release here:
+
+    http://pypy.org/download.html
+
+We would like to thank our donors for the continued support of the PyPy
+project, and for those who donate to our three sub-projects.
+We've shown quite a bit of progress 
+but we're slowly running out of funds.
+Please consider donating more, or even better convince your employer to donate,
+so we can finish those projects!  The three sub-projects are:
+
+* `Py3k`_ (supporting Python 3.x): We have released a Python 3.2.5 compatable 
version
+   we call PyPy3 2.3.1, and are working toward a Python 3.3 compatable version
+
+* `STM`_ (software transactional memory): We have release a first working 
version, and
+continue to try out new promising paths of acheiving a fast multithreaded 
python
+
+* `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
+.. _`on bitbucket`: https://www.bitbucket.org/pypy/numpy   
+
+What is PyPy?
+=============
+
+PyPy is a very compliant Python interpreter, almost a drop-in replacement for
+CPython 2.7. It's fast (`pypy 2.3 and cpython 2.7.x`_ performance comparison;
+note that cpython's speed has not changed since 2.7.2)
+due to its integrated tracing JIT compiler.
+
+This release supports x86 machines running Linux 32/64, Mac OS X 64, Windows,
+and OpenBSD,
+as well as newer ARM hardware (ARMv6 or ARMv7, with VFPv3) running Linux. 
+
+While we support 32 bit python on Windows, work on the native Windows 64
+bit python is still stalling, we would welcome a volunteer
+to `handle that`_.
+
+.. _`pypy 2.3 and cpython 2.7.x`: http://speed.pypy.org
+.. _`handle that`: 
http://doc.pypy.org/en/latest/windows.html#what-is-missing-for-a-full-64-bit-translation
+
+Highlights
+==========
+
+Benchmarks improved after internal improvements in string and bytearray 
handling,
+and a major rewrite of the GIL handling. Many of these improvements are 
offshoots
+of the STM work.
+
+We merged in Python's 2.7.8 stdlib in a record time of one week, proving the
+maturity of our underlying RPython code base and PyPy interpreter.
+
+We welcomed more than 12 new contributors, and conducted two Google Summer of 
Code
+projects XXX details?
+
+Issues reported with our previous release were fixed after reports from users 
on
+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`_:
+
+* Reduced internal copying of bytearray operations
+
+* Tweak the internal structure of StringBuilder to speed up large string
+handling, which becomes advantageous on large programs at the cost of slightly
+slower small *benchmark* type programs.
+
+* Boost performance of thread-local variables in both unjitted and jitted code
+
+* Move to a mixed polling and mutex GIL model that make mutli-threaded jitted
+  code run *much* faster
+
+* Optimize errno handling in linux
+
+* Remove ctypes pythonapi and ctypes.PyDLL, which never worked on PyPy
+
+* Fix performance regression on ufunc(<scalar>, <scalar>) in numpy
+
+* Classes in the ast module are now distinct from structures used by the 
compiler,
+  which simplifies and speeds up translation of our source code to the PyPy 
binary
+  interpreter
+
+* Upgrade stdlib from 2.7.5 to 2.7.8
+
+* 
+
+* Many issues were resolved_ since the 2.3.1 release on June 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!
+
+Cheers
+
+The PyPy Team
+
diff --git a/pypy/doc/tool/makecontributor.py b/pypy/doc/tool/makecontributor.py
--- a/pypy/doc/tool/makecontributor.py
+++ b/pypy/doc/tool/makecontributor.py
@@ -67,6 +67,8 @@
     'Edd Barrett': ['edd'],
     'Manuel Jacob': ['mjacob'],
     'Rami Chowdhury': ['necaris'],
+    'Stanislaw Halik':['w31rd0'],
+    'wenzhu man':['wenzhuman'],
     }
 
 alias_map = {}
diff --git a/pytest.py b/pytest.py
--- a/pytest.py
+++ b/pytest.py
@@ -8,6 +8,21 @@
 if __name__ == '__main__': # if run as a script or by 'python -m pytest'
     # we trigger the below "else" condition by the following import
     import pytest
+    import sys
+    if sys.platform == 'win32':
+        #Try to avoid opeing a dialog box if one of the tests causes a system 
error
+        import ctypes
+        winapi = ctypes.windll.kernel32
+        SetErrorMode = winapi.SetErrorMode
+        SetErrorMode.argtypes=[ctypes.c_int]
+
+        SEM_FAILCRITICALERRORS = 1
+        SEM_NOGPFAULTERRORBOX  = 2
+        SEM_NOOPENFILEERRORBOX = 0x8000
+        flags = SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX | 
SEM_NOOPENFILEERRORBOX
+        #Since there is no GetErrorMode, do a double Set
+        old_mode = SetErrorMode(flags)
+        SetErrorMode(old_mode | flags)
     raise SystemExit(pytest.main())
 
 # else we are imported
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to