[pypy-commit] pypy memory-accounting: merge

2017-12-05 Thread arigo
Author: Armin Rigo Branch: memory-accounting Changeset: r93276:30c0f83e1e0f Date: 2017-12-05 19:12 +0100 http://bitbucket.org/pypy/pypy/changeset/30c0f83e1e0f/ Log:merge diff too long, truncating to 2000 out of 18247 lines diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @

[pypy-commit] pypy memory-accounting: add peak memory usage reporting

2017-12-05 Thread arigo
Author: Armin Rigo Branch: memory-accounting Changeset: r93275:1cdb7e0ad36b Date: 2017-12-05 19:11 +0100 http://bitbucket.org/pypy/pypy/changeset/1cdb7e0ad36b/ Log:add peak memory usage reporting diff --git a/pypy/module/gc/app_referents.py b/pypy/module/gc/app_referents.py --- a/pypy/module

[pypy-commit] pypy default: skip unicode tests of macos file names, as per cpython issue 31380

2017-12-05 Thread mattip
Author: Matti Picus Branch: Changeset: r93277:9dad012e168e Date: 2017-12-05 20:56 +0200 http://bitbucket.org/pypy/pypy/changeset/9dad012e168e/ Log:skip unicode tests of macos file names, as per cpython issue 31380 diff --git a/pypy/module/posix/test/test_posix2.py b/pypy/module/posix/test/

[pypy-commit] pypy py3.5: hg merge default

2017-12-05 Thread rlamy
Author: Ronan Lamy Branch: py3.5 Changeset: r93278:e7bcb8094e51 Date: 2017-12-05 22:02 + http://bitbucket.org/pypy/pypy/changeset/e7bcb8094e51/ Log:hg merge default diff --git a/lib_pypy/resource.py b/lib_pypy/resource.py --- a/lib_pypy/resource.py +++ b/lib_pypy/resource.py @@ -20,6 +20