Author: Antonio Cuni <anto.c...@gmail.com> Branch: Changeset: r95711:c4dc91f2e037 Date: 2019-01-24 18:21 +0100 http://bitbucket.org/pypy/pypy/changeset/c4dc91f2e037/
Log: merge release-pypy2.7-7.x into default, to incorporate the version bump diff --git a/pypy/doc/conf.py b/pypy/doc/conf.py --- a/pypy/doc/conf.py +++ b/pypy/doc/conf.py @@ -65,10 +65,15 @@ # |version| and |release|, also used in various other places throughout the # built documents. # + +# Make sure to keep this in sync with: +# module/sys/version.py +# module/cpyext/include/patchlevel.h +# # The short X.Y version. -version = '6.0' +version = '7.0' # The full version, including alpha/beta/rc tags. -release = '6.0.0' +release = '7.0.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. 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 @@ -28,9 +28,12 @@ /* Version as a string */ #define PY_VERSION "2.7.13" -/* PyPy version as a string */ -#define PYPY_VERSION "6.1.0-alpha0" -#define PYPY_VERSION_NUM 0x06010000 +/* PyPy version as a string: make sure to keep this in sync with: + * module/sys/version.py + * doc/conf.py + */ +#define PYPY_VERSION "7.0.0" +#define PYPY_VERSION_NUM 0x07000000 /* 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,10 @@ #XXX # sync CPYTHON_VERSION with patchlevel.h, package.py CPYTHON_API_VERSION = 1013 #XXX # sync with include/modsupport.h -PYPY_VERSION = (6, 1, 0, "alpha", 0) #XXX # sync patchlevel.h +# make sure to keep PYPY_VERSION in sync with: +# module/cpyext/include/patchlevel.h +# doc/conf.py +PYPY_VERSION = (7, 0, 0, "final", 0) import pypy _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit