From 8bac5f56390d43f9c3bd5dfdf1422ee1aafe55f2 Mon Sep 17 00:00:00 2001 From: ckunki Date: Fri, 16 Aug 2024 08:48:28 +0200 Subject: [PATCH] Fixed nbtests, 2 --- doc/user_guide/docker/prerequisites.md | 2 +- .../notebook/sklearn/sklearn_fix_version.ipynb | 7 +++++-- test/notebooks/nbtest_sklearn.py | 17 +++++++---------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/doc/user_guide/docker/prerequisites.md b/doc/user_guide/docker/prerequisites.md index 58c52648..cc30ab10 100644 --- a/doc/user_guide/docker/prerequisites.md +++ b/doc/user_guide/docker/prerequisites.md @@ -39,7 +39,7 @@ This is only possible when using * MacOSX Docker Desktop * MacOSX Docker Desktop with a remote Docker daemon -In all scenarios the daemon machine must allow running the Exasol Docker-DB with option [`--privileged`](https://docs.docker.com/reference/cli/docker/container/run/#privileged). +In all scenarios the daemon machine must allow running the Exasol Docker-DB with option [`--privileged`](https://docs.docker.com/engine/containers/run/#runtime-privilege-and-linux-capabilities). Please note that enabling Exasol AI-Lab to use Docker features creates security risks. In particular, code running inside the AI-Lab could create privileged containers, mount the file system of the machine running the Docker daemon, and gain root access to it. For details see https://jpetazzo.github.io/2015/09/03/do-not-use-docker-in-docker-for-ci/, section "The socket solution". diff --git a/exasol/ds/sandbox/runtime/ansible/roles/jupyter/files/notebook/sklearn/sklearn_fix_version.ipynb b/exasol/ds/sandbox/runtime/ansible/roles/jupyter/files/notebook/sklearn/sklearn_fix_version.ipynb index e1b69ee2..5550f7be 100644 --- a/exasol/ds/sandbox/runtime/ansible/roles/jupyter/files/notebook/sklearn/sklearn_fix_version.ipynb +++ b/exasol/ds/sandbox/runtime/ansible/roles/jupyter/files/notebook/sklearn/sklearn_fix_version.ipynb @@ -46,6 +46,7 @@ "source": [ "import textwrap\n", "import sklearn\n", + "from importlib import reload\n", "from exasol.nb_connector.connections import open_pyexasol_connection\n", "\n", "# Create script to test the model\n", @@ -69,13 +70,15 @@ " print(f\"AI-Lab scikit-learn version {my_version} is identical to that of the SLC.\\nNothing to do.\")\n", "else:\n", " print(f\"AI-Lab scikit-learn version {my_version} differs from SLC.\\nInstalling version {slc_version} ...\")\n", - " %pip install \"scikit_learn=={slc_version}\"" + " %pip install \"scikit_learn=={slc_version}\"\n", + " sklearn = reload(sklearn)\n", + " print(f\"Updated AI-Lab scikit-learn to version {sklearn.__version__}.\")" ] }, { "cell_type": "code", "execution_count": null, - "id": "33a2b545-c7fb-43a3-9113-ac3fe04eb68f", + "id": "508f5d2e-ecd7-4ef4-afd0-5f97e51ea2ae", "metadata": {}, "outputs": [], "source": [] diff --git a/test/notebooks/nbtest_sklearn.py b/test/notebooks/nbtest_sklearn.py index 4acc6f2b..650d1b4a 100644 --- a/test/notebooks/nbtest_sklearn.py +++ b/test/notebooks/nbtest_sklearn.py @@ -18,15 +18,17 @@ def test_regression(notebook_runner) -> None: current_dir = os.getcwd() try: - notebook_runner('main_config.ipynb') - os.chdir('./sklearn') - notebook_runner('sklearn_fix_version.ipynb') - os.chdir('..') + # notebook_runner('main_config.ipynb') + # os.chdir('./sklearn') + # notebook_runner('sklearn_fix_version.ipynb') + # os.chdir('..') # - notebook_runner('main_config.ipynb', reset_kernel_client=True) + # notebook_runner('main_config.ipynb', reset_kernel_client=True) + notebook_runner('main_config.ipynb') os.chdir('./data') notebook_runner('data_abalone.ipynb') os.chdir('../sklearn') + notebook_runner('sklearn_fix_version.ipynb') notebook_runner('sklearn_predict_udf.ipynb') notebook_runner('sklearn_train_abalone.ipynb') notebook_runner('sklearn_predict_abalone.ipynb') @@ -40,11 +42,6 @@ def test_classification(notebook_runner) -> None: current_dir = os.getcwd() try: notebook_runner('main_config.ipynb') - os.chdir('./sklearn') - notebook_runner('sklearn_fix_version.ipynb') - os.chdir('..') - # - notebook_runner('main_config.ipynb', reset_kernel_client=True) os.chdir('./data') notebook_runner('data_telescope.ipynb') os.chdir('../sklearn')