[pypy-commit] pypy release-pypy3.6-v7.x: fix bad merge

2019-12-07 Thread mattip
Author: Matti Picus Branch: release-pypy3.6-v7.x Changeset: r98256:23a8a6861343 Date: 2019-12-08 09:15 +0200 http://bitbucket.org/pypy/pypy/changeset/23a8a6861343/ Log:fix bad merge diff --git a/pypy/module/cpyext/dictobject.py b/pypy/module/cpyext/dictobject.py ---

[pypy-commit] pypy default: update release note for current HEADs

2019-12-07 Thread mattip
Author: Matti Picus Branch: Changeset: r98252:e53d4169f58d Date: 2019-12-08 08:59 +0200 http://bitbucket.org/pypy/pypy/changeset/e53d4169f58d/ Log:update release note for current HEADs diff --git a/pypy/doc/release-v7.3.0.rst b/pypy/doc/release-v7.3.0.rst --- a/pypy/doc/release-v7.3.0.rst

[pypy-commit] pypy release-pypy3.6-v7.x: merge py3.6 into release branch

2019-12-07 Thread mattip
Author: Matti Picus Branch: release-pypy3.6-v7.x Changeset: r98255:d6ff09cd0648 Date: 2019-12-08 09:01 +0200 http://bitbucket.org/pypy/pypy/changeset/d6ff09cd0648/ Log:merge py3.6 into release branch diff too long, truncating to 2000 out of 3708 lines diff --git

[pypy-commit] pypy py3.6: merge default into py3.6

2019-12-07 Thread mattip
Author: Matti Picus Branch: py3.6 Changeset: r98254:6f23035ba670 Date: 2019-12-08 09:01 +0200 http://bitbucket.org/pypy/pypy/changeset/6f23035ba670/ Log:merge default into py3.6 diff --git a/lib_pypy/_curses_build.py b/lib_pypy/_curses_build.py --- a/lib_pypy/_curses_build.py +++

[pypy-commit] pypy default: redo _curses_build library detection

2019-12-07 Thread mattip
Author: Matti Picus Branch: Changeset: r98249:cf0ed0f35064 Date: 2019-12-08 08:26 +0200 http://bitbucket.org/pypy/pypy/changeset/cf0ed0f35064/ Log:redo _curses_build library detection diff --git a/lib_pypy/_curses_build.py b/lib_pypy/_curses_build.py --- a/lib_pypy/_curses_build.py +++

[pypy-commit] pypy release-pypy2.7-v7.x: merge default into release branch

2019-12-07 Thread mattip
Author: Matti Picus Branch: release-pypy2.7-v7.x Changeset: r98253:1c36a847ec09 Date: 2019-12-08 09:00 +0200 http://bitbucket.org/pypy/pypy/changeset/1c36a847ec09/ Log:merge default into release branch diff --git a/lib_pypy/_cffi_ssl/_stdssl/error.py b/lib_pypy/_cffi_ssl/_stdssl/error.py

[pypy-commit] pypy default: commit to releasing portable tarballs for 7.3

2019-12-07 Thread mattip
Author: Matti Picus Branch: Changeset: r98251:b7a0f51bb830 Date: 2019-12-08 08:49 +0200 http://bitbucket.org/pypy/pypy/changeset/b7a0f51bb830/ Log:commit to releasing portable tarballs for 7.3 diff --git a/pypy/doc/release-v7.3.0.rst b/pypy/doc/release-v7.3.0.rst ---

[pypy-commit] pypy default: ensure package name has "portable" in it if iti is portable

2019-12-07 Thread mattip
Author: Matti Picus Branch: Changeset: r98250:04b691bc3ffa Date: 2019-12-08 08:27 +0200 http://bitbucket.org/pypy/pypy/changeset/04b691bc3ffa/ Log:ensure package name has "portable" in it if iti is portable diff --git a/pypy/tool/release/package.py b/pypy/tool/release/package.py ---

[pypy-commit] pypy default: fix ncurses include/lib discovery: add from_config_tool("ncursesw6-config"), reverse order

2019-12-07 Thread mattip
Author: Matti Picus Branch: Changeset: r98247:838c25e04d2a Date: 2019-12-07 19:35 +0200 http://bitbucket.org/pypy/pypy/changeset/838c25e04d2a/ Log:fix ncurses include/lib discovery: add from_config_tool("ncursesw6-config"), reverse order diff --git

[pypy-commit] pypy py3.6: merge default into py3.6

2019-12-07 Thread mattip
Author: Matti Picus Branch: py3.6 Changeset: r98248:c7b17edd132e Date: 2019-12-07 19:36 +0200 http://bitbucket.org/pypy/pypy/changeset/c7b17edd132e/ Log:merge default into py3.6 diff --git a/pypy/module/_minimal_curses/fficurses.py b/pypy/module/_minimal_curses/fficurses.py ---

[pypy-commit] buildbot default: typos

2019-12-07 Thread mattip
Author: Matti Picus Branch: Changeset: r1121:887ddad23b84 Date: 2019-12-07 19:32 +0200 http://bitbucket.org/pypy/buildbot/changeset/887ddad23b84/ Log:typos diff --git a/docker/Dockerfile b/docker/Dockerfile --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -62,11 +62,11 @@ ADD