aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRainer Hurling <rhurlin@FreeBSD.org>2023-10-13 19:07:01 +0000
committerRainer Hurling <rhurlin@FreeBSD.org>2023-10-13 19:07:01 +0000
commit59c405c21f487192dd61456f1bb3ade06558f6bd (patch)
tree678e3493f27835e5de5255a7a8aa04c8a89f1e71
parentbf6f120059ca1bf6b8b2e1103af997e8316de518 (diff)
downloadports-59c405c21f487192dd61456f1bb3ade06558f6bd.tar.gz
ports-59c405c21f487192dd61456f1bb3ade06558f6bd.zip
devel/spyder: Fix runtime breakage after 716b52586
After updating devel/py-jedi to 0.19.1 [1], Spyder no longer starts because it only accepts versions smaller than 0.19.0. Extend this limit. [1] https://cgit.freebsd.org/ports/commit/?id=716b52586fec01517fd49e800c3a1ca2c419cdab Approved by: maintainer (blanket for limits like this)
-rw-r--r--devel/spyder/Makefile2
-rw-r--r--devel/spyder/files/patch-binder_environment.yml9
-rw-r--r--devel/spyder/files/patch-requirements_main.yml9
-rw-r--r--devel/spyder/files/patch-setup.py9
-rw-r--r--devel/spyder/files/patch-spyder_dependencies.py9
5 files changed, 37 insertions, 1 deletions
diff --git a/devel/spyder/Makefile b/devel/spyder/Makefile
index b7d1f3870193..81089ddfeac8 100644
--- a/devel/spyder/Makefile
+++ b/devel/spyder/Makefile
@@ -1,7 +1,7 @@
PORTNAME= spyder
DISTVERSIONPREFIX= v
DISTVERSION= 5.4.5
-DISTREVISION= 1
+DISTREVISION= 2
CATEGORIES= devel science python
MAINTAINER= yuri@FreeBSD.org
diff --git a/devel/spyder/files/patch-binder_environment.yml b/devel/spyder/files/patch-binder_environment.yml
index f15e2837199e..3e0d75249efa 100644
--- a/devel/spyder/files/patch-binder_environment.yml
+++ b/devel/spyder/files/patch-binder_environment.yml
@@ -1,5 +1,14 @@
--- binder/environment.yml.orig 2023-08-29 21:53:14 UTC
+++ binder/environment.yml
+@@ -14,7 +14,7 @@ - ipython >=7.31.1,<9.0.0,!=8.8.0,!=8.9.0,!=8.10.0,!=8
+ - 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
+ - jellyfish >=0.7
+ - jsonschema >=3.2.0
+ - keyring >=17.0.0
@@ -31,7 +31,7 @@ - python-lsp-black >=1.2.0,<3.0.0
- pyqt <5.16
- pyqtwebengine <5.16
diff --git a/devel/spyder/files/patch-requirements_main.yml b/devel/spyder/files/patch-requirements_main.yml
index 170dc060dfd9..e59fb0942f78 100644
--- a/devel/spyder/files/patch-requirements_main.yml
+++ b/devel/spyder/files/patch-requirements_main.yml
@@ -1,5 +1,14 @@
--- requirements/main.yml.orig 2023-08-29 21:53:14 UTC
+++ requirements/main.yml
+@@ -12,7 +12,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
+ - jellyfish >=0.7
+ - jsonschema >=3.2.0
+ - keyring >=17.0.0
@@ -29,7 +29,7 @@ dependencies:
- pyqt <5.16
- pyqtwebengine <5.16
diff --git a/devel/spyder/files/patch-setup.py b/devel/spyder/files/patch-setup.py
index c16ad328da5e..a953aa7b10f8 100644
--- a/devel/spyder/files/patch-setup.py
+++ b/devel/spyder/files/patch-setup.py
@@ -17,6 +17,15 @@
)
+@@ -210,7 +209,7 @@ install_requires = [
+ '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',
+ 'jellyfish>=0.7',
+ 'jsonschema>=3.2.0',
+ 'keyring>=17.0.0',
@@ -229,7 +228,7 @@ install_requires = [
'pyls-spyder>=0.4.0',
'pyqt5<5.16',
diff --git a/devel/spyder/files/patch-spyder_dependencies.py b/devel/spyder/files/patch-spyder_dependencies.py
index 74ab905ef64c..434dac95f9bf 100644
--- a/devel/spyder/files/patch-spyder_dependencies.py
+++ b/devel/spyder/files/patch-spyder_dependencies.py
@@ -1,5 +1,14 @@
--- spyder/dependencies.py.orig 2023-08-29 21:53:14 UTC
+++ spyder/dependencies.py
+@@ -40,7 +40,7 @@ IPYTHON_REQVER = (
+ INTERVALTREE_REQVER = None if is_pynsist() else '>=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'
+ JELLYFISH_REQVER = '>=0.7'
+ JSONSCHEMA_REQVER = '>=3.2.0'
+ KEYRING_REQVER = '>=17.0.0'
@@ -54,7 +54,7 @@ PYLINT_VENV_REQVER = '>=3.0.2'
PYGMENTS_REQVER = '>=2.0'
PYLINT_REQVER = '>=2.5.0,<3.0'