Author: Armin Rigo <[email protected]>
Branch:
Changeset: r59078:150ae95a0322
Date: 2012-11-23 21:24 +0100
http://bitbucket.org/pypy/pypy/changeset/150ae95a0322/
Log: hg merge release-2.0-beta1
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -2,3 +2,4 @@
b48df0bf4e75b81d98f19ce89d4a7dc3e1dab5e5 benchmarked
d8ac7d23d3ec5f9a0fa1264972f74a010dbfd07f release-1.6
ff4af8f318821f7f5ca998613a60fca09aa137da release-1.7
+07e08e9c885ca67d89bcc304e45a32346daea2fa release-2.0-beta-1
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.3"
/* PyPy version as a string */
-#define PYPY_VERSION "1.9.1"
+#define PYPY_VERSION "2.0.0-beta1"
/* Subversion Revision number of this file (not of the repository).
* Empty since Mercurial migration. */
diff --git a/pypy/module/cpyext/test/test_version.py
b/pypy/module/cpyext/test/test_version.py
--- a/pypy/module/cpyext/test/test_version.py
+++ b/pypy/module/cpyext/test/test_version.py
@@ -14,4 +14,8 @@
"""
module = self.import_module(name='foo', init=init)
assert module.py_version == sys.version[:5]
- assert module.pypy_version == '%d.%d.%d' % sys.pypy_version_info[:3]
+ v = sys.pypy_version_info
+ s = '%d.%d.%d' % (v[0], v[1], v[2])
+ if v.releaselevel != 'final':
+ s += '-%s%d' % (v[3], v[4])
+ assert module.pypy_version == s
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
@@ -11,7 +11,7 @@
#XXX # sync CPYTHON_VERSION with patchlevel.h, package.py
CPYTHON_API_VERSION = 1013 #XXX # sync with include/modsupport.h
-PYPY_VERSION = (1, 9, 1, "dev", 0) #XXX # sync patchlevel.h
+PYPY_VERSION = (2, 0, 0, "beta", 1) #XXX # sync patchlevel.h
if platform.name == 'msvc':
COMPILER_INFO = 'MSC v.%d 32 bit' % (platform.version * 10 + 600)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
