Make our hexversion and GRAALPY_VERSION_NUM follow the specification

Author: msimacek

CHANGELOG.md

@@ -5,6 +5,7 @@ language runtime. The main focus is on user-observable behavior of the engine.
 
 ## Version 25.0.0
 * `sys.implementation.version` now returns the GraalPy version instead of the Python version it implements. Also available as `sys.graalpy_version_info` for better discoverability by people already familiar with PyPy and its `sys.pypy_version_info`.
+* `GRAALPY_VERSION_NUM` C macro now inlcudes the release level and serial number at the end to conform to the `hexversion` format. This shouldn't break any existing comparisons.
 * `dir(foreign_object)` now returns both foreign methods and Python methods (it used to return only foreign methods).
 * Support `__name__`, `__doc__`, `__text_signature__` fields on foreign executables to serve as their proper counterparts on the Python side. This is useful to, for example, use Java functional interfaces in lieu of Python functions for things like LangChain's `@tool` annotation that want to inspect the underlying function.
 

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_misc.py

@@ -359,14 +359,12 @@ def test_graalpy_version():
         {"get_version_num", (PyCFunction)get_version_num, METH_NOARGS | METH_STATIC, ""}
         ''',
     )
-    expected_version = __graalpython__.get_graalvm_version().removesuffix('-dev')
-    assert tester.get_version_str() == expected_version
-    parts = [int(v) for v in expected_version.split('.')] + [0]
-    expected_num = 0
-    for i in range(3):
-        expected_num <<= 8
-        expected_num |= parts[i]
-    assert tester.get_version_num() == expected_num
+    version = sys.implementation.version
+    assert tester.get_version_str() == f'{version.major}.{version.minor}.{version.micro}'
+    assert tester.get_version_num() == sys.implementation.hexversion
+    # This is an anti-backport trap. The commit that changed the hexversion format should not be backported because
+    # existing projects might already contain tests for the next feature release in the old format (pybind11 does)
+    assert version.major >= 25
 
 
 def test_unicode_docstring():

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/SysModuleBuiltins.java

@@ -41,6 +41,8 @@
 package com.oracle.graal.python.builtins.modules;
 
 import static com.oracle.graal.python.PythonLanguage.J_GRAALPYTHON_ID;
+import static com.oracle.graal.python.PythonLanguage.RELEASE_LEVEL;
+import static com.oracle.graal.python.PythonLanguage.RELEASE_SERIAL;
 import static com.oracle.graal.python.PythonLanguage.T_GRAALPYTHON_ID;
 import static com.oracle.graal.python.builtins.PythonBuiltinClassType.AttributeError;
 import static com.oracle.graal.python.builtins.PythonBuiltinClassType.DeprecationWarning;
@@ -515,7 +517,7 @@ private static PSimpleNamespace makeImplementation(PythonLanguage language, PTup
                         "-" + PythonLanguage.MAJOR + PythonLanguage.MINOR));
         ns.setAttribute(T_VERSION, graalpyVersionInfo);
         ns.setAttribute(T__MULTIARCH, gmultiarch);
-        ns.setAttribute(tsLiteral("hexversion"), PythonLanguage.GRAALVM_MAJOR << 16 | PythonLanguage.GRAALVM_MINOR << 8 | PythonLanguage.GRAALVM_MICRO);
+        ns.setAttribute(tsLiteral("hexversion"), PythonLanguage.GRAALVM_MAJOR << 24 | PythonLanguage.GRAALVM_MINOR << 16 | PythonLanguage.GRAALVM_MICRO << 8 | RELEASE_LEVEL << 4 | RELEASE_SERIAL);
         return ns;
     }
 

mx.graalpython/mx_graalpython.py

@@ -1861,6 +1861,8 @@ def graal_version_short(variant=None, **kwargs):
         for i in range(3):
             num <<= 8
             num |= int(parts[i]) if i < len(parts) else 0
+        num <<= 8
+        num |= release_level('int') << 4
         return hex(num)
     else:
         return '.'.join(GRAAL_VERSION.split('.')[:3])
@@ -1871,14 +1873,16 @@ def release_level(variant=None):
     level = 'alpha'
     if SUITE.suiteDict['release']:
         level = 'final'
-    if variant == 'binary':
+    if variant in ('binary', 'int'):
         level_num = {
             'alpha': 0xA,
             'beta': 0xB,
             'candidate': 0xC,
             'final': 0xF,
         }[level]
-        return chr(level_num + ord(VERSION_BASE))
+        if variant == 'binary':
+            return chr(level_num + ord(VERSION_BASE))
+        return level_num
     return level