Skip to content

Commit

Permalink
devel/spyder: Relax dependency restrictions
Browse files Browse the repository at this point in the history
Again, spyder has to widen its restrictions because of newer versions
of textproc/py-QDarkStyle and devel/py-spyder-kernels.
  • Loading branch information
rhurlin committed Dec 12, 2023
1 parent e773b03 commit 3044a21
Show file tree
Hide file tree
Showing 4 changed files with 73 additions and 7 deletions.
18 changes: 16 additions & 2 deletions devel/spyder/files/patch-binder_environment.yml
Expand Up @@ -9,12 +9,26 @@
- jellyfish >=0.7
- jsonschema >=3.2.0
- keyring >=17.0.0
@@ -31,7 +31,7 @@ - python-lsp-black >=1.2.0,<3.0.0
@@ -31,18 +31,18 @@ - python-lsp-black >=1.2.0,<3.0.0
- pyqt <5.16
- pyqtwebengine <5.16
- python-lsp-black >=1.2.0,<3.0.0
-- python-lsp-server >=1.7.4,<1.8.0
+- python-lsp-server >=1.7.4
- pyxdg >=0.26
- pyzmq >=22.1.0
- qdarkstyle >=3.0.2,<3.2.0
-- qdarkstyle >=3.0.2,<3.2.0
+- qdarkstyle >=3.0.2
- qstylizer >=0.2.2
- qtawesome >=1.2.1
-- qtconsole >=5.4.2,<5.5.0
+- qtconsole >=5.4.2
- qtpy >=2.1.0
- rtree >=0.9.7
- setuptools >=49.6.0
- sphinx >=0.6.6
-- spyder-kernels >=2.4.4,<2.5.0
+- spyder-kernels >=2.4.4
- textdistance >=4.2.0
- three-merge >=0.1.1
- watchdog >=0.10.3
17 changes: 15 additions & 2 deletions devel/spyder/files/patch-requirements_main.yml
Expand Up @@ -9,12 +9,25 @@
- jellyfish >=0.7
- jsonschema >=3.2.0
- keyring >=17.0.0
@@ -29,7 +29,7 @@ dependencies:
@@ -29,17 +29,17 @@ dependencies:
- pyqt <5.16
- pyqtwebengine <5.16
- python-lsp-black >=1.2.0,<3.0.0
- - python-lsp-server >=1.7.4,<1.8.0
+ - python-lsp-server >=1.7.4
- pyzmq >=22.1.0
- qdarkstyle >=3.0.2,<3.2.0
- - qdarkstyle >=3.0.2,<3.2.0
+ - qdarkstyle >=3.0.2
- qstylizer >=0.2.2
- qtawesome >=1.2.1
- - qtconsole >=5.4.2,<5.5.0
+ - qtconsole >=5.4.2
- qtpy >=2.1.0
- rtree >=0.9.7
- setuptools >=49.6.0
- sphinx >=0.6.6
- - spyder-kernels >=2.4.4,<2.5.0
+ - spyder-kernels >=2.4.4
- textdistance >=4.2.0
- three-merge >=0.1.1
- watchdog >=0.10.3
27 changes: 25 additions & 2 deletions devel/spyder/files/patch-setup.py
Expand Up @@ -26,12 +26,35 @@
'jellyfish>=0.7',
'jsonschema>=3.2.0',
'keyring>=17.0.0',
@@ -229,7 +228,7 @@ install_requires = [
@@ -229,18 +228,18 @@ install_requires = [
'pyls-spyder>=0.4.0',
'pyqt5<5.16',
'pyqtwebengine<5.16',
- 'python-lsp-server[all]>=1.7.4,<1.8.0',
+ 'python-lsp-server[all]>=1.7.4',
'pyxdg>=0.26;platform_system=="Linux"',
'pyzmq>=22.1.0',
'qdarkstyle>=3.0.2,<3.2.0',
- 'qdarkstyle>=3.0.2,<3.2.0',
+ 'qdarkstyle>=3.0.2',
'qstylizer>=0.2.2',
'qtawesome>=1.2.1',
- 'qtconsole>=5.4.2,<5.5.0',
+ 'qtconsole>=5.4.2',
'qtpy>=2.1.0',
'rtree>=0.9.7',
'setuptools>=49.6.0',
'sphinx>=0.6.6',
- 'spyder-kernels>=2.4.4,<2.5.0',
+ 'spyder-kernels>=2.4.4',
'textdistance>=4.2.0',
'three-merge>=0.1.1',
'watchdog>=0.10.3'
@@ -253,7 +252,7 @@ if 'dev' in __version__:
if req.split(">")[0] not in reqs_to_loosen]
install_requires.append('python-lsp-server[all]>=1.7.4,<1.9.0')
install_requires.append('qtconsole>=5.4.2,<5.6.0')
- install_requires.append('spyder-kernels>=2.4.4,<2.6.0')
+ install_requires.append('spyder-kernels>=2.4.4')

extras_require = {
'test:platform_system == "Windows"': ['pywin32'],
18 changes: 17 additions & 1 deletion devel/spyder/files/patch-spyder_dependencies.py
Expand Up @@ -9,7 +9,7 @@
JELLYFISH_REQVER = '>=0.7'
JSONSCHEMA_REQVER = '>=3.2.0'
KEYRING_REQVER = '>=17.0.0'
@@ -54,7 +54,7 @@ PYLINT_VENV_REQVER = '>=3.0.2'
@@ -54,20 +54,20 @@ PYLINT_VENV_REQVER = '>=3.0.2'
PYGMENTS_REQVER = '>=2.0'
PYLINT_REQVER = '>=2.5.0,<3.0'
PYLINT_VENV_REQVER = '>=3.0.2'
Expand All @@ -18,3 +18,19 @@
PYLSP_BLACK_REQVER = '>=1.2.0,<3.0.0'
PYLS_SPYDER_REQVER = '>=0.4.0'
PYXDG_REQVER = '>=0.26'
PYZMQ_REQVER = '>=22.1.0'
-QDARKSTYLE_REQVER = '>=3.0.2,<3.2.0'
+QDARKSTYLE_REQVER = '>=3.0.2'
QSTYLIZER_REQVER = '>=0.2.2'
QTAWESOME_REQVER = '>=1.2.1'
-QTCONSOLE_REQVER = '>=5.4.2,<5.5.0'
+QTCONSOLE_REQVER = '>=5.4.2'
QTPY_REQVER = '>=2.1.0'
RTREE_REQVER = '>=0.9.7'
SETUPTOOLS_REQVER = '>=49.6.0'
SPHINX_REQVER = '>=0.6.6'
-SPYDER_KERNELS_REQVER = '>=2.4.4,<2.5.0'
+SPYDER_KERNELS_REQVER = '>=2.4.4'
TEXTDISTANCE_REQVER = '>=4.2.0'
THREE_MERGE_REQVER = '>=0.1.1'
# None for pynsist install for now

0 comments on commit 3044a21

Please sign in to comment.