|
 |
5d3418f |
commit 84ac32de77352b68dd87f038c450a2d50a395f7c
|
|
|
5d3418f |
Author: Carlos Cordoba <ccordoba12@gmail.com>
|
|
|
5d3418f |
Date: Mon Sep 25 12:13:11 2023 -0500
|
|
 |
d983194 |
|
|
|
5d3418f |
Merge from 5.x: PR #21367
|
|
|
5d3418f |
|
|
|
5d3418f |
Fixes #21296
|
|
|
d983194 |
|
|
|
d983194 |
diff --git a/binder/environment.yml b/binder/environment.yml
|
|
|
5d3418f |
index 3e3fe4e57..016083f7a 100644
|
|
|
d983194 |
--- a/binder/environment.yml
|
|
|
d983194 |
+++ b/binder/environment.yml
|
|
|
5d3418f |
@@ -15,7 +15,7 @@ dependencies:
|
|
|
d983194 |
- diff-match-patch >=20181111
|
|
|
d983194 |
- intervaltree >=3.0.2
|
|
|
d983194 |
- 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
|
|
|
d983194 |
-- jedi >=0.17.2,<0.19.0
|
|
|
d983194 |
+- jedi >=0.17.2,<0.20.0
|
|
|
d983194 |
- jellyfish >=0.7
|
|
|
d983194 |
- jsonschema >=3.2.0
|
|
|
d983194 |
- keyring >=17.0.0
|
|
|
d983194 |
diff --git a/requirements/main.yml b/requirements/main.yml
|
|
|
5d3418f |
index 476cce696..522c6cb2f 100644
|
|
|
d983194 |
--- a/requirements/main.yml
|
|
|
d983194 |
+++ b/requirements/main.yml
|
|
|
5d3418f |
@@ -13,7 +13,7 @@ dependencies:
|
|
|
d983194 |
- diff-match-patch >=20181111
|
|
|
d983194 |
- intervaltree >=3.0.2
|
|
|
d983194 |
- 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
|
|
|
d983194 |
- - jedi >=0.17.2,<0.19.0
|
|
|
d983194 |
+ - jedi >=0.17.2,<0.20.0
|
|
|
d983194 |
- jellyfish >=0.7
|
|
|
d983194 |
- jsonschema >=3.2.0
|
|
|
d983194 |
- keyring >=17.0.0
|
|
|
d983194 |
diff --git a/setup.py b/setup.py
|
|
|
5d3418f |
index d1a0942f6..be4c9d149 100644
|
|
|
d983194 |
--- a/setup.py
|
|
|
d983194 |
+++ b/setup.py
|
|
|
d983194 |
@@ -210,7 +210,7 @@ def run(self):
|
|
|
d983194 |
'diff-match-patch>=20181111',
|
|
|
d983194 |
'intervaltree>=3.0.2',
|
|
|
d983194 |
'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',
|
|
|
d983194 |
- 'jedi>=0.17.2,<0.19.0',
|
|
|
d983194 |
+ 'jedi>=0.17.2,<0.20.0',
|
|
|
d983194 |
'jellyfish>=0.7',
|
|
|
d983194 |
'jsonschema>=3.2.0',
|
|
|
d983194 |
'keyring>=17.0.0',
|
|
|
d983194 |
diff --git a/spyder/dependencies.py b/spyder/dependencies.py
|
|
|
5d3418f |
index c3c97e7d2..0805cd596 100644
|
|
|
d983194 |
--- a/spyder/dependencies.py
|
|
|
d983194 |
+++ b/spyder/dependencies.py
|
|
|
5d3418f |
@@ -38,7 +38,7 @@
|
|
|
5d3418f |
INTERVALTREE_REQVER = '>=3.0.2'
|
|
|
d983194 |
IPYTHON_REQVER = (
|
|
|
d983194 |
">=7.31.1,<9.0.0,!=8.8.0,!=8.9.0,!=8.10.0,!=8.11.0,!=8.12.0,!=8.12.1")
|
|
|
d983194 |
-JEDI_REQVER = '>=0.17.2,<0.19.0'
|
|
|
d983194 |
+JEDI_REQVER = '>=0.17.2,<0.20.0'
|
|
|
d983194 |
JELLYFISH_REQVER = '>=0.7'
|
|
|
d983194 |
JSONSCHEMA_REQVER = '>=3.2.0'
|
|
|
d983194 |
KEYRING_REQVER = '>=17.0.0'
|