Date: Fri, 19 Jan 2024 07:14:30 GMT From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: ff1065f44354 - main - devel/spyder: update 5.4.5 =?utf-8?Q?=E2=86=92?= 5.5.0 Message-ID: <202401190714.40J7EUZ2084726@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=ff1065f44354deeb5610fa4f33b532bbfbf1c4fd commit ff1065f44354deeb5610fa4f33b532bbfbf1c4fd Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2024-01-19 06:39:11 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2024-01-19 07:14:23 +0000 devel/spyder: update 5.4.5 → 5.5.0 Reported by: portscout --- devel/spyder/Makefile | 11 +++---- devel/spyder/distinfo | 6 ++-- devel/spyder/files/patch-binder_environment.yml | 28 ++++++++-------- devel/spyder/files/patch-requirements_main.yml | 26 +++++++-------- devel/spyder/files/patch-setup.py | 44 ++++++++++++------------- devel/spyder/files/patch-spyder_dependencies.py | 30 ++++++++--------- 6 files changed, 72 insertions(+), 73 deletions(-) diff --git a/devel/spyder/Makefile b/devel/spyder/Makefile index 8e699bf45c36..4c561b12413b 100644 --- a/devel/spyder/Makefile +++ b/devel/spyder/Makefile @@ -1,7 +1,6 @@ PORTNAME= spyder DISTVERSIONPREFIX= v -DISTVERSION= 5.4.5 -DISTREVISION= 3 +DISTVERSION= 5.5.0 CATEGORIES= devel science python MAINTAINER= yuri@FreeBSD.org @@ -18,7 +17,7 @@ RUN_DEPENDS= \ ${PYTHON_PKGNAMEPREFIX}cookiecutter>=1.6.0:devel/py-cookiecutter@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}diff-match-patch>=20181111:textproc/py-diff-match-patch@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}intervaltree>=3.0.2:devel/py-intervaltree@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}ipython>=7.31.1:devel/ipython@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ipython>=8.13.0:devel/ipython@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jedi>=0.17.2:devel/py-jedi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jellyfish>=0.7:devel/py-jellyfish@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jsonschema>=3.2.0:devel/py-jsonschema@${PY_FLAVOR} \ @@ -38,14 +37,14 @@ RUN_DEPENDS= \ ${PYTHON_PKGNAMEPREFIX}python-lsp-server>=1.7.4:textproc/py-python-lsp-server@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xdg>=0.26:devel/py-xdg@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyzmq>=22.1.0:net/py-pyzmq@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}QDarkStyle>=3.0.2:textproc/py-QDarkStyle@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}QDarkStyle>=3.2.0:textproc/py-QDarkStyle@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}qstylizer>=0.2.2:devel/py-qstylizer@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}QtAwesome>=1.2.1:x11-fonts/py-QtAwesome@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}qtconsole>=5.4.0:devel/py-qtconsole@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}qtconsole>=5.5.0:devel/py-qtconsole@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}QtPy>=2.1.0:devel/py-QtPy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}rtree>=0.9.7:devel/py-rtree@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx>=0.6.6:textproc/py-sphinx@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}spyder-kernels>=2.4.4:devel/py-spyder-kernels@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}spyder-kernels>=2.5.0:devel/py-spyder-kernels@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}textdistance>=4.2.0:textproc/py-textdistance@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}three-merge>=0.1.1:textproc/py-three-merge@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}watchdog>=0.10.3:devel/py-watchdog@${PY_FLAVOR} diff --git a/devel/spyder/distinfo b/devel/spyder/distinfo index 343b333514c1..0924662544a4 100644 --- a/devel/spyder/distinfo +++ b/devel/spyder/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1693373255 -SHA256 (spyder-ide-spyder-v5.4.5_GH0.tar.gz) = ab50960bfe496c475e78336fd614eb4ebef485ea4e18fc3eb5130228ec2eb2d1 -SIZE (spyder-ide-spyder-v5.4.5_GH0.tar.gz) = 16214117 +TIMESTAMP = 1705635243 +SHA256 (spyder-ide-spyder-v5.5.0_GH0.tar.gz) = 8d7d86add5147698da0e3658ed65c2a594727130027a69fc62e719f59e32ae86 +SIZE (spyder-ide-spyder-v5.5.0_GH0.tar.gz) = 16251845 diff --git a/devel/spyder/files/patch-binder_environment.yml b/devel/spyder/files/patch-binder_environment.yml index ffb4f4a9eb32..766d5ebf899f 100644 --- a/devel/spyder/files/patch-binder_environment.yml +++ b/devel/spyder/files/patch-binder_environment.yml @@ -1,34 +1,34 @@ ---- binder/environment.yml.orig 2023-08-29 21:53:14 UTC +--- binder/environment.yml.orig 2023-11-08 03:05:24 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 +@@ -14,7 +14,7 @@ - ipython >=8.13.0,<9.0.0,!=8.17.1 - 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 + - ipython >=8.13.0,<9.0.0,!=8.17.1 +-- jedi >=0.17.2,<0.20.0 +- jedi >=0.17.2 - jellyfish >=0.7 - jsonschema >=3.2.0 - keyring >=17.0.0 @@ -31,18 +31,18 @@ - python-lsp-black >=1.2.0,<3.0.0 - - pyqt <5.16 - - pyqtwebengine <5.16 + - pyqt >=5.10,<5.16 + - pyqtwebengine >=5.10,<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 +-- python-lsp-server >=1.9.0,<1.10.0 ++- python-lsp-server >=1.9.0 - pyxdg >=0.26 - pyzmq >=22.1.0 --- qdarkstyle >=3.0.2,<3.2.0 -+- qdarkstyle >=3.0.2 +-- qdarkstyle >=3.2.0,<3.3.0 ++- qdarkstyle >=3.2.0 - qstylizer >=0.2.2 - qtawesome >=1.2.1 --- qtconsole >=5.4.2,<5.5.0 -+- qtconsole >=5.4.2 +-- qtconsole >=5.5.0,<5.6.0 ++- qtconsole >=5.5.0 - 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 +-- spyder-kernels >=2.5.0,<2.6.0 ++- spyder-kernels >=2.5.0 - 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 3fab70d7138b..e339e1ad19c3 100644 --- a/devel/spyder/files/patch-requirements_main.yml +++ b/devel/spyder/files/patch-requirements_main.yml @@ -1,33 +1,33 @@ ---- requirements/main.yml.orig 2023-08-29 21:53:14 UTC +--- requirements/main.yml.orig 2023-11-08 03:05:24 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 + - ipython >=8.13.0,<9.0.0,!=8.17.1 +- - jedi >=0.17.2,<0.20.0 + - jedi >=0.17.2 - jellyfish >=0.7 - jsonschema >=3.2.0 - keyring >=17.0.0 @@ -29,17 +29,17 @@ dependencies: - - pyqt <5.16 - - pyqtwebengine <5.16 + - pyqt >=5.10,<5.16 + - pyqtwebengine >=5.10,<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 +- - python-lsp-server >=1.9.0,<1.10.0 ++ - python-lsp-server >=1.9.0 - pyzmq >=22.1.0 -- - qdarkstyle >=3.0.2,<3.2.0 -+ - qdarkstyle >=3.0.2 +- - qdarkstyle >=3.2.0,<3.3.0 ++ - qdarkstyle >=3.2.0 - qstylizer >=0.2.2 - qtawesome >=1.2.1 -- - qtconsole >=5.4.2,<5.5.0 -+ - qtconsole >=5.4.2 +- - qtconsole >=5.5.0,<5.6.0 ++ - qtconsole >=5.5.0 - 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 +- - spyder-kernels >=2.5.0,<2.6.0 ++ - spyder-kernels >=2.5.0 - 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 01491362a48d..f8a61e29d460 100644 --- a/devel/spyder/files/patch-setup.py +++ b/devel/spyder/files/patch-setup.py @@ -1,4 +1,4 @@ ---- setup.py.orig 2023-08-29 21:53:14 UTC +--- setup.py.orig 2023-11-08 03:05:24 UTC +++ setup.py @@ -91,7 +91,7 @@ def get_data_files(): """ @@ -9,7 +9,7 @@ data_files = [('share/applications', ['scripts/spyder.desktop']), ('share/icons', ['img_src/spyder.png']), ('share/metainfo', -@@ -197,7 +197,6 @@ setup_args = dict( +@@ -199,7 +199,6 @@ setup_args = dict( 'Topic :: Scientific/Engineering', 'Topic :: Software Development :: Widget Sets', ], @@ -17,44 +17,44 @@ ) -@@ -210,7 +209,7 @@ install_requires = [ - 'diff-match-patch>=20181111', +@@ -213,7 +212,7 @@ install_requires = [ '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', + 'ipython>=8.12.2,<8.13.0; python_version=="3.8"', + 'ipython>=8.13.0,<9.0.0,!=8.17.1; python_version>"3.8"', +- 'jedi>=0.17.2,<0.20.0', + 'jedi>=0.17.2', 'jellyfish>=0.7', 'jsonschema>=3.2.0', 'keyring>=17.0.0', -@@ -229,18 +228,18 @@ install_requires = [ +@@ -232,18 +231,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', + 'pyqt5>=5.10,<5.16', + 'pyqtwebengine>=5.10,<5.16', +- 'python-lsp-server[all]>=1.9.0,<1.10.0', ++ 'python-lsp-server[all]>=1.9.0', 'pyxdg>=0.26;platform_system=="Linux"', 'pyzmq>=22.1.0', -- 'qdarkstyle>=3.0.2,<3.2.0', -+ 'qdarkstyle>=3.0.2', +- 'qdarkstyle>=3.2.0,<3.3.0', ++ 'qdarkstyle>=3.2.0', 'qstylizer>=0.2.2', 'qtawesome>=1.2.1', -- 'qtconsole>=5.4.2,<5.5.0', -+ 'qtconsole>=5.4.2', +- 'qtconsole>=5.5.0,<5.6.0', ++ 'qtconsole>=5.5.0', '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', +- 'spyder-kernels>=2.5.0,<2.6.0', ++ 'spyder-kernels>=2.5.0', 'textdistance>=4.2.0', 'three-merge>=0.1.1', 'watchdog>=0.10.3' -@@ -253,7 +252,7 @@ if 'dev' in __version__: +@@ -256,7 +255,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') + install_requires.append('python-lsp-server[all]>=1.9.0,<1.11.0') + install_requires.append('qtconsole>=5.5.0,<5.7.0') +- install_requires.append('spyder-kernels>=2.5.0,<2.7.0') ++ install_requires.append('spyder-kernels>=2.5.0') 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 ecd7f92f230b..ad5f1e2f4642 100644 --- a/devel/spyder/files/patch-spyder_dependencies.py +++ b/devel/spyder/files/patch-spyder_dependencies.py @@ -1,36 +1,36 @@ ---- spyder/dependencies.py.orig 2023-08-29 21:53:14 UTC +--- spyder/dependencies.py.orig 2023-11-08 03:05:24 UTC +++ spyder/dependencies.py -@@ -40,7 +40,7 @@ IPYTHON_REQVER = ( +@@ -44,7 +44,7 @@ IPYTHON_REQVER = ">=8.12.2,<8.13.0" if PY38 else ">=8. + # (check way to add dist.info/egg.info from packages without wheels available) 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' + IPYTHON_REQVER = ">=8.12.2,<8.13.0" if PY38 else ">=8.13.0,<9.0.0,!=8.17.1" +-JEDI_REQVER = '>=0.17.2,<0.20.0' +JEDI_REQVER = '>=0.17.2' JELLYFISH_REQVER = '>=0.7' JSONSCHEMA_REQVER = '>=3.2.0' KEYRING_REQVER = '>=17.0.0' -@@ -54,20 +54,20 @@ PYLINT_VENV_REQVER = '>=3.0.2' +@@ -58,20 +58,20 @@ PYLINT_VENV_REQVER = '>=3.0.2' PYGMENTS_REQVER = '>=2.0' - PYLINT_REQVER = '>=2.5.0,<3.0' + PYLINT_REQVER = '>=2.5.0,<3.1' PYLINT_VENV_REQVER = '>=3.0.2' --PYLSP_REQVER = '>=1.7.4,<1.8.0' -+PYLSP_REQVER = '>=1.7.4' +-PYLSP_REQVER = '>=1.9.0,<1.10.0' ++PYLSP_REQVER = '>=1.9.0' 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' +-QDARKSTYLE_REQVER = '>=3.2.0,<3.3.0' ++QDARKSTYLE_REQVER = '>=3.2.0' QSTYLIZER_REQVER = '>=0.2.2' QTAWESOME_REQVER = '>=1.2.1' --QTCONSOLE_REQVER = '>=5.4.2,<5.5.0' -+QTCONSOLE_REQVER = '>=5.4.2' +-QTCONSOLE_REQVER = '>=5.5.0,<5.6.0' ++QTCONSOLE_REQVER = '>=5.5.0' 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' +-SPYDER_KERNELS_REQVER = '>=2.5.0,<2.6.0' ++SPYDER_KERNELS_REQVER = '>=2.5.0' TEXTDISTANCE_REQVER = '>=4.2.0' THREE_MERGE_REQVER = '>=0.1.1' # None for pynsist install for now
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401190714.40J7EUZ2084726>