Author: Matti Picus <matti.pi...@gmail.com>
Branch: release-5.x
Changeset: r86856:b0cef2e770b9
Date: 2016-09-04 08:26 +0300
http://bitbucket.org/pypy/pypy/changeset/b0cef2e770b9/
Log: update version numbers, make test run untranslated
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 "2.7.10"
/* PyPy version as a string */
-#define PYPY_VERSION "5.4.0"
-#define PYPY_VERSION_NUM 0x05040000
+#define PYPY_VERSION "5.4.1"
+#define PYPY_VERSION_NUM 0x05040100
/* 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/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
@@ -32,9 +32,11 @@
assert module.py_minor_version == sys.version_info.minor
assert module.py_micro_version == sys.version_info.micro
- @pytest.mark.skipif('__pypy__' not in sys.builtin_module_names,
reason='pypy only test')
+ #@pytest.mark.skipif('__pypy__' not in sys.builtin_module_names,
reason='pypy only test')
def test_pypy_versions(self):
import sys
+ if '__pypy__' not in sys.builtin_module_names:
+ py.test.skip("pypy only test")
init = """
if (Py_IsInitialized()) {
PyObject *m = Py_InitModule("foo", NULL);
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 = (5, 4, 0, "final", 0) #XXX # sync patchlevel.h
+PYPY_VERSION = (5, 4, 1, "final", 0) #XXX # sync patchlevel.h
import pypy
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
