[pypy-commit] [Git][pypy/pypy][branch/py3.6] 6 commits: Another attempt to get rid of 0f8f2a20a7bd, which merged py3.6 into default

[Ronan Lamy]

Ronan Lamy pushed to branch branch/py3.6 at PyPy / pypy


Commits:
78e65fda by Armin Rigo at 2020-05-07T18:16:35Z
Another attempt to get rid of 0f8f2a20a7bd, which merged py3.6 into default

- - - - -
d09e26be by Matti Picus at 2020-05-05T23:30:28Z
fix whatsnew and allow comments in ignored branch directive

- - - - -
8877cf1b by Matti Picus at 2020-05-05T23:30:43Z
fix 7a80d7f37090

- - - - -
96718e07 by Ronan Lamy at 2020-05-06T15:15:50Z
Let @pytest.mark.pypy_only work as advertised in extra_tests/

- - - - -
72efbd52 by Ronan Lamy at 2020-05-06T15:21:48Z
test cleanup: fix deprecated syntax

- - - - -
e565d3cb by Ronan Lamy at 2020-05-07T18:40:58Z
hg merge default

--HG--
branch : py3.6

- - - - -


5 changed files:

- Makefile
- + extra_tests/conftest.py
- extra_tests/ctypes_tests/test_extra.py
- pypy/doc/test/test_whatsnew.py
- pypy/doc/whatsnew-head.rst


View it on GitLab: https://foss.heptapod.net/pypy/pypy/compare/214d079e6da96d440a34b482bd8d6bf586ebe435...e565d3cbbceea85a0db7f47667c3747418e31c8d

-- 
View it on GitLab: https://foss.heptapod.net/pypy/pypy/compare/214d079e6da96d440a34b482bd8d6bf586ebe435...e565d3cbbceea85a0db7f47667c3747418e31c8d
You're receiving this email because of your account on foss.heptapod.net.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.python.org/pipermail/pypy-commit/attachments/20200507/4383ff17/attachment-0001.html>