CONPY-63:

Implement module attributes __version__ and __version_info__.

__version__ returns the module version number as a string in format
"MAJOR.MINOR.PATCH" while __version_info__ returns the version number as
a tuple in format (MAJOR, MINOR, PATCH, PRE, 0). Pre is the pre-release segment
as described in PEP-440.

Author: 9EOR9

setup.py

@@ -11,6 +11,8 @@
 with open(path.join(this_directory, 'README.md'), encoding='utf-8') as f:
     long_description = f.read()
 
+define_macros= [] 
+
 # read settings from site.cfg 
 c= ConfigParser()
 c.read(['site.cfg'])
@@ -23,10 +25,27 @@
 
 cfg = get_config(options)
 
+PY_MARIADB_AUTHORS= "Georg Richter"
+
+PY_MARIADB_MAJOR_VERSION=0
+PY_MARIADB_MINOR_VERSION=9
+PY_MARIADB_PATCH_VERSION=59
+PY_MARIADB_PRE_RELEASE_SEGMENT="b"
+
+PY_MARIADB_VERSION= "%s.%s.%s" % (PY_MARIADB_MAJOR_VERSION, PY_MARIADB_MINOR_VERSION, PY_MARIADB_PATCH_VERSION)
+
+# Since we increase patch version even for alpha/beta/rc, pre release nr will be always zero.
+PY_MARIADB_PRE_RELEASE_NR=0
 
+define_macros.append(("PY_MARIADB_VERSION", "\"%s\"" % PY_MARIADB_VERSION))
+define_macros.append(("PY_MARIADB_MAJOR_VERSION", PY_MARIADB_MAJOR_VERSION))
+define_macros.append(("PY_MARIADB_MINOR_VERSION", PY_MARIADB_MINOR_VERSION))
+define_macros.append(("PY_MARIADB_PATCH_VERSION", PY_MARIADB_PATCH_VERSION))
+define_macros.append(("PY_MARIADB_PRE_RELEASE_SEGMENT", "\"%s\"" % PY_MARIADB_PRE_RELEASE_SEGMENT))
+define_macros.append(("PY_MARIADB_AUTHORS", "\"%s\"" % PY_MARIADB_AUTHORS))
 
 setup(name='mariadb',
-      version='0.9.59',
+      version=PY_MARIADB_VERSION,
       python_requires='>=3.6',
       classifiers = [
           'Development Status :: 4 - Beta',
@@ -50,7 +69,7 @@
       description='Python MariaDB extension',
       long_description=long_description,
       long_description_content_type='text/markdown',
-      author='Georg Richter',
+      author=PY_MARIADB_AUTHORS,
       license='LGPL 2.1',
       url='https://www.github.com/mariadb-corporation/mariadb-connector-python',
       project_urls={
@@ -64,6 +83,7 @@
                                          'src/mariadb_parser.c',
                                          'src/mariadb_pooling.c',
                                          'src/mariadb_dbapitype.c', 'src/mariadb_indicator.c'],
+                             define_macros= define_macros,
                              include_dirs=cfg.includes,
                              library_dirs=cfg.lib_dirs,
                              libraries=cfg.libs,

src/mariadb.c

@@ -140,6 +140,7 @@ static void mariadb_add_exception(PyObject *module,
 PyMODINIT_FUNC PyInit_mariadb(void)
 {
     PyObject *module= PyModule_Create(&mariadb_module);
+    PyObject *version_info;
     struct st_constants *intvals= int_constants;
 
     Py_TYPE(&MrdbConnection_Type) = &PyType_Type;
@@ -193,7 +194,31 @@ PyMODINIT_FUNC PyInit_mariadb(void)
         PyModule_AddIntConstant(module, intvals->name,
                 intvals->u.lvalue);
         intvals++;
-    } 
+    }
+
+    /* PEP-396: Module version numbers */
+    PyModule_AddObject(module, "__version__",
+                       PyUnicode_FromString(PY_MARIADB_VERSION));
+
+    if (!(version_info= PyTuple_New(5)))
+    {
+        goto error;
+    }
+    if (PyTuple_SetItem(version_info, 0, PyLong_FromLong(PY_MARIADB_MAJOR_VERSION)) ||
+        PyTuple_SetItem(version_info, 1, PyLong_FromLong(PY_MARIADB_MINOR_VERSION)) ||
+        PyTuple_SetItem(version_info, 2, PyLong_FromLong(PY_MARIADB_PATCH_VERSION)) ||
+        PyTuple_SetItem(version_info, 3, PyUnicode_FromString(PY_MARIADB_PRE_RELEASE_SEGMENT)) ||
+        PyTuple_SetItem(version_info, 4, PyLong_FromLong(0L)))
+    {
+        goto error;
+    }
+
+    PyModule_AddObject(module, "__version_info__", version_info);
+ 
+
+
+    PyModule_AddObject(module, "__author__",
+                       PyUnicode_FromString(PY_MARIADB_AUTHORS));
 
     /* PEP-249: mandatory module globals */
     PyModule_AddObject(module, "apilevel",

test/integration/test_module.py

@@ -0,0 +1,34 @@
+#!/usr/bin/env python -O
+# -*- coding: utf-8 -*-
+
+import os
+import unittest
+
+import mariadb
+
+from test.base_test import create_connection
+from test.conf_test import conf
+import platform
+
+
+class TestConnection(unittest.TestCase):
+
+    def setUp(self):
+        self.connection = create_connection()
+
+    def tearDown(self):
+        del self.connection
+
+    def test_conpy_63(self):
+        version= mariadb.__version__
+        version_info= mariadb.__version_info__
+
+        num_version= list(map(int, version.split('.')))
+
+        self.assertEqual(num_version[0], version_info[0])
+        self.assertEqual(num_version[1], version_info[1])
+        self.assertEqual(num_version[2], version_info[2])
+        self.assertEqual(0, version_info[4])
+
+if __name__ == '__main__':
+    unittest.main()