From 97bf3a7d03a64984f33f166561913b9e2a857ca6 Mon Sep 17 00:00:00 2001
From: Carlos Cordoba <ccordoba12@gmail.com>
Date: Mon, 9 Oct 2023 10:19:24 -0500
Subject: [PATCH] Improve the way we depend on IPython and IPykernel per Python
 version

That will allow us to handle those dependencies better for Python 3.8+
---
 requirements/posix.txt   |  2 +-
 requirements/windows.txt |  2 +-
 setup.py                 | 11 ++++++++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/requirements/posix.txt b/requirements/posix.txt
index 1cf65023..be22b772 100644
--- a/requirements/posix.txt
+++ b/requirements/posix.txt
@@ -1,6 +1,6 @@
 cloudpickle
 ipykernel>=6.23.2,<7
-ipython>=7.31.1,<9
+ipython>=8.12.2,<9
 jupyter_client>=7.4.9,<9
 pyzmq>=22.1.0
 wurlitzer>=1.0.3
diff --git a/requirements/windows.txt b/requirements/windows.txt
index d87d5415..ec6e8483 100644
--- a/requirements/windows.txt
+++ b/requirements/windows.txt
@@ -1,5 +1,5 @@
 cloudpickle
 ipykernel>=6.23.2,<7
-ipython>=7.31.1,<9
+ipython>=8.12.2,<9
 jupyter_client>=7.4.9,<9
 pyzmq>=22.1.0
diff --git a/setup.py b/setup.py
index e874f1c1..87da8422 100644
--- a/setup.py
+++ b/setup.py
@@ -40,9 +40,12 @@ def get_version(module='spyder_kernels'):
     'backports.functools-lru-cache; python_version<"3"',
     'cloudpickle',
     'ipykernel>=4.5,<5; python_version<"3"',
-    'ipykernel>=6.23.2,<7; python_version>="3"',
+    'ipykernel>=6.16.1,<6.17; python_version<"3.8"',
+    'ipykernel>=6.23.2,<7; python_version>="3.8"',
     'ipython<6; python_version<"3"',
-    'ipython>=7.31.1,<9,!=8.8.0,!=8.9.0,!=8.10.0,!=8.11.0,!=8.12.0,!=8.12.1; python_version>="3"',
+    'ipython>=7.31.1,<8; python_version<"3.8"',
+    'ipython>=8.12.2,<8.13; python_version=="3.8"',
+    'ipython>=8.13.0,<9; python_version>="3.8"',
     'jupyter-client>=5.3.4,<6; python_version<"3"',
     'jupyter-client>=7.4.9,<9; python_version>="3"',
     'pyzmq>=17,<20; python_version<"3"',
@@ -92,10 +95,12 @@ def get_version(module='spyder_kernels'):
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
         'Topic :: Software Development :: Interpreters',
     ]
 )