Author: mattip <[email protected]> Branch: Changeset: r75685:22ce6f3699f0 Date: 2015-02-03 21:48 +0200 http://bitbucket.org/pypy/pypy/changeset/22ce6f3699f0/
Log: merge release-2.5.x into default to get documentation updates diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -42,19 +42,19 @@ Amaury Forgeot d'Arc Samuele Pedroni Alex Gaynor + Brian Kearns + Matti Picus + Philip Jenvey Michael Hudson David Schneider - Matti Picus - Brian Kearns - Philip Jenvey Holger Krekel Christian Tismer Hakan Ardo Benjamin Peterson Manuel Jacob + Ronan Lamy Anders Chrigstrom Eric van Riet Paap - Ronan Lamy Wim Lavrijsen Richard Emslie Alexander Schremmer @@ -68,9 +68,9 @@ Camillo Bruni Laura Creighton Toon Verwaest + Romain Guillebert Leonardo Santagada Seo Sanghyeon - Romain Guillebert Justin Peel Ronny Pfannschmidt David Edelsohn @@ -91,15 +91,16 @@ Michal Bendowski Jan de Mooij stian + Tyler Wade Michael Foord Stephan Diehl - Tyler Wade Stefan Schwarzer Valentino Volonghi Tomek Meka Patrick Maupin Bob Ippolito Bruno Gola + David Malcolm Jean-Paul Calderone Timo Paulssen Squeaky @@ -108,18 +109,19 @@ Marius Gedminas Martin Matusiak Konstantin Lopuhin + Wenzhu Man John Witulski - Wenzhu Man + Laurence Tratt + Ivan Sichmann Freitas Greg Price Dario Bertini Mark Pearse Simon Cross - Ivan Sichmann Freitas Andreas Stührk + Stefano Rivera Jean-Philippe St. Pierre Guido van Rossum Pavel Vinogradov - Stefano Rivera Paweł Piotr Przeradowski Paul deGrandis Ilya Osadchiy @@ -129,7 +131,6 @@ tav Taavi Burns Georg Brandl - Laurence Tratt Bert Freudenberg Stian Andreassen Wanja Saatkamp @@ -141,13 +142,12 @@ Jeremy Thurgood Rami Chowdhury Tobias Pape - David Malcolm Eugene Oden Henry Mason Vasily Kuznetsov Preston Timmons + David Ripton Jeff Terrace - David Ripton Dusty Phillips Lukas Renggli Guenter Jantzen @@ -166,13 +166,16 @@ Gintautas Miliauskas Michael Twomey Lucian Branescu Mihaila + Yichao Yu Gabriel Lavoie Olivier Dormond Jared Grubb Karl Bartel + Wouter van Heyst Brian Dorsey Victor Stinner Andrews Medina + anatoly techtonik Stuart Williams Jasper Schulz Christian Hudon @@ -182,12 +185,11 @@ Michael Cheng Justas Sadzevicius Gasper Zejn - anatoly techtonik Neil Shepperd + Stanislaw Halik Mikael Schönenberg Elmo M?ntynen Jonathan David Riehl - Stanislaw Halik Anders Qvist Corbin Simpson Chirag Jadwani @@ -196,10 +198,13 @@ Vincent Legoll Alan McIntyre Alexander Sedov + Attila Gobi Christopher Pope Christian Tismer Marc Abramowitz Dan Stromberg + Arjun Naik + Valentina Mukhamedzhanova Stefano Parmesan Alexis Daboville Jens-Uwe Mager @@ -213,8 +218,6 @@ Sylvain Thenault Nathan Taylor Vladimir Kryachko - Arjun Naik - Attila Gobi Jacek Generowicz Alejandro J. Cura Jacob Oscarson @@ -222,22 +225,23 @@ Ryan Gonzalez Ian Foote Kristjan Valur Jonsson + David Lievens Neil Blakey-Milner 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 Lene Wagner Tomo Cocoa + Toni Mattis + Lucas Stadler roberto@goyle Yury V. Zaytsev Anna Katrina Dominguez @@ -265,23 +269,30 @@ Stephan Busemann Rafał Gałczyński Christian Muirhead + Berker Peksag James Lan shoma hosaka - Daniel Neuh?user - Matthew Miller + Daniel Neuhäuser + Ben Mather + halgari + Boglarka Vezer + Chris Pressey Buck Golemon Konrad Delong Dinu Gherman Chris Lambacher [email protected] + Jim Baker Rodrigo Araújo - Jim Baker + Nikolaos-Digenis Karagiannis James Robert Armin Ronacher Brett Cannon + Donald Stufft yrttyr aliceinwire OlivierBlanvillain + Dan Sanders Zooko Wilcox-O Hearn Tomer Chachamu Christopher Groskopf @@ -295,6 +306,7 @@ Markus Unterwaditzer Even Wiik Thomassen jbs + squeaky soareschen Kurt Griffiths Mike Bayer @@ -306,6 +318,7 @@ Anna Ravencroft Dan Crosta Julien Phalip + Roman Podoliaka Dan Loewenherz Heinrich-Heine University, Germany diff --git a/pypy/doc/conf.py b/pypy/doc/conf.py --- a/pypy/doc/conf.py +++ b/pypy/doc/conf.py @@ -65,9 +65,9 @@ # built documents. # # The short X.Y version. -version = '2.4' +version = '2.5' # The full version, including alpha/beta/rc tags. -release = '2.4.0' +release = '2.5.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/pypy/doc/contributor.rst b/pypy/doc/contributor.rst --- a/pypy/doc/contributor.rst +++ b/pypy/doc/contributor.rst @@ -12,19 +12,19 @@ Amaury Forgeot d'Arc Samuele Pedroni Alex Gaynor + Brian Kearns + Matti Picus + Philip Jenvey Michael Hudson David Schneider - Matti Picus - Brian Kearns - Philip Jenvey Holger Krekel Christian Tismer Hakan Ardo Benjamin Peterson Manuel Jacob + Ronan Lamy Anders Chrigstrom Eric van Riet Paap - Ronan Lamy Wim Lavrijsen Richard Emslie Alexander Schremmer @@ -38,9 +38,9 @@ Camillo Bruni Laura Creighton Toon Verwaest + Romain Guillebert Leonardo Santagada Seo Sanghyeon - Romain Guillebert Justin Peel Ronny Pfannschmidt David Edelsohn @@ -61,15 +61,16 @@ Michal Bendowski Jan de Mooij stian + Tyler Wade Michael Foord Stephan Diehl - Tyler Wade Stefan Schwarzer Valentino Volonghi Tomek Meka Patrick Maupin Bob Ippolito Bruno Gola + David Malcolm Jean-Paul Calderone Timo Paulssen Squeaky @@ -78,18 +79,19 @@ Marius Gedminas Martin Matusiak Konstantin Lopuhin + Wenzhu Man John Witulski - Wenzhu Man + Laurence Tratt + Ivan Sichmann Freitas Greg Price Dario Bertini Mark Pearse Simon Cross - Ivan Sichmann Freitas Andreas Stührk + Stefano Rivera Jean-Philippe St. Pierre Guido van Rossum Pavel Vinogradov - Stefano Rivera Paweł Piotr Przeradowski Paul deGrandis Ilya Osadchiy @@ -99,7 +101,6 @@ tav Taavi Burns Georg Brandl - Laurence Tratt Bert Freudenberg Stian Andreassen Wanja Saatkamp @@ -111,13 +112,12 @@ Jeremy Thurgood Rami Chowdhury Tobias Pape - David Malcolm Eugene Oden Henry Mason Vasily Kuznetsov Preston Timmons + David Ripton Jeff Terrace - David Ripton Dusty Phillips Lukas Renggli Guenter Jantzen @@ -136,13 +136,16 @@ Gintautas Miliauskas Michael Twomey Lucian Branescu Mihaila + Yichao Yu Gabriel Lavoie Olivier Dormond Jared Grubb Karl Bartel + Wouter van Heyst Brian Dorsey Victor Stinner Andrews Medina + anatoly techtonik Stuart Williams Jasper Schulz Christian Hudon @@ -152,12 +155,11 @@ Michael Cheng Justas Sadzevicius Gasper Zejn - anatoly techtonik Neil Shepperd + Stanislaw Halik Mikael Schönenberg Elmo M?ntynen Jonathan David Riehl - Stanislaw Halik Anders Qvist Corbin Simpson Chirag Jadwani @@ -166,10 +168,13 @@ Vincent Legoll Alan McIntyre Alexander Sedov + Attila Gobi Christopher Pope Christian Tismer Marc Abramowitz Dan Stromberg + Arjun Naik + Valentina Mukhamedzhanova Stefano Parmesan Alexis Daboville Jens-Uwe Mager @@ -183,8 +188,6 @@ Sylvain Thenault Nathan Taylor Vladimir Kryachko - Arjun Naik - Attila Gobi Jacek Generowicz Alejandro J. Cura Jacob Oscarson @@ -192,22 +195,23 @@ Ryan Gonzalez Ian Foote Kristjan Valur Jonsson + David Lievens Neil Blakey-Milner 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 Lene Wagner Tomo Cocoa + Toni Mattis + Lucas Stadler roberto@goyle Yury V. Zaytsev Anna Katrina Dominguez @@ -235,23 +239,30 @@ Stephan Busemann Rafał Gałczyński Christian Muirhead + Berker Peksag James Lan shoma hosaka - Daniel Neuh?user - Matthew Miller + Daniel Neuhäuser + Ben Mather + halgari + Boglarka Vezer + Chris Pressey Buck Golemon Konrad Delong Dinu Gherman Chris Lambacher [email protected] + Jim Baker Rodrigo Araújo - Jim Baker + Nikolaos-Digenis Karagiannis James Robert Armin Ronacher Brett Cannon + Donald Stufft yrttyr aliceinwire OlivierBlanvillain + Dan Sanders Zooko Wilcox-O Hearn Tomer Chachamu Christopher Groskopf @@ -265,6 +276,7 @@ Markus Unterwaditzer Even Wiik Thomassen jbs + squeaky soareschen Kurt Griffiths Mike Bayer @@ -276,5 +288,6 @@ Anna Ravencroft Dan Crosta Julien Phalip + Roman Podoliaka Dan Loewenherz diff --git a/pypy/doc/how-to-release.rst b/pypy/doc/how-to-release.rst --- a/pypy/doc/how-to-release.rst +++ b/pypy/doc/how-to-release.rst @@ -22,12 +22,12 @@ will capture the revision number of this change for the release; some of the next updates may be done before or after branching; make sure things are ported back to the trunk and to the branch as - necessary; also update the version number in pypy/doc/conf.py, - and in pypy/doc/index.rst + necessary; also update the version number in pypy/doc/conf.py. * update pypy/doc/contributor.rst (and possibly LICENSE) pypy/doc/tool/makecontributor.py generates the list of contributors * rename pypy/doc/whatsnew_head.rst to whatsnew_VERSION.rst - and create a fresh whatsnew_head.rst after the release + create a fresh whatsnew_head.rst after the release + and add the new file to pypy/doc/index-of-whatsnew.rst * go to pypy/tool/release and run: force-builds.py <release branch> * wait for builds to complete, make sure there are no failures @@ -45,6 +45,7 @@ * write release announcement pypy/doc/release-x.y(.z).txt the release announcement should contain a direct link to the download page + and add new files to pypy/doc/index-of-release-notes.rst * update pypy.org (under extradoc/pypy.org), rebuild and commit * post announcement on morepypy.blogspot.com diff --git a/pypy/doc/index-of-release-notes.rst b/pypy/doc/index-of-release-notes.rst --- a/pypy/doc/index-of-release-notes.rst +++ b/pypy/doc/index-of-release-notes.rst @@ -6,6 +6,7 @@ .. toctree:: + release-2.5.0.rst release-2.4.0.rst release-2.3.1.rst release-2.3.0.rst diff --git a/pypy/doc/index-of-whatsnew.rst b/pypy/doc/index-of-whatsnew.rst --- a/pypy/doc/index-of-whatsnew.rst +++ b/pypy/doc/index-of-whatsnew.rst @@ -7,6 +7,7 @@ .. toctree:: whatsnew-head.rst + whatsnew-2.5.0.rst whatsnew-2.4.0.rst whatsnew-2.3.1.rst whatsnew-2.3.0.rst diff --git a/pypy/doc/project-ideas.rst b/pypy/doc/project-ideas.rst --- a/pypy/doc/project-ideas.rst +++ b/pypy/doc/project-ideas.rst @@ -191,3 +191,37 @@ to make them work at all if they currently don't. A part of this work would be to get cpyext into a shape where it supports running Cython generated extensions. + +====================================== +Make more python modules pypy-friendly +====================================== + +Work has been started on a few popular python packages. Here is a partial +list of good work that needs to be finished: + +**matplotlib** https://github.com/mattip/matplotlib + + Status: the repo is an older version of matplotlib adapted to pypy and cpyext + + TODO: A suggested first step would be to merge the differences into + matplotlib/HEAD. The major problem is the use of a generic view into a + numpy ndarray. The int* fields would need to be converted into int[MAX_DIMS] + c-arrays and filled in. + +**wxPython** https://bitbucket.org/waedt/wxpython_cffi + + Status: A GSOC 2013 project to adapt the Phoenix sip build system to cffi + + TODO: Merge the latest version of the wrappers and finish the sip conversion + +**pygame** https://github.com/CTPUG/pygame_cffi + + Status: see blog post <http://morepypy.blogspot.com/2014/03/pygamecffi-pygame-on-pypy.html> + + TODO: see the end of the blog post + +**pyopengl** https://bitbucket.org/duangle/pyopengl-cffi + + Status: unknown + + diff --git a/pypy/doc/release-2.5.0.rst b/pypy/doc/release-2.5.0.rst new file mode 100644 --- /dev/null +++ b/pypy/doc/release-2.5.0.rst @@ -0,0 +1,96 @@ +================================================= +PyPy 2.5 - XXXXXX +================================================= + +We're pleased to announce PyPy 2.5, which contains significant performance +enhancements and bug fixes. + +You can download the PyPy 2.5.0 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, as well as our +volunteers and contributors (10 new commiters joined PyPy since the last +release). +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 compatible version + we call PyPy3 2.4.0, and are working toward a Python 3.3 compatible version + +* `STM`_ (software transactional memory): We have released a first working version, + and continue to try out new promising paths of achieving 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 and cpython 2.7.x`_ performance comparison) +due to its integrated tracing JIT compiler. + +This release supports **x86** machines on most common operating systems +(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 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 +========== + +* The past months have seen pypy mature and grow, as rpython becomes the goto + solution for writing fast dynamic language interpreters. Our separation of + rpython and the python interpreter PyPy is now much clearer in the + `PyPy documentation`_ and we now have seperate `Rpython documentation`_. + +* We have improved warmup time as well as jitted code performance: more than 10% + compared to pypy-2.4.0, due to internal cleanup and gc nursery improvements. + +* Our integrated numpy support gained much of the GenericUfunc api in order to + support the lapack/blas linalg module of numpy. This dovetails with work in the + pypy/numpy repository to support linalg both through the (slower) cpyext capi + interface and also via (the faster) pure python cffi interface, using an + extended frompyfunc() api. We will soon post a seperate blog post specifically + about linalg and PyPy. + +* Dictionaries are now ordered by default, see the `blog post`_ + +* Our nightly translations use --shared by default, including on OS/X and linux + +* We now more carefully handle errno (and GetLastError, WSAGetLastError) tying + the handlers as close as possible to the external function call, in non-jitted + as well as jitted code. + +* Issues reported with our previous release were resolved_ after reports from users on + our issue tracker at https://bitbucket.org/pypy/pypy/issues or on IRC at + #pypy. + +.. _`PyPy documentation`: http://doc.pypy.org +.. _`Rpython documentation`: http://rpython.readthedocs.org +.. _`blog post`: http://morepypy.blogspot.com/2015/01/faster-more-memory-efficient-and-more.html +.. _`whats-new`: http://doc.pypy.org/en/latest/whatsnew-2.5.0.html + +We have further improvements on the way: rpython file handling, +finishing numpy linalg compatibility, numpy object dtypes, a better profiler, +as well as support for Python stdlib 2.7.9. + +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/whatsnew-2.5.0.rst b/pypy/doc/whatsnew-2.5.0.rst new file mode 100644 --- /dev/null +++ b/pypy/doc/whatsnew-2.5.0.rst @@ -0,0 +1,139 @@ +======================= +What's new in PyPy 2.5 +======================= + +.. this is a revision shortly after release-2.4.x +.. startrev: 7026746cbb1b + +.. branch: win32-fixes5 + +Fix c code generation for msvc so empty "{ }" are avoided in unions, +Avoid re-opening files created with NamedTemporaryFile, +Allocate by 4-byte chunks in rffi_platform, +Skip testing objdump if it does not exist, +and other small adjustments in own tests + +.. branch: rtyper-stuff + +Small internal refactorings in the rtyper. + +.. branch: var-in-Some + +Store annotations on the Variable objects, rather than in a big dict. +Introduce a new framework for double-dispatched annotation implementations. + +.. branch: ClassRepr + +Refactor ClassRepr and make normalizecalls independent of the rtyper. + +.. branch: remove-remaining-smm + +Remove all remaining multimethods. + +.. branch: improve-docs + +Split RPython documentation from PyPy documentation and clean up. There now is +a clearer separation between documentation for users, developers and people +interested in background information. + +.. branch: kill-multimethod + +Kill multimethod machinery, all multimethods were removed earlier. + +.. branch nditer-external_loop + +Implement `external_loop` arguement to numpy's nditer + +.. branch kill-rctime + +Rename pypy/module/rctime to pypy/module/time, since it contains the implementation of the 'time' module. + +.. branch: ssa-flow + +Use SSA form for flow graphs inside build_flow() and part of simplify_graph() + +.. branch: ufuncapi + +Implement most of the GenericUfunc api to support numpy linalg. The strategy is +to encourage use of pure python or cffi ufuncs by extending frompyfunc(). +See the docstring of frompyfunc for more details. This dovetails with a branch +of pypy/numpy - cffi-linalg which is a rewrite of the _umath_linalg module in +python, calling lapack from cffi. The branch also support traditional use of +cpyext GenericUfunc definitions in c. + +.. branch: all_ordered_dicts + +This makes ordered dicts the default dictionary implementation in +RPython and in PyPy. It polishes the basic idea of rordereddict.py +and then fixes various things, up to simplifying +collections.OrderedDict. + +Note: Python programs can rely on the guaranteed dict order in PyPy +now, but for compatibility with other Python implementations they +should still use collections.OrderedDict where that really matters. +Also, support for reversed() was *not* added to the 'dict' class; +use OrderedDict. + +Benchmark results: in the noise. A few benchmarks see good speed +improvements but the average is very close to parity. + +.. branch: berkerpeksag/fix-broken-link-in-readmerst-1415127402066 +.. branch: bigint-with-int-ops +.. branch: dstufft/update-pip-bootstrap-location-to-the-new-1420760611527 +.. branch: float-opt +.. branch: gc-incminimark-pinning + +This branch adds an interface rgc.pin which would (very temporarily) +make object non-movable. That's used by rffi.alloc_buffer and +rffi.get_nonmovable_buffer and improves performance considerably for +IO operations. + +.. branch: gc_no_cleanup_nursery + +A branch started by Wenzhu Man (SoC'14) and then done by fijal. It +removes the clearing of the nursery. The drawback is that new objects +are not automatically filled with zeros any longer, which needs some +care, mostly for GC references (which the GC tries to follow, so they +must not contain garbage). The benefit is a quite large speed-up. + +.. branch: improve-gc-tracing-hooks +.. branch: improve-ptr-conv-error +.. branch: intern-not-immortal + +Fix intern() to return mortal strings, like in CPython. + +.. branch: issue1922-take2 +.. branch: kill-exported-symbols-list +.. branch: kill-rctime +.. branch: kill_ll_termios +.. branch: look-into-all-modules +.. branch: nditer-external_loop +.. branch: numpy-generic-item +.. branch: osx-shared + +``--shared`` support on OS/X (thanks wouter) + +.. branch: portable-threadlocal +.. branch: pypy-dont-copy-ops +.. branch: recursion_and_inlining +.. branch: slim-down-resumedescr +.. branch: squeaky/use-cflags-for-compiling-asm +.. branch: unicode-fix +.. branch: zlib_zdict + +.. branch: errno-again + +Changes how errno, GetLastError, and WSAGetLastError are handled. +The idea is to tie reading the error status as close as possible to +the external function call. This fixes some bugs, both of the very +rare kind (e.g. errno on Linux might in theory be overwritten by +mmap(), called rarely during major GCs, if such a major GC occurs at +exactly the wrong time), and some of the less rare kind +(particularly on Windows tests). + +.. branch: osx-package.py +.. branch: package.py-helpful-error-message + +.. branch: typed-cells + +Improve performance of integer globals and class attributes. diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst --- a/pypy/doc/whatsnew-head.rst +++ b/pypy/doc/whatsnew-head.rst @@ -2,138 +2,6 @@ What's new in PyPy 2.5+ ======================= -.. this is a revision shortly after release-2.4.x -.. startrev: 7026746cbb1b +.. this is a revision shortly after release-2.5.x +.. startrev: 397b96217b85 -.. branch: win32-fixes5 - -Fix c code generation for msvc so empty "{ }" are avoided in unions, -Avoid re-opening files created with NamedTemporaryFile, -Allocate by 4-byte chunks in rffi_platform, -Skip testing objdump if it does not exist, -and other small adjustments in own tests - -.. branch: rtyper-stuff - -Small internal refactorings in the rtyper. - -.. branch: var-in-Some - -Store annotations on the Variable objects, rather than in a big dict. -Introduce a new framework for double-dispatched annotation implementations. - -.. branch: ClassRepr - -Refactor ClassRepr and make normalizecalls independent of the rtyper. - -.. branch: remove-remaining-smm - -Remove all remaining multimethods. - -.. branch: improve-docs - -Split RPython documentation from PyPy documentation and clean up. There now is -a clearer separation between documentation for users, developers and people -interested in background information. - -.. branch: kill-multimethod - -Kill multimethod machinery, all multimethods were removed earlier. - -.. branch nditer-external_loop - -Implement `external_loop` arguement to numpy's nditer - -.. branch kill-rctime - -Rename pypy/module/rctime to pypy/module/time, since it contains the implementation of the 'time' module. - -.. branch: ssa-flow - -Use SSA form for flow graphs inside build_flow() and part of simplify_graph() - -.. branch: ufuncapi - -Implement most of the GenericUfunc api to support numpy linalg. The strategy is -to encourage use of pure python or cffi ufuncs by extending frompyfunc(). -See the docstring of frompyfunc for more details. This dovetails with a branch -of pypy/numpy - cffi-linalg which is a rewrite of the _umath_linalg module in -python, calling lapack from cffi. The branch also support traditional use of -cpyext GenericUfunc definitions in c. - -.. branch: all_ordered_dicts - -This makes ordered dicts the default dictionary implementation in -RPython and in PyPy. It polishes the basic idea of rordereddict.py -and then fixes various things, up to simplifying -collections.OrderedDict. - -Note: Python programs can rely on the guaranteed dict order in PyPy -now, but for compatibility with other Python implementations they -should still use collections.OrderedDict where that really matters. -Also, support for reversed() was *not* added to the 'dict' class; -use OrderedDict. - -Benchmark results: in the noise. A few benchmarks see good speed -improvements but the average is very close to parity. - -.. branch: berkerpeksag/fix-broken-link-in-readmerst-1415127402066 -.. branch: bigint-with-int-ops -.. branch: dstufft/update-pip-bootstrap-location-to-the-new-1420760611527 -.. branch: float-opt -.. branch: gc-incminimark-pinning - -This branch adds an interface rgc.pin which would (very temporarily) -make object non-movable. That's used by rffi.alloc_buffer and -rffi.get_nonmovable_buffer and improves performance considerably for -IO operations. - -.. branch: gc_no_cleanup_nursery - -A branch started by Wenzhu Man (SoC'14) and then done by fijal. It -removes the clearing of the nursery. The drawback is that new objects -are not automatically filled with zeros any longer, which needs some -care, mostly for GC references (which the GC tries to follow, so they -must not contain garbage). The benefit is a quite large speed-up. - -.. branch: improve-gc-tracing-hooks -.. branch: improve-ptr-conv-error -.. branch: intern-not-immortal - -Fix intern() to return mortal strings, like in CPython. - -.. branch: issue1922-take2 -.. branch: kill-exported-symbols-list -.. branch: kill-rctime -.. branch: kill_ll_termios -.. branch: look-into-all-modules -.. branch: nditer-external_loop -.. branch: numpy-generic-item -.. branch: osx-shared - -``--shared`` support on OS/X (thanks wouter) - -.. branch: portable-threadlocal -.. branch: pypy-dont-copy-ops -.. branch: recursion_and_inlining -.. branch: slim-down-resumedescr -.. branch: squeaky/use-cflags-for-compiling-asm -.. branch: unicode-fix -.. branch: zlib_zdict - -.. branch: errno-again - -Changes how errno, GetLastError, and WSAGetLastError are handled. -The idea is to tie reading the error status as close as possible to -the external function call. This fixes some bugs, both of the very -rare kind (e.g. errno on Linux might in theory be overwritten by -mmap(), called rarely during major GCs, if such a major GC occurs at -exactly the wrong time), and some of the less rare kind -(particularly on Windows tests). - -.. branch: osx-package.py -.. branch: package.py-helpful-error-message - -.. branch: typed-cells - -Improve performance of integer globals and class attributes. diff --git a/pypy/module/cpyext/include/patchlevel.h b/pypy/module/cpyext/include/patchlevel.h --- a/pypy/module/cpyext/include/patchlevel.h +++ b/pypy/module/cpyext/include/patchlevel.h @@ -29,7 +29,7 @@ #define PY_VERSION "2.7.8" /* PyPy version as a string */ -#define PYPY_VERSION "2.6.0-alpha0" +#define PYPY_VERSION "2.5.0" /* Subversion Revision number of this file (not of the repository). * Empty since Mercurial migration. */ diff --git a/pypy/module/sys/version.py b/pypy/module/sys/version.py --- a/pypy/module/sys/version.py +++ b/pypy/module/sys/version.py @@ -10,7 +10,7 @@ #XXX # sync CPYTHON_VERSION with patchlevel.h, package.py CPYTHON_API_VERSION = 1013 #XXX # sync with include/modsupport.h -PYPY_VERSION = (2, 6, 0, "alpha", 0) #XXX # sync patchlevel.h +PYPY_VERSION = (2, 5, 0, "final", 0) #XXX # sync patchlevel.h if platform.name == 'msvc': COMPILER_INFO = 'MSC v.%d 32 bit' % (platform.version * 10 + 600) _______________________________________________ pypy-commit mailing list [email protected] https://mail.python.org/mailman/listinfo/pypy-commit
