[pypy-commit] cffi default: Move to version number "0.8.6+", to distinguish from the last

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r1648:0c02b23ebe2c
Date: 2015-02-12 16:47 +0100
http://bitbucket.org/cffi/cffi/changeset/0c02b23ebe2c/

Log:	Move to version number "0.8.6+", to distinguish from the last
	release 0.8.6.

diff --git a/c/_cffi_backend.c b/c/_cffi_backend.c
--- a/c/_cffi_backend.c
+++ b/c/_cffi_backend.c
@@ -5689,7 +5689,7 @@
     if (v == NULL || PyModule_AddObject(m, "_C_API", v) < 0)
         INITERROR;
 
-    v = PyText_FromString("0.8.6");
+    v = PyText_FromString("0.8.6+");
     if (v == NULL || PyModule_AddObject(m, "__version__", v) < 0)
         INITERROR;
 
diff --git a/c/test_c.py b/c/test_c.py
--- a/c/test_c.py
+++ b/c/test_c.py
@@ -3252,4 +3252,4 @@
 
 def test_version():
     # this test is here mostly for PyPy
-    assert __version__ == "0.8.6"
+    assert __version__ == "0.8.6+"
diff --git a/cffi/__init__.py b/cffi/__init__.py
--- a/cffi/__init__.py
+++ b/cffi/__init__.py
@@ -4,8 +4,8 @@
 from .api import FFI, CDefError, FFIError
 from .ffiplatform import VerificationError, VerificationMissing
 
-__version__ = "0.8.6"
-__version_info__ = (0, 8, 6)
+__version__ = "0.8.6+"
+__version_info__ = (0, 8, 6, "plus")
 
 # The verifier module file names are based on the CRC32 of a string that
 # contains the following version number.  It may be older than __version__
diff --git a/doc/source/conf.py b/doc/source/conf.py
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -47,7 +47,7 @@
 # The short X.Y version.
 version = '0.8'
 # The full version, including alpha/beta/rc tags.
-release = '0.8.6'
+release = '0.8.6+'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/testing/test_version.py b/testing/test_version.py
--- a/testing/test_version.py
+++ b/testing/test_version.py
@@ -16,6 +16,7 @@
 def test_version():
     v = cffi.__version__
     version_info = '.'.join(str(i) for i in cffi.__version_info__)
+    version_info = version_info.replace('.plus', '+')
     assert v == version_info
     #v = BACKEND_VERSIONS.get(v, v)
     assert v == _cffi_backend.__version__
@@ -31,7 +32,7 @@
 
 def test_doc_version_file():
     parent = os.path.dirname(os.path.dirname(__file__))
-    v = cffi.__version__
+    v = cffi.__version__.replace('+', '')
     p = os.path.join(parent, 'doc', 'source', 'index.rst')
     content = open(p).read()
     assert ("cffi/cffi-%s.tar.gz" % v) in content
@@ -41,7 +42,7 @@
     p = os.path.join(parent, 'setup.py')
     content = open(p).read()
     #
-    v = cffi.__version__
+    v = cffi.__version__.replace('+', '')
     assert ("version='%s'" % v) in content
 
 def test_c_version():