[pypy-commit] pypy py3.5: fix merge

2018-04-04 Thread mattip
Author: Matti Picus Branch: py3.5 Changeset: r94242:4e6fcbd80661 Date: 2018-04-05 08:43 +0300 http://bitbucket.org/pypy/pypy/changeset/4e6fcbd80661/ Log:fix merge diff --git a/pypy/interpreter/pyparser/pyparse.py b/pypy/interpreter/pyparser/pyparse.py ---

[pypy-commit] pypy default: start release notes (up to 24.2.2018), rename whatsnew to fit convention

2018-04-04 Thread mattip
Author: Matti Picus Branch: Changeset: r94241:dbe5e735e9f7 Date: 2018-04-04 23:49 +0300 http://bitbucket.org/pypy/pypy/changeset/dbe5e735e9f7/ Log:start release notes (up to 24.2.2018), rename whatsnew to fit convention diff --git

[pypy-commit] pypy cpyext-subclass-setattr: remove unused variable

2018-04-04 Thread mattip
Author: Matti Picus Branch: cpyext-subclass-setattr Changeset: r94239:a7f1ba785e54 Date: 2018-04-04 22:55 +0300 http://bitbucket.org/pypy/pypy/changeset/a7f1ba785e54/ Log:remove unused variable diff --git a/pypy/module/cpyext/typeobject.py

[pypy-commit] pypy cpyext-subclass-setattr: add a passing test

2018-04-04 Thread mattip
Author: Matti Picus Branch: cpyext-subclass-setattr Changeset: r94240:85beaaee87c8 Date: 2018-04-04 23:14 +0300 http://bitbucket.org/pypy/pypy/changeset/85beaaee87c8/ Log:add a passing test diff --git a/pypy/module/cpyext/test/test_typeobject.py

[pypy-commit] pypy cpyext-subclass-setattr: remove unused variable

2018-04-04 Thread mattip
Author: Matti Picus Branch: cpyext-subclass-setattr Changeset: r94238:2f6fa12ef5e6 Date: 2018-04-04 22:37 +0300 http://bitbucket.org/pypy/pypy/changeset/2f6fa12ef5e6/ Log:remove unused variable diff --git a/pypy/module/cpyext/typeobject.py

[pypy-commit] pypy cpyext-subclass-setattr: backed out changeset 36ff2c150968, try a different approach (arigato)

2018-04-04 Thread mattip
Author: Matti Picus Branch: cpyext-subclass-setattr Changeset: r94236:98123cec9206 Date: 2018-04-04 19:50 +0300 http://bitbucket.org/pypy/pypy/changeset/98123cec9206/ Log:backed out changeset 36ff2c150968, try a different approach (arigato) diff --git

[pypy-commit] pypy cpyext-subclass-setattr: rework _cpyext_attach_pyobj (arigato)

2018-04-04 Thread mattip
Author: Matti Picus Branch: cpyext-subclass-setattr Changeset: r94237:ccfd28850680 Date: 2018-04-04 22:36 +0300 http://bitbucket.org/pypy/pypy/changeset/ccfd28850680/ Log:rework _cpyext_attach_pyobj (arigato) diff --git a/pypy/module/cpyext/pyobject.py

[pypy-commit] pypy py3.5: merge default into branch

2018-04-04 Thread mattip
Author: Matti Picus Branch: py3.5 Changeset: r94232:552c05a134d7 Date: 2018-04-04 19:40 +0300 http://bitbucket.org/pypy/pypy/changeset/552c05a134d7/ Log:merge default into branch diff --git a/lib-python/2.7/re.py b/lib-python/2.7/re.py --- a/lib-python/2.7/re.py +++

[pypy-commit] pypy default: prepare new release

2018-04-04 Thread mattip
Author: Matti Picus Branch: Changeset: r94228:2e04adf1b89f Date: 2018-04-04 18:50 +0300 http://bitbucket.org/pypy/pypy/changeset/2e04adf1b89f/ Log:prepare new release diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-6.0.0.rst rename from

[pypy-commit] pypy py3.5: restart whatsnew-pypy3-head.rst part 2

2018-04-04 Thread mattip
Author: Matti Picus Branch: py3.5 Changeset: r94234:cfe5b1a3c30e Date: 2018-04-04 19:46 +0300 http://bitbucket.org/pypy/pypy/changeset/cfe5b1a3c30e/ Log:restart whatsnew-pypy3-head.rst part 2 diff --git a/pypy/doc/whatsnew-pypy3-head.rst

[pypy-commit] pypy py3.5: prepare new release

2018-04-04 Thread mattip
Author: Matti Picus Branch: py3.5 Changeset: r94231:2dcc8ff1c4c3 Date: 2018-04-04 19:36 +0300 http://bitbucket.org/pypy/pypy/changeset/2dcc8ff1c4c3/ Log:prepare new release diff --git a/pypy/doc/whatsnew-pypy3-head.rst b/pypy/doc/whatsnew-pypy3-head.rst ---

[pypy-commit] pypy py3.5: restart whatsnew-pypy3-head.rst part 1

2018-04-04 Thread mattip
Author: Matti Picus Branch: py3.5 Changeset: r94233:bf74662ee4fa Date: 2018-04-04 19:44 +0300 http://bitbucket.org/pypy/pypy/changeset/bf74662ee4fa/ Log:restart whatsnew-pypy3-head.rst part 1 diff --git a/pypy/doc/whatsnew-pypy3-head.rst

[pypy-commit] pypy release-pypy3.5-6.x: start release branch

2018-04-04 Thread mattip
Author: Matti Picus Branch: release-pypy3.5-6.x Changeset: r94235:bfd21fbbe693 Date: 2018-04-04 19:46 +0300 http://bitbucket.org/pypy/pypy/changeset/bfd21fbbe693/ Log:start release branch diff --git a/pypy/module/cpyext/include/patchlevel.h

[pypy-commit] pypy default: restart whatsnew-head

2018-04-04 Thread mattip
Author: Matti Picus Branch: Changeset: r94229:0dbf12ced3b7 Date: 2018-04-04 18:54 +0300 http://bitbucket.org/pypy/pypy/changeset/0dbf12ced3b7/ Log:restart whatsnew-head diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst new file mode 100644 ---

[pypy-commit] pypy release-pypy2.7-6.x: start release branch

2018-04-04 Thread mattip
Author: Matti Picus Branch: release-pypy2.7-6.x Changeset: r94230:d2c8301f4536 Date: 2018-04-04 19:04 +0300 http://bitbucket.org/pypy/pypy/changeset/d2c8301f4536/ Log:start release branch diff --git a/pypy/module/cpyext/include/patchlevel.h

[pypy-commit] buildbot default: move pypy-c-jit-freebsd-9-x86-64 to inactive_slaves

2018-04-04 Thread mattip
Author: Matti Picus Branch: Changeset: r1060:1fbe9ae3024b Date: 2018-04-04 19:25 +0300 http://bitbucket.org/pypy/buildbot/changeset/1fbe9ae3024b/ Log:move pypy-c-jit-freebsd-9-x86-64 to inactive_slaves diff --git a/bot2/pypybuildbot/master.py