[pypy-commit] pypy default: fix merge
mattip
noreply at buildbot.pypy.org
Mon Aug 31 17:40:13 CEST 2015
Author: mattip <matti.picus at gmail.com>
Branch:
Changeset: r79322:3cc794961fe4
Date: 2015-08-31 18:40 +0300
http://bitbucket.org/pypy/pypy/changeset/3cc794961fe4/
Log: fix merge
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,7 +29,7 @@
#define PY_VERSION "2.7.10"
/* PyPy version as a string */
-#define PYPY_VERSION "2.6.1"
+#define PYPY_VERSION "2.7.0-alpha0"
/* Subversion Revision number of this file (not of the repository).
* Empty since Mercurial migration. */
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 = (2, 6, 1, "final", 0) #XXX # sync patchlevel.h
+PYPY_VERSION = (2, 7, 0, "alpha", 0) #XXX # sync patchlevel.h
import pypy
More information about the pypy-commit
mailing list