remove matplotlib upperbound for win

openvinotoolkit · Dec 16, 2024 · 6c132ff · 6c132ff
1 parent 62cc22f
commit 6c132ff
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 20 deletions.
diff --git a/notebooks/tensorflow-hub/tensorflow-hub.ipynb b/notebooks/tensorflow-hub/tensorflow-hub.ipynb
@@ -60,16 +60,11 @@
     "import platform\n",
     "\n",
     "%pip install -q pillow numpy\n",
-    "%pip install -q \"openvino>=2023.2.0\" \"opencv-python\"\n",
+    "%pip install -q \"openvino>=2023.2.0\" \"opencv-python\" \"matplotlib>=3.4\"\n",
     "\n",
-    "if platform.system() != \"Windows\":\n",
-    "    %pip install -q \"matplotlib>=3.4\"\n",
-    "else:\n",
-    "    %pip install -q \"matplotlib>=3.4,<3.7\"\n",
-    "\n",
-    "%pip install -q \"tensorflow-macos>=2.5; sys_platform == 'darwin' and platform_machine == 'arm64' and python_version > '3.8'\" # macOS M1 and M2\n",
-    "%pip install -q \"tensorflow>=2.5; sys_platform == 'darwin' and platform_machine != 'arm64' and python_version > '3.8'\" # macOS x86\n",
-    "%pip install -q \"tensorflow>=2.5; sys_platform != 'darwin' and python_version > '3.8'\"\n",
+    "%pip install -q \"tensorflow-macos>=2.5; sys_platform == 'darwin' and platform_machine == 'arm64'\"\n",
+    "%pip install -q \"tensorflow>=2.5; sys_platform == 'darwin' and platform_machine != 'arm64'\"\n",
+    "%pip install -q \"tensorflow>=2.5; sys_platform != 'darwin'\"\n",
     "%pip install -q tf_keras tensorflow_hub"
    ]
   },
@@ -695,7 +690,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.10"
+   "version": "3.11.4"
   },
   "openvino_notebooks": {
    "imageUrl": "",

diff --git a/...ensorflow-object-detection-to-openvino/tensorflow-instance-segmentation-to-openvino.ipynb b/...ensorflow-object-detection-to-openvino/tensorflow-instance-segmentation-to-openvino.ipynb
@@ -63,9 +63,9 @@
     "\n",
     "%pip install -q \"matplotlib>=3.4\"\n",
     "\n",
-    "%pip install -q \"tensorflow-macos>=2.5; sys_platform == 'darwin' and platform_machine == 'arm64' and python_version > '3.8'\" # macOS M1 and M2\n",
-    "%pip install -q \"tensorflow>=2.5; sys_platform == 'darwin' and platform_machine != 'arm64' and python_version > '3.8'\" # macOS x86\n",
-    "%pip install -q \"tensorflow>=2.5; sys_platform != 'darwin' and python_version > '3.8'\""
+    "%pip install -q \"tensorflow-macos>=2.5; sys_platform == 'darwin' and platform_machine == 'arm64'\" # macOS M1 and M2\n",
+    "%pip install -q \"tensorflow>=2.5; sys_platform == 'darwin' and platform_machine != 'arm64'\" # macOS x86\n",
+    "%pip install -q \"tensorflow>=2.5; sys_platform != 'darwin'\""
    ]
   },
   {
@@ -893,7 +893,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.10"
+   "version": "3.11.4"
   },
   "openvino_notebooks": {
    "imageUrl": "https://github.com/itrushkin/openvino_notebooks/assets/76161256/b0acc7bb-92c7-4c83-9484-84a8e1b798b7",

diff --git a/...oks/tensorflow-object-detection-to-openvino/tensorflow-object-detection-to-openvino.ipynb b/...oks/tensorflow-object-detection-to-openvino/tensorflow-object-detection-to-openvino.ipynb
@@ -63,9 +63,9 @@
     "%pip install -q \"openvino>=2023.1.0\" \"numpy>=1.21.0\" \"opencv-python\" \"tqdm\"\n",
     "\n",
     "%pip install -q \"matplotlib>=3.4\"\n",
-    "%pip install -q \"tensorflow-macos>=2.5; sys_platform == 'darwin' and platform_machine == 'arm64' and python_version > '3.8'\" # macOS M1 and M2\n",
-    "%pip install -q \"tensorflow>=2.5; sys_platform == 'darwin' and platform_machine != 'arm64' and python_version > '3.8'\" # macOS x86\n",
-    "%pip install -q \"tensorflow>=2.5; sys_platform != 'darwin' and python_version > '3.8'\""
+    "%pip install -q \"tensorflow-macos>=2.5; sys_platform == 'darwin' and platform_machine == 'arm64'\" # macOS M1 and M2\n",
+    "%pip install -q \"tensorflow>=2.5; sys_platform == 'darwin' and platform_machine != 'arm64'\" # macOS x86\n",
+    "%pip install -q \"tensorflow>=2.5; sys_platform != 'darwin'\""
    ]
   },
   {
@@ -941,7 +941,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
   },

diff --git a/notebooks/yolov10-optimization/yolov10-optimization.ipynb b/notebooks/yolov10-optimization/yolov10-optimization.ipynb
@@ -86,7 +86,7 @@
     "%pip install -q \"nncf>=2.11.0\"\n",
     "%pip install -Uq \"openvino>=2024.3.0\"\n",
     "%pip install -q \"git+https://github.com/THU-MIG/yolov10.git\" --extra-index-url https://download.pytorch.org/whl/cpu\n",
-    "%pip install -q \"torch>=2.1\" \"torchvision>=0.16\" tqdm opencv-python \"gradio>=4.19\" --extra-index-url https://download.pytorch.org/whl/cpu"
+    "%pip install -q \"torch>=2.1\" \"torchvision>=0.16\" tqdm opencv-python \"gradio>=4.19\" \"matplotlib>=3.9\" --extra-index-url https://download.pytorch.org/whl/cpu"
    ]
   },
   {
@@ -1496,7 +1496,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.10"
+   "version": "3.11.4"
   },
   "openvino_notebooks": {
    "imageUrl": "https://github.com/openvinotoolkit/openvino_notebooks/assets/29454499/81ff3233-9c8d-4fe8-ab21-baf9ce530cff",