diff --git a/devel/spyder/Makefile b/devel/spyder/Makefile index 1066142f4d02..3e88a42aeb0c 100644 --- a/devel/spyder/Makefile +++ b/devel/spyder/Makefile @@ -1,67 +1,74 @@ PORTNAME= spyder DISTVERSIONPREFIX= v -DISTVERSION= 5.5.0 -PORTREVISION= 1 +DISTVERSION= 5.5.1 CATEGORIES= devel science python MAINTAINER= yuri@FreeBSD.org COMMENT= Scientific PYthon Development EnviRonment, an alternative to IDLE WWW= https://www.spyder-ide.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= \ ${PYTHON_PKGNAMEPREFIX}atomicwrites>=1.2.0:devel/py-atomicwrites@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}chardet>=2.0.0:textproc/py-chardet@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cloudpickle>=0.5.0:devel/py-cloudpickle@${PY_FLAVOR} \ ${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>=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} \ ${PYTHON_PKGNAMEPREFIX}keyring>=17.0.0:security/py-keyring@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}nbconvert>=4.0:devel/py-nbconvert@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}numpydoc>=0.6.0:textproc/py-numpydoc@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}parso>=0.7.0:textproc/py-parso@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pexpect>=4.4.0:misc/py-pexpect@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pickleshare>=0.4:databases/py-pickleshare@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psutil>=5.3:sysutils/py-psutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygments>=2.0:textproc/py-pygments@${PY_FLAVOR} \ pylint${PYTHON_PKGNAMESUFFIX}>=3.1.0:devel/pylint@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pylint-venv>=3.0.2:devel/py-pylint-venv@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}python-lsp-black>=1.2.0:textproc/py-python-lsp-black@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyls-spyder>=0.4.0:textproc/py-pyls-spyder@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}qt5-webengine>0:www/py-qt5-webengine@${PY_FLAVOR} \ ${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.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.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.5.1: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} USES= desktop-file-utils python pyqt:5 USE_PYTHON= distutils autoplist noflavors USE_PYQT= pyqt5 sip USE_GITHUB= yes GH_ACCOUNT= spyder-ide NO_ARCH= yes DOCSDIR= ${PYTHON_SITELIBDIR}/spyder +post-patch: + ${REINPLACE_CMD} \ + -E 's|,<[0-9.=]+||' \ + ${WRKSRC}/setup.py \ + ${WRKSRC}/binder/environment.yml \ + ${WRKSRC}/requirements/main.yml \ + ${WRKSRC}/spyder/dependencies.py + post-extract: # remove bundled dependencies @${RM} -r ${WRKSRC}/external-deps/* .include diff --git a/devel/spyder/distinfo b/devel/spyder/distinfo index 0924662544a4..a8232a812a09 100644 --- a/devel/spyder/distinfo +++ b/devel/spyder/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1705635243 -SHA256 (spyder-ide-spyder-v5.5.0_GH0.tar.gz) = 8d7d86add5147698da0e3658ed65c2a594727130027a69fc62e719f59e32ae86 -SIZE (spyder-ide-spyder-v5.5.0_GH0.tar.gz) = 16251845 +TIMESTAMP = 1710039569 +SHA256 (spyder-ide-spyder-v5.5.1_GH0.tar.gz) = d0d62f1bca301e875927012f2013f3442c9a3ad5528243f7fd1c47b5f180c399 +SIZE (spyder-ide-spyder-v5.5.1_GH0.tar.gz) = 16254673 diff --git a/devel/spyder/files/patch-binder_environment.yml b/devel/spyder/files/patch-binder_environment.yml deleted file mode 100644 index 83f2f7f742cf..000000000000 --- a/devel/spyder/files/patch-binder_environment.yml +++ /dev/null @@ -1,44 +0,0 @@ ---- binder/environment.yml.orig 2023-11-08 03:05:24 UTC -+++ binder/environment.yml -@@ -13,8 +13,8 @@ - intervaltree >=3.0.2 - - cookiecutter >=1.6.0 - - diff-match-patch >=20181111 - - intervaltree >=3.0.2 --- ipython >=8.13.0,<9.0.0,!=8.17.1 --- jedi >=0.17.2,<0.20.0 -+- ipython >=8.13.0,!=8.17.1 -+- jedi >=0.17.2 - - jellyfish >=0.7 - - jsonschema >=3.2.0 - - keyring >=17.0.0 -@@ -25,24 +25,24 @@ - pygments >=2.0 - - pickleshare >=0.4 - - psutil >=5.3 - - pygments >=2.0 --- pylint >=2.5.0,<3.1 -+- pylint >=2.5.0 - - pylint-venv >=3.0.2 - - pyls-spyder >=0.4.0 - - pyqt >=5.10,<5.16 - - pyqtwebengine >=5.10,<5.16 --- python-lsp-black >=1.2.0,<3.0.0 --- python-lsp-server >=1.9.0,<1.10.0 -+- python-lsp-black >=1.2.0 -+- python-lsp-server >=1.9.0 - - pyxdg >=0.26 - - pyzmq >=22.1.0 --- qdarkstyle >=3.2.0,<3.3.0 -+- qdarkstyle >=3.2.0 - - qstylizer >=0.2.2 - - qtawesome >=1.2.1 --- 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.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 deleted file mode 100644 index 133061b8ce3e..000000000000 --- a/devel/spyder/files/patch-requirements_main.yml +++ /dev/null @@ -1,40 +0,0 @@ ---- 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 >=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 -@@ -23,23 +23,23 @@ dependencies: - - pickleshare >=0.4 - - psutil >=5.3 - - pygments >=2.0 -- - pylint >=2.5.0,<3.1 -+ - pylint >=2.5.0 - - pylint-venv >=3.0.2 - - pyls-spyder >=0.4.0 - - pyqt >=5.10,<5.16 - - pyqtwebengine >=5.10,<5.16 - - python-lsp-black >=1.2.0,<3.0.0 -- - python-lsp-server >=1.9.0,<1.10.0 -+ - python-lsp-server >=1.9.0 - - pyzmq >=22.1.0 -- - qdarkstyle >=3.2.0,<3.3.0 -+ - qdarkstyle >=3.2.0 - - qstylizer >=0.2.2 - - qtawesome >=1.2.1 -- - 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.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 d3b59f20fd68..d713aaca8e57 100644 --- a/devel/spyder/files/patch-setup.py +++ b/devel/spyder/files/patch-setup.py @@ -1,67 +1,19 @@ --- setup.py.orig 2023-11-08 03:05:24 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', @@ -199,7 +199,6 @@ setup_args = dict( 'Topic :: Scientific/Engineering', 'Topic :: Software Development :: Widget Sets', ], - cmdclass=CMDCLASS, ) -@@ -213,7 +212,7 @@ install_requires = [ - 'intervaltree>=3.0.2', - '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', -@@ -226,24 +225,24 @@ install_requires = [ - 'pickleshare>=0.4', - 'psutil>=5.3', - 'pygments>=2.0', -- 'pylint>=2.5.0,<3.1', -+ 'pylint>=2.5.0', - 'pylint-venv>=3.0.2', - 'python-lsp-black>=1.2.0,<3.0.0', - 'pyls-spyder>=0.4.0', - '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.2.0,<3.3.0', -+ 'qdarkstyle>=3.2.0', - 'qstylizer>=0.2.2', - 'qtawesome>=1.2.1', -- '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.5.0,<2.6.0', -+ 'spyder-kernels>=2.5.0', - 'textdistance>=4.2.0', - 'three-merge>=0.1.1', - 'watchdog>=0.10.3' -@@ -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.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 deleted file mode 100644 index bad0a419f01a..000000000000 --- a/devel/spyder/files/patch-spyder_dependencies.py +++ /dev/null @@ -1,39 +0,0 @@ ---- spyder/dependencies.py.orig 2023-11-08 03:05:24 UTC -+++ spyder/dependencies.py -@@ -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 = ">=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' -@@ -56,22 +56,22 @@ PYGMENTS_REQVER = '>=2.0' - PICKLESHARE_REQVER = '>=0.4' - PSUTIL_REQVER = '>=5.3' - PYGMENTS_REQVER = '>=2.0' --PYLINT_REQVER = '>=2.5.0,<3.1' -+PYLINT_REQVER = '>=2.5.0' - PYLINT_VENV_REQVER = '>=3.0.2' --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.2.0,<3.3.0' -+QDARKSTYLE_REQVER = '>=3.2.0' - QSTYLIZER_REQVER = '>=0.2.2' - QTAWESOME_REQVER = '>=1.2.1' --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.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