Author: Matti Picus <matti.pi...@gmail.com> Branch: py3.5 Changeset: r90675:a1ba0fb0c9fe Date: 2017-03-14 13:26 +0200 http://bitbucket.org/pypy/pypy/changeset/a1ba0fb0c9fe/
Log: Merge release-pypy3.3-5.x into py3.5 diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -34,3 +34,4 @@ 050d84dd78997f021acf0e133934275d63547cc0 release-pypy2.7-v5.4.1 0e2d9a73f5a1818d0245d75daccdbe21b2d5c3ef release-pypy2.7-v5.4.1 aff251e543859ce4508159dd9f1a82a2f553de00 release-pypy2.7-v5.6.0 +ea9979b550eeae87924dc4bef06070e8f8d0e22f release-pypy3.3-5.5.0 diff --git a/pypy/doc/contributor.rst b/pypy/doc/contributor.rst --- a/pypy/doc/contributor.rst +++ b/pypy/doc/contributor.rst @@ -64,6 +64,7 @@ Michal Bendowski stian Jan de Mooij + Spenser Bauman Tyler Wade Vincent Legoll Michael Foord @@ -311,6 +312,7 @@ Asmo Soinio jiaaro Mads Kiilerich + JohnDoe Antony Lee Jason Madden Daniel Neuhäuser diff --git a/pypy/doc/whatsnew-pypy3-head.rst b/pypy/doc/release-pypy3.3-5.5.0.rst copy from pypy/doc/whatsnew-pypy3-head.rst copy to pypy/doc/release-pypy3.3-5.5.0.rst diff --git a/pypy/doc/whatsnew-pypy3-head.rst b/pypy/doc/whatsnew-pypy3-head.rst --- a/pypy/doc/whatsnew-pypy3-head.rst +++ b/pypy/doc/whatsnew-pypy3-head.rst @@ -1,37 +1,9 @@ ======================== -What's new in PyPy3 2.4+ +What's new in PyPy3 5.5+ ======================== -.. this is the revision after pypy3-release-2.4.x was branched -.. startrev: 3f967c2be00e - -.. branch: py3k-memoryview - -Implement new memoryview features. - -.. branch: py3.3 - -.. branch: py3.3-hashfix - -Use intobject hash function for specialisedtuple - -.. branch: follow_symlinks - -Add support for dir_fd and follow_symlinks in posix.stat() - -.. branch: stat_ns - -Implement the st_xtime_ns fields in stat_result() - -.. branch: 33_fix_itertools - -Add pickling support for the itertools classes - -.. branch: py3k-update - -.. branch: py3k-get_clock_info - -.. branch: py3k-update +.. this is the revision after release-pypy3.3-5.5.x was branched +.. startrev: c5fb5db3c8ee .. branch: py3.5-time @@ -39,4 +11,4 @@ .. branch: PEP393 -Implement some level of compatibility with PEP 393 APIs. +Implement some level of compatibility with PEP 393 APIs. \ No newline at end of file _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit
