[pypy-commit] pypy release-pypy3.5-7.x: create the release branch for py3.5 7.0, and correct the version number

[antocuni]

Author: Antonio Cuni <anto.cuni at gmail.com>
Branch: release-pypy3.5-7.x
Changeset: r95724:ece1f9ddcb91
Date: 2019-01-25 15:56 +0100
http://bitbucket.org/pypy/pypy/changeset/ece1f9ddcb91/

Log:	create the release branch for py3.5 7.0, and correct the version
	number

diff --git a/pypy/doc/conf.py b/pypy/doc/conf.py
--- a/pypy/doc/conf.py
+++ b/pypy/doc/conf.py
@@ -71,9 +71,9 @@
 #    module/cpyext/include/patchlevel.h
 #
 # The short X.Y version.
-version = '7.1'
+version = '7.0'
 # The full version, including alpha/beta/rc tags.
-release = '7.1.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
@@ -32,8 +32,9 @@
  *     module/sys/version.py
  *     doc/conf.py
  */
-#define PYPY_VERSION "7.1.0"
-#define PYPY_VERSION_NUM  0x07010000
+#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
    stays alive. */
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
@@ -13,7 +13,7 @@
 # make sure to keep PYPY_VERSION in sync with:
 #    module/cpyext/include/patchlevel.h
 #    doc/conf.py
-PYPY_VERSION               = (7, 1, 0, "alpha0", 0)
+PYPY_VERSION               = (7, 0, 0, "final", 0)
 
 
 import pypy