take release version from graalpy

Author: timfel

graalpython/com.oracle.graal.python.test/src/tests/standalone/test_standalone.py

@@ -99,6 +99,16 @@ def get_gp():
 
     return graalpy
 
+
+def get_graalvm_version():
+    graalvmVersion, _ = run_cmd([get_gp(), "-c", "print(__graalpython__.get_graalvm_version(), end='')"], os.environ.copy())
+    # when JLine is cannot detect a terminal, it prints logging info
+    graalvmVersion = graalvmVersion.split("\n")[-1]
+    # we never test -dev versions here, we always pretend to use release versions
+    graalvmVersion = graalvmVersion.split("-dev")[0]
+    return graalvmVersion
+
+
 class PolyglotAppTest(unittest.TestCase):
 
     def setUpClass(self):
@@ -111,9 +121,7 @@ def setUpClass(self):
         self.archetypeGroupId = "org.graalvm.python"
         self.archetypeArtifactId = "graalpy-archetype-polyglot-app"
         self.pluginArtifactId = "graalpy-maven-plugin"
-        graalvmVersion, _ = run_cmd([get_gp(), "-c", "print(__graalpython__.get_graalvm_version(), end='')"], self.env)
-        # when JLine is cannot detect a terminal, it prints logging info
-        self.graalvmVersion = graalvmVersion.split("\n")[-1]
+        self.graalvmVersion = get_graalvm_version()
 
         for custom_repo in os.environ.get("MAVEN_REPO_OVERRIDE", "").split(","):
             url = urllib.parse.urlparse(custom_repo)
@@ -392,7 +400,8 @@ def test_native_executable_one_file():
     graalpy = get_gp()
     if graalpy is None:
         return
-    env = os.environ.copy() 
+    env = os.environ.copy()
+    env["MVN_GRAALPY_VERSION"] = get_graalvm_version()
 
     with tempfile.TemporaryDirectory() as tmpdir:
 
@@ -417,6 +426,7 @@ def test_native_executable_venv_and_one_file():
     if graalpy is None:
         return
     env = os.environ.copy()
+    env["MVN_GRAALPY_VERSION"] = get_graalvm_version()
 
     with tempfile.TemporaryDirectory() as target_dir:
         source_file = os.path.join(target_dir, "hello.py")
@@ -453,6 +463,7 @@ def test_native_executable_module():
     if graalpy is None:
         return
     env = os.environ.copy()
+    env["MVN_GRAALPY_VERSION"] = get_graalvm_version()
 
     with tempfile.TemporaryDirectory() as tmp_dir:
 

mx.graalpython/mx_graalpython.py

@@ -935,8 +935,7 @@ def deploy_local_maven_repo():
         # build GraalPy and all the necessary dependencies, so that we can deploy them
         mx.run_mx(["build"])
     # deploy maven artifacts
-    import mx_sdk_vm_impl
-    version = mx_sdk_vm_impl.graalvm_version('graalvm')
+    version = GRAAL_VERSION
     path = os.path.join(SUITE.get_mx_output_dir(), 'public-maven-repo')
     licenses = ['EPL-2.0', 'PSF-License', 'GPLv2-CPE', 'ICU,GPLv2', 'BSD-simplified', 'BSD-new', 'UPL', 'MIT']
     deploy_args = [
@@ -954,7 +953,7 @@ def deploy_local_maven_repo():
         mx.rmtree(path, ignore_errors=True)
         os.mkdir(path)
         mx.maven_deploy(deploy_args)
-    return path
+    return path, version
 
 
 def python_jvm(_=None):
@@ -1403,10 +1402,10 @@ def graalpython_gate_runner(args, tasks):
     # JUnit tests with Maven
     with Task('GraalPython integration JUnit with Maven', tasks, tags=[GraalPythonTags.junit_maven]) as task:
         if task:
-            mvn_repo_path = pathlib.Path(deploy_local_maven_repo()).as_uri()
+            mvn_repo_path, artifacts_version = deploy_local_maven_repo()
+            mvn_repo_path = pathlib.Path(mvn_repo_path).as_uri()
             central_override = mx_urlrewrites.rewriteurl('https://repo1.maven.org/maven2/')
             pom_path = os.path.join(SUITE.dir, 'graalpython/com.oracle.graal.python.test.integration/pom.xml')
-            artifacts_version = GRAAL_VERSION + '-dev'
             mvn_cmd_base = ['-f', pom_path,
                             f'-Dcom.oracle.graal.python.test.polyglot.version={artifacts_version}',
                             f'-Dcom.oracle.graal.python.test.polyglot_repo={mvn_repo_path}',
@@ -1481,14 +1480,13 @@ def graalpython_gate_runner(args, tasks):
                 'JAVA_HOME': graalvm_jdk(),
                 'PYTHON_STANDALONE_HOME': graalpy_standalone_home('jvm')
             }
-            mvn_repo_path = deploy_local_maven_repo()
+            mvn_repo_path, version = deploy_local_maven_repo()
             # setup maven downloader overrides
             env['MAVEN_REPO_OVERRIDE'] = ",".join([
                 f"{pathlib.Path(mvn_repo_path).as_uri()}/",
                 mx_urlrewrites.rewriteurl('https://repo1.maven.org/maven2/'),
             ])
-            import mx_sdk_vm_impl
-            env["org.graalvm.maven.downloader.version"] = mx_sdk_vm_impl.graalvm_version('graalvm')
+            env["org.graalvm.maven.downloader.version"] = version
             env["org.graalvm.maven.downloader.repository"] = f"{pathlib.Path(mvn_repo_path).as_uri()}/"
             # run the test
             mx.logv(f"running with os.environ extended with: {env=}")