[pypy-commit] pypy default: fix merge from f560bd567d72

2018-01-10 Thread mattip
Author: Matti Picus Branch: Changeset: r93652:d1ea0800978f Date: 2018-01-11 06:42 +0200 http://bitbucket.org/pypy/pypy/changeset/d1ea0800978f/ Log:fix merge from f560bd567d72 diff --git a/rpython/rlib/rwinreg.py b/rpython/rlib/rwinreg.py --- a/rpython/rlib/rwinreg.py

[pypy-commit] cffi doc-set_source: Close branch

2018-01-10 Thread arigo
Author: Armin Rigo Branch: doc-set_source Changeset: r3058:237749810e6e Date: 2018-01-10 12:50 +0100 http://bitbucket.org/cffi/cffi/changeset/237749810e6e/ Log:Close branch ___ pypy-commit mailing list pypy-commit@python.org

[pypy-commit] cffi default: hg merge doc-set_source

2018-01-10 Thread arigo
Author: Armin Rigo Branch: Changeset: r3059:a570b34ac8a6 Date: 2018-01-10 12:51 +0100 http://bitbucket.org/cffi/cffi/changeset/a570b34ac8a6/ Log:hg merge doc-set_source Thanks Matti! diff --git a/doc/source/overview.rst b/doc/source/overview.rst ---

[pypy-commit] pypy default: Fix following 0d3c3f5e2bdb

2018-01-10 Thread arigo
Author: Armin Rigo Branch: Changeset: r93643:1e390e19899b Date: 2018-01-10 12:54 +0100 http://bitbucket.org/pypy/pypy/changeset/1e390e19899b/ Log:Fix following 0d3c3f5e2bdb diff --git a/pypy/module/pypyjit/test_pypy_c/test_string.py

[pypy-commit] pypy default: Backport rpython/ changes made on the py3.5 branch

2018-01-10 Thread rlamy
Author: Ronan Lamy Branch: Changeset: r93648:f560bd567d72 Date: 2018-01-10 20:34 + http://bitbucket.org/pypy/pypy/changeset/f560bd567d72/ Log:Backport rpython/ changes made on the py3.5 branch diff --git a/rpython/annotator/binaryop.py

[pypy-commit] pypy release-pypy3.5-v5.9.x: missed this skip in the merge

2018-01-10 Thread mattip
Author: Matti Picus Branch: release-pypy3.5-v5.9.x Changeset: r93644:3f6eaa010fce Date: 2018-01-10 16:58 +0200 http://bitbucket.org/pypy/pypy/changeset/3f6eaa010fce/ Log:missed this skip in the merge diff --git a/pypy/module/cpyext/test/test_eval.py

[pypy-commit] pypy default: update year

2018-01-10 Thread mattip
Author: Matti Picus Branch: Changeset: r93645:656a15610ee8 Date: 2018-01-10 17:01 +0200 http://bitbucket.org/pypy/pypy/changeset/656a15610ee8/ Log:update year diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -30,7 +30,7 @@ DEALINGS IN THE SOFTWARE.

[pypy-commit] pypy default: trivial fixes

2018-01-10 Thread mattip
Author: Matti Picus Branch: Changeset: r93646:35cff1db08c1 Date: 2018-01-10 18:08 +0200 http://bitbucket.org/pypy/pypy/changeset/35cff1db08c1/ Log:trivial fixes diff --git a/rpython/memory/gc/minimarktest.py b/rpython/memory/gc/minimarktest.py ---

[pypy-commit] pypy default: Update test_recompiler to match cffi d16706e3c2da

2018-01-10 Thread arigo
Author: Armin Rigo Branch: Changeset: r93649:71bbe765aa42 Date: 2018-01-10 22:42 +0100 http://bitbucket.org/pypy/pypy/changeset/71bbe765aa42/ Log:Update test_recompiler to match cffi d16706e3c2da diff --git a/pypy/module/_cffi_backend/test/test_recompiler.py

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

2018-01-10 Thread arigo
Author: Armin Rigo Branch: py3.5 Changeset: r93650:52e62b9d7e92 Date: 2018-01-10 22:44 +0100 http://bitbucket.org/pypy/pypy/changeset/52e62b9d7e92/ Log:hg merge default diff --git a/pypy/module/_cffi_backend/test/test_recompiler.py

[pypy-commit] pypy default: update to cffi/d16706e3c2da

2018-01-10 Thread arigo
Author: Armin Rigo Branch: Changeset: r93651:9651b48098f7 Date: 2018-01-10 23:23 +0100 http://bitbucket.org/pypy/pypy/changeset/9651b48098f7/ Log:update to cffi/d16706e3c2da diff --git a/lib_pypy/cffi/_cffi_include.h b/lib_pypy/cffi/_cffi_include.h ---

[pypy-commit] cffi default: Issue #352

2018-01-10 Thread arigo
Author: Armin Rigo Branch: Changeset: r3060:d16706e3c2da Date: 2018-01-10 22:18 +0100 http://bitbucket.org/cffi/cffi/changeset/d16706e3c2da/ Log:Issue #352 Oops. diff --git a/c/lib_obj.c b/c/lib_obj.c --- a/c/lib_obj.c +++ b/c/lib_obj.c @@ -505,6 +505,7 @@

[pypy-commit] cffi default: What's new in 1.11.3

2018-01-10 Thread arigo
Author: Armin Rigo Branch: Changeset: r3062:0f751c6b375a Date: 2018-01-10 23:32 +0100 http://bitbucket.org/cffi/cffi/changeset/0f751c6b375a/ Log:What's new in 1.11.3 diff --git a/doc/source/whatsnew.rst b/doc/source/whatsnew.rst --- a/doc/source/whatsnew.rst +++

[pypy-commit] cffi default: Bump version to 1.11.3

2018-01-10 Thread arigo
Author: Armin Rigo Branch: Changeset: r3061:f4f452929690 Date: 2018-01-10 23:26 +0100 http://bitbucket.org/cffi/cffi/changeset/f4f452929690/ Log:Bump version to 1.11.3 diff --git a/c/_cffi_backend.c b/c/_cffi_backend.c --- a/c/_cffi_backend.c +++ b/c/_cffi_backend.c @@