Merge pull request #12 from fair-ease/PAOLO

Paolo

Author: Marie59

ICON/buoy_icon_2.png

@@ -1,48 +1,16 @@
 jupyter==1.1.1
-copernicusmarine==2.0.1
+copernicusmarine==2.2.2
 netCDF4==1.7.2
-folium==0.19.5
+folium==0.20.0
 seawater==3.3.4
-scipy==1.15.2
-shapely==2.1.0
+scipy==1.16.1
+shapely==2.1.1
 ftputil==5.1.0
 pykml==0.2.0
-Unidecode==1.3.8
-scikit-learn==1.6.1
-matplotlib==3.10.1
+Unidecode==1.4.0
+scikit-learn==1.7.1
+matplotlib==3.10.5
 altair==5.5.0
 
 
 
-#accessible-pygments==0.0.5
-#blosc2==2.7.1
-#docutils==0.21.2
-#greenlet==3.1.1
-#hdf5plugin==5.0.0
-#imagesize==1.4.1
-#jupyter-book==1.0.4.post1
-#jupyter-cache==1.0.1
-#jupyter-resource-usage==1.1.1
-#jupyterlab_myst==2.4.2
-#latexcodec==3.0.0
-#linkify-it-py==2.0.3
-#markdown-it-py==3.0.0
-#mdit-py-plugins==0.4.2
-#mdurl==0.1.2
-#msgpack==1.1.0
-#myst-nb==1.2.0
-#ndindex==1.9.2
-#nodejs==0.1.1
-#numexpr==2.10.2
-#ptyprocess==0.7.0
-#pure_eval==0.2.3
-#py-cpuinfo==9.0.0
-#pybtex==0.24.0
-#pybtex-docutils==1.0.3
-#pydata-sphinx-theme==0.16.1
-#snowballstemmer==2.2.0
-#SQLAlchemy==2.0.39
-#tables==3.10.1
-#tabulate==0.9.0
-#uc-micro-py==1.0.3
-#variable_inspector==1.0.1

docker/requirements_jupyter_3-13.txt

@@ -71,7 +71,10 @@
     "import re\n",
     "\n",
     "from netCDF4 import Dataset,num2date\n",
-    "from shapely.geometry import box, Point, Polygon"
+    "from shapely.geometry import box, Point, Polygon\n",
+    "\n",
+    "print(f\" Copernicus Marine Toolbox version: {cm.__version__}\")\n",
+    "print(f\" Python version: {sys.version}\")"
    ]
   },
   {
@@ -227,6 +230,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "cm.login()\n",
+    "\n",
     "if modelproduct == 'anfc':\n",
     "    print(\"Check if anfc product land-sea mask is already available or download it.\")\n",
     "    LS_mask = LS_mask_dir+'/MED-MFC_006_013_mask_bathy.nc'\n",
@@ -383,7 +388,7 @@
     "    reader = csv.DictReader(csvfile, delimiter=',')\n",
     "\n",
     "    for row in reader:\n",
-    "            \n",
+    "    \n",
     "        # Read platform code\n",
     "        platform_code = row['platform_code']\n",
     "        print(f\"** Start processing platform {platform_code} for download\")\n",
@@ -478,7 +483,7 @@
     "                        logT.write(msg + \"\\n\")  \n",
     "                    continue\n",
     "                except Exception as e:\n",
-    "                    msg = f\"Unexpected error for platform {platform_code} at depth={depth}: {e}\"\n",
+    "                    msg = f\"Unexpected error for platform {platform_code}\"\n",
     "                    print(msg)\n",
     "                    with open(log_fileT, 'a') as logT:\n",
     "                        logT.write(msg + \"\\n\")                  \n",
@@ -574,7 +579,7 @@
     "                            logT.write(msg + \"\\n\")  \n",
     "                        continue\n",
     "                    except Exception as e:\n",
-    "                        msg = f\"Unexpected error for platform {platform_code} at depth={depth}: {e}\"\n",
+    "                        msg = f\"Unexpected error for platform {platform_code}\"\n",
     "                        print(msg)\n",
     "                        with open(log_fileT, 'a') as logT:\n",
     "                            logT.write(msg + \"\\n\")                  \n",
@@ -815,14 +820,6 @@
     "        modS_nc.setncattr('SOURCE_field_type', attr_value)\n",
     "        modS_nc.delncattr('field_type')             \n"
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "a9f22a89-5b95-404d-9de9-573cdaaf0b8d",
-   "metadata": {},
-   "outputs": [],
-   "source": []
   }
  ],
  "metadata": {
@@ -841,7 +838,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.18"
+   "version": "3.13.7"
   }
  },
  "nbformat": 4,