commit 84ac32de77352b68dd87f038c450a2d50a395f7c
Author: Carlos Cordoba <ccordoba12@gmail.com>
Date:   Mon Sep 25 12:13:11 2023 -0500

    Merge from 5.x: PR #21367
    
    Fixes #21296

diff --git a/binder/environment.yml b/binder/environment.yml
index 3e3fe4e57..016083f7a 100644
--- a/binder/environment.yml
+++ b/binder/environment.yml
@@ -15,7 +15,7 @@ dependencies:
 - diff-match-patch >=20181111
 - intervaltree >=3.0.2
 - ipython >=7.31.1,<9.0.0,!=8.8.0,!=8.9.0,!=8.10.0,!=8.11.0,!=8.12.0,!=8.12.1
-- jedi >=0.17.2,<0.19.0
+- jedi >=0.17.2,<0.20.0
 - jellyfish >=0.7
 - jsonschema >=3.2.0
 - keyring >=17.0.0
diff --git a/requirements/main.yml b/requirements/main.yml
index 476cce696..522c6cb2f 100644
--- a/requirements/main.yml
+++ b/requirements/main.yml
@@ -13,7 +13,7 @@ dependencies:
   - diff-match-patch >=20181111
   - intervaltree >=3.0.2
   - ipython >=7.31.1,<9.0.0,!=8.8.0,!=8.9.0,!=8.10.0,!=8.11.0,!=8.12.0,!=8.12.1
-  - jedi >=0.17.2,<0.19.0
+  - jedi >=0.17.2,<0.20.0
   - jellyfish >=0.7
   - jsonschema >=3.2.0
   - keyring >=17.0.0
diff --git a/setup.py b/setup.py
index d1a0942f6..be4c9d149 100644
--- a/setup.py
+++ b/setup.py
@@ -210,7 +210,7 @@ def run(self):
     'diff-match-patch>=20181111',
     'intervaltree>=3.0.2',
     'ipython>=7.31.1,<9.0.0,!=8.8.0,!=8.9.0,!=8.10.0,!=8.11.0,!=8.12.0,!=8.12.1',
-    'jedi>=0.17.2,<0.19.0',
+    'jedi>=0.17.2,<0.20.0',
     'jellyfish>=0.7',
     'jsonschema>=3.2.0',
     'keyring>=17.0.0',
diff --git a/spyder/dependencies.py b/spyder/dependencies.py
index c3c97e7d2..0805cd596 100644
--- a/spyder/dependencies.py
+++ b/spyder/dependencies.py
@@ -38,7 +38,7 @@
 INTERVALTREE_REQVER = '>=3.0.2'
 IPYTHON_REQVER = (
     ">=7.31.1,<9.0.0,!=8.8.0,!=8.9.0,!=8.10.0,!=8.11.0,!=8.12.0,!=8.12.1")
-JEDI_REQVER = '>=0.17.2,<0.19.0'
+JEDI_REQVER = '>=0.17.2,<0.20.0'
 JELLYFISH_REQVER = '>=0.7'
 JSONSCHEMA_REQVER = '>=3.2.0'
 KEYRING_REQVER = '>=17.0.0'