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

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: py3.6
Changeset: r96628:c26316b6a81d
Date: 2019-05-17 06:34 +0300
http://bitbucket.org/pypy/pypy/changeset/c26316b6a81d/

Log:	merge default into py.36

diff --git a/pypy/doc/how-to-release.rst b/pypy/doc/how-to-release.rst
--- a/pypy/doc/how-to-release.rst
+++ b/pypy/doc/how-to-release.rst
@@ -8,6 +8,12 @@
 a branch named like release-pypy3.5-v2.x or release-pypy3.5-v4.x, and each
 release is tagged, for instance release-pypy3.5-v4.0.1. 
 
+The release version number should be bumped. A micro release increment means
+there were no changes that justify rebuilding c-extension wheels, since
+the wheels are marked with only major.minor version numbers. It is ofen not
+clear what constitues a "major" release verses a "minor" release, the release
+manager can make that call.
+
 After release, inevitably there are bug fixes. It is the responsibility of
 the commiter who fixes a bug to make sure this fix is on the release branch,
 so that we can then create a tagged bug-fix release, which will hopefully
@@ -78,6 +84,8 @@
 
 * Maybe bump the SOABI number in module/imp/importing. This has many
   implications, so make sure the PyPy community agrees to the change.
+  Wheels will use the major.minor release numbers in the name, so bump
+  them if there is an incompatible change to cpyext.
 
 * Update and write documentation
 
diff --git a/rpython/translator/platform/arch/s390x.py b/rpython/translator/platform/arch/s390x.py
--- a/rpython/translator/platform/arch/s390x.py
+++ b/rpython/translator/platform/arch/s390x.py
@@ -89,7 +89,7 @@
     if machine == 0x2964:
         return "z13"
     if machine == 0x3907:  # gcc supports z14 as of 2019/05/08
-	    return "z14"
+        return "z14"
 
     # well all others are unsupported!
     return "unknown"