Author: Armin Rigo <ar...@tunes.org>
Branch: py3.5
Changeset: r94679:7920e2af5244
Date: 2018-05-23 22:58 +0200
http://bitbucket.org/pypy/pypy/changeset/7920e2af5244/
Log: hg merge default
diff --git a/pypy/module/cpyext/include/patchlevel.h
b/pypy/module/cpyext/include/patchlevel.h
--- a/pypy/module/cpyext/include/patchlevel.h
+++ b/pypy/module/cpyext/include/patchlevel.h
@@ -29,8 +29,8 @@
#define PY_VERSION "3.5.3"
/* PyPy version as a string */
-#define PYPY_VERSION "6.0.0"
-#define PYPY_VERSION_NUM 0x06000000
+#define PYPY_VERSION "6.1.0-alpha0"
+#define PYPY_VERSION_NUM 0x06010000
/* Defined to mean a PyPy where cpyext holds more regular references
to PyObjects, e.g. staying alive as long as the internal PyPy object
diff --git a/pypy/module/sys/version.py b/pypy/module/sys/version.py
--- a/pypy/module/sys/version.py
+++ b/pypy/module/sys/version.py
@@ -10,7 +10,7 @@
#XXX # sync CPYTHON_VERSION with patchlevel.h, package.py
CPYTHON_API_VERSION = 1013 #XXX # sync with include/modsupport.h
-PYPY_VERSION = (6, 0, 0, "final", 0) #XXX # sync patchlevel.h
+PYPY_VERSION = (6, 1, 0, "alpha", 0) #XXX # sync patchlevel.h
import pypy
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
