Merge branch 'master' into 'master'

update

Closes QPR-11823

See merge request qs/oreswig-github!2

Author: pcaspers

Docker/Dockerfile-ORESWIG-App

@@ -12,7 +12,7 @@ RUN apt-get update \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*
 
-RUN pip3 install matplotlib pandas nose nose_xunitmp datacompy
+RUN pip3 install matplotlib pandas nose nose_xunitmp datacompy jupyter
 
 WORKDIR /
 RUN mkdir /oreswig
@@ -37,6 +37,12 @@ COPY oreswig/QuantLib-SWIG/Python/test /oreswig/tests/QuantLibTestSuite
 RUN rm oreswig/tests/QuantLibTestSuite/__init__.py
 COPY oreswig/OREAnalytics-SWIG/Python/test /oreswig/tests/ORETestSuite
 COPY oreswig/OREAnalytics-SWIG/Python/Examples /oreswig/example_scripts
+# due to relative path imports in the notebooks, we need to copy utilities.py directly into the example folder
+RUN cp oreswig/example_scripts/Notebooks/utilities.py oreswig/example_scripts/Notebooks/Example_1
+RUN cp oreswig/example_scripts/Notebooks/utilities.py oreswig/example_scripts/Notebooks/Example_2
+RUN cp oreswig/example_scripts/Notebooks/utilities.py oreswig/example_scripts/Notebooks/Example_3
+RUN cp oreswig/example_scripts/Notebooks/utilities.py oreswig/example_scripts/Notebooks/Example_4
+RUN cp oreswig/example_scripts/Notebooks/utilities.py oreswig/example_scripts/Notebooks/Example_5
 COPY ore/Examples /oreswig/Examples
 COPY ore/Tools /oreswig/Tools
 # Set env variable to run the ore examples with the python interface instead of the executable

OREAnalytics-SWIG/Python/Examples/Notebooks/Example_4/ore.ipynb

@@ -311,26 +311,14 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": null,
    "id": "44346cb5-6296-4d9e-bf10-aadadac21f9e",
    "metadata": {},
-   "outputs": [
-    {
-     "ename": "ModuleNotFoundError",
-     "evalue": "No module named 'OREPlus'",
-     "output_type": "error",
-     "traceback": [
-      "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
-      "\u001b[0;31mModuleNotFoundError\u001b[0m                       Traceback (most recent call last)",
-      "Cell \u001b[0;32mIn[1], line 1\u001b[0m\n\u001b[0;32m----> 1\u001b[0m \u001b[38;5;28;01mfrom\u001b[39;00m \u001b[38;5;21;01mOREPlus\u001b[39;00m \u001b[38;5;28;01mimport\u001b[39;00m \u001b[38;5;241m*\u001b[39m\n\u001b[1;32m      2\u001b[0m \u001b[38;5;28;01mimport\u001b[39;00m \u001b[38;5;21;01msys\u001b[39;00m\u001b[38;5;241m,\u001b[39m \u001b[38;5;21;01mtime\u001b[39;00m\u001b[38;5;241m,\u001b[39m \u001b[38;5;21;01mmath\u001b[39;00m\n\u001b[1;32m      3\u001b[0m sys\u001b[38;5;241m.\u001b[39mpath\u001b[38;5;241m.\u001b[39mappend(\u001b[38;5;124m'\u001b[39m\u001b[38;5;124m../../../../OREAnalytics-SWIG/Python/Examples/Notebooks\u001b[39m\u001b[38;5;124m'\u001b[39m)\n",
-      "\u001b[0;31mModuleNotFoundError\u001b[0m: No module named 'OREPlus'"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "from ORE import *\n",
     "import sys, time, math\n",
-    "sys.path.append('../../../../OREAnalytics-SWIG/Python/Examples/Notebooks')\n",
+    "sys.path.append('..')\n",
     "import utilities\n",
     "import matplotlib.pyplot as plt\n",
     "import pandas as pd\n",
@@ -484,7 +472,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.2"
+   "version": "3.11.6"
   }
  },
  "nbformat": 4,