diff --git a/devel/spyder/files/patch-binder_environment.yml b/devel/spyder/files/patch-binder_environment.yml index 3e0d75249efa..ffb4f4a9eb32 100644 --- a/devel/spyder/files/patch-binder_environment.yml +++ b/devel/spyder/files/patch-binder_environment.yml @@ -1,20 +1,34 @@ --- 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 +@@ -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 diff --git a/devel/spyder/files/patch-requirements_main.yml b/devel/spyder/files/patch-requirements_main.yml index e59fb0942f78..3fab70d7138b 100644 --- a/devel/spyder/files/patch-requirements_main.yml +++ b/devel/spyder/files/patch-requirements_main.yml @@ -1,20 +1,33 @@ --- 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: +@@ -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 diff --git a/devel/spyder/files/patch-setup.py b/devel/spyder/files/patch-setup.py index a953aa7b10f8..01491362a48d 100644 --- a/devel/spyder/files/patch-setup.py +++ b/devel/spyder/files/patch-setup.py @@ -1,37 +1,60 @@ --- setup.py.orig 2023-08-29 21:53:14 UTC +++ setup.py @@ -91,7 +91,7 @@ def get_data_files(): """ Return data_files in a platform dependent manner. """ - if sys.platform.startswith('linux'): + if sys.platform.startswith('linux') or sys.platform.startswith('freebsd'): data_files = [('share/applications', ['scripts/spyder.desktop']), ('share/icons', ['img_src/spyder.png']), ('share/metainfo', @@ -197,7 +197,6 @@ setup_args = dict( 'Topic :: Scientific/Engineering', 'Topic :: Software Development :: Widget Sets', ], - cmdclass=CMDCLASS, ) @@ -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 = [ +@@ -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'], diff --git a/devel/spyder/files/patch-spyder_dependencies.py b/devel/spyder/files/patch-spyder_dependencies.py index 434dac95f9bf..ecd7f92f230b 100644 --- a/devel/spyder/files/patch-spyder_dependencies.py +++ b/devel/spyder/files/patch-spyder_dependencies.py @@ -1,20 +1,36 @@ --- 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' +@@ -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' -PYLSP_REQVER = '>=1.7.4,<1.8.0' +PYLSP_REQVER = '>=1.7.4' 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