From fc319e68378f74d6df0fb7e9ed631e008ac766c9 Mon Sep 17 00:00:00 2001 From: Ivan Sinkarenko Date: Mon, 25 Nov 2024 14:29:16 +0100 Subject: [PATCH 1/2] Replace CC7 images with EL9 --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8629ba4..c45781d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,7 @@ dev_test: # Needs to run on acc-py for JDK availability - .acc_py_run_on_acc_py variables: - ACC_PY_BASE_IMAGE_NAME: acc-py_cc7_openjdk11_ci + ACC_PY_BASE_IMAGE_NAME: acc-py_el9_openjdk11_ci # NOTE: For successful mypy test, Python >=3.9 is required (should be default tag here) ACC_PY_BASE_IMAGE_TAG: "2021.12" PYTEST_ADDOPTS: "--mypy" @@ -59,7 +59,7 @@ wheel_test: # e.g. OSError: Java version must be either 1.8 or 11, got 17.0.5 # We also no longer test it against JDK8 because - it's unsupported for Python and we've # stopped shipping container images for it - ACC_PY_BASE_IMAGE_NAME: acc-py_cc7_openjdk11_ci + ACC_PY_BASE_IMAGE_NAME: acc-py_el9_openjdk11_ci tests_whl_master_jpype: -- GitLab From 18e8290dafbb557894db2b19af86e64d7cbb67bc Mon Sep 17 00:00:00 2001 From: Ivan Sinkarenko Date: Mon, 25 Nov 2024 15:31:29 +0100 Subject: [PATCH 2/2] Fix compatibility with cmmnbuild-dep-manager --- pyjapc/tests/conftest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyjapc/tests/conftest.py b/pyjapc/tests/conftest.py index 15d091c..09230ed 100644 --- a/pyjapc/tests/conftest.py +++ b/pyjapc/tests/conftest.py @@ -72,8 +72,8 @@ def std_meaning_enum_descriptor(jvm) -> typing.Generator["cern.japc.core.spi.val @pytest.fixture(scope="module") def jvm(): - mgr = cmmnbuild_dep_manager.Manager('pyjapc') - mgr.start_jpype_jvm() + mgr = cmmnbuild_dep_manager.Manager() + mgr.jvm_required() return mgr -- GitLab