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

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: release-pypy3.6-v7.x
Changeset: r98260:d9820e22930d
Date: 2019-12-08 16:34 +0200
http://bitbucket.org/pypy/pypy/changeset/d9820e22930d/

Log:	merge py3.6 into release

diff --git a/pypy/tool/release/package.py b/pypy/tool/release/package.py
--- a/pypy/tool/release/package.py
+++ b/pypy/tool/release/package.py
@@ -64,8 +64,6 @@
     name = options.name
     if not name:
         name = 'pypy-nightly'
-    if options.make_portable and 'portable' not in name:
-        name += '-portable'
     assert '/' not in name
     rename_pypy_c = options.pypy_c
     override_pypy_c = options.override_pypy_c