From nobody Sun Nov 06 19:53:59 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4N54n419Wnz4gym0; Sun, 6 Nov 2022 19:54:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4N54n40THGz43QG; Sun, 6 Nov 2022 19:54:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667764440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yJ+92swhMBq8GyJe09G6NZf6zHCj5duB27WXfmJ0rd0=; b=Bl3epMTrddHHNz2jtxzMteG/9sQDgGApLjQPywnU+29uFmLBfFm2LRqQYcep28yWpAwsOC 9ZrDGdPK0pbZH/5pienlx1zIpLbt4tUM+XJYnl2UyupFZ9LoJcy4CfWt1+Ms2UkY+yKnmc Vv285Qx5sJxRMdBGVP5ypZyuQ69gWLqkFNcfP/HuXP9A7ymwjuQ1dcAfb6t7iVsNFo4+ax wWD7L7ImW5oaX0D15K9TUce3Dau9ccwX9ljf4CVcpK/HJT/UkxPzaT+h1rvWvf2XTjctP3 p7OsEqzNDKlLKrbVLw5XqT42SiGdnMtiiLtQJBRhEwIjkyr0AMHoMPDlC+cVmA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4N54n36fv6zZ4H; Sun, 6 Nov 2022 19:53:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2A6Jrx5q051310; Sun, 6 Nov 2022 19:53:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A6Jrxiv051309; Sun, 6 Nov 2022 19:53:59 GMT (envelope-from git) Date: Sun, 6 Nov 2022 19:53:59 GMT Message-Id: <202211061953.2A6Jrxiv051309@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 0ae6b8dc3f2d - main - devel/py-spyder: Update 5.3.3 -> 5.4.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0ae6b8dc3f2dfb0d0892ea5070d15c9823e2facb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667764440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yJ+92swhMBq8GyJe09G6NZf6zHCj5duB27WXfmJ0rd0=; b=vhPwLzJznl8Oxy0MyDjTUaFBfXCpuACYioqFjuhIaV7GsPFk+D6q4N6Tg1HVL0k1P2slFA x1QW0BwG42ZGgSmcwf7JiD2DLa3oVGbcuJIcTkWowzosHtJtMN/CS8kclwVj7Jye/CJrHb /t+LtNV0ch65GrXiPj3g9Yxp8kMZc85zTleqj8AxPStssV5j5s/88UjBrDqcq4KEmRJbXG COlfAUBrLVtLORQAWL+KmBLFlwO5+hk9SPwVr4o5/Wat/nIFJYPxrrpnHQfE9FtqxmsSTt g4rNXHdf3WhZyncsUZ81p5Y02g6vDndxwsIqtFGiJcjtA0l5jw6cEmM1VJYB1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667764440; a=rsa-sha256; cv=none; b=gMyLS3c7rj35YRN1STO+JMEsgwJrG/xZGiFl/AaqQCra4+ygt3WQR40pnr2Z1XcGLPPa8I 31Rzd8FHVBjYmqumhrREPZ3RbHrU/pN3vWwgnJ68nuIhQxYUhh52Uhs8DBIwsR8HRqpLtp hrhbkEjoUpSdAE4R6iq0Kddo9iP0qyAgE4Qq+HxQma8WAyuVK9VaDFlWxnRF7PsWsnjgOq ZNW46uBOBMJ4LR4eixNh3s6LyvDUEyjr9+ARRVlb+bXCdP/b0boREenHMf4AgDBJANKmnh FIbYbp+TKWUKZSkXwt6WeswKu0pYOFjUT+1Yk8QFb+qwbS/7CKO7EAyNR3v1eg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=0ae6b8dc3f2dfb0d0892ea5070d15c9823e2facb commit 0ae6b8dc3f2dfb0d0892ea5070d15c9823e2facb Author: Yuri Victorovich AuthorDate: 2022-11-06 19:41:08 +0000 Commit: Yuri Victorovich CommitDate: 2022-11-06 19:53:49 +0000 devel/py-spyder: Update 5.3.3 -> 5.4.0 Reported by: portscout --- devel/py-spyder/Makefile | 14 ++++++------ devel/py-spyder/distinfo | 6 ++--- devel/py-spyder/files/patch-binder_environment.yml | 26 ++++++++++------------ devel/py-spyder/files/patch-requirements_main.yml | 25 +++++++++------------ devel/py-spyder/files/patch-setup.py | 21 ++++++++--------- devel/py-spyder/files/patch-spyder_dependencies.py | 25 +++++++++++---------- 6 files changed, 55 insertions(+), 62 deletions(-) diff --git a/devel/py-spyder/Makefile b/devel/py-spyder/Makefile index 1aeb4b89d2b5..ec57c2254417 100644 --- a/devel/py-spyder/Makefile +++ b/devel/py-spyder/Makefile @@ -1,7 +1,6 @@ PORTNAME= spyder DISTVERSIONPREFIX= v -DISTVERSION= 5.3.3 -PORTREVISION= 2 +DISTVERSION= 5.4.0 CATEGORIES= devel science python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -32,20 +31,21 @@ RUN_DEPENDS= \ ${PYTHON_PKGNAMEPREFIX}psutil>=5.3:sysutils/py-psutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygments>=2.0:textproc/py-pygments@${PY_FLAVOR} \ pylint${PYTHON_PKGNAMESUFFIX}>=2.5.0:devel/pylint@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pylint-venv>=2.1.1: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.5.0:textproc/py-python-lsp-server@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-lsp-server>0: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}qstylizer>=0.1.10:devel/py-qstylizer@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}QtAwesome>=1.0.2:x11-fonts/py-QtAwesome@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}qtconsole>=5.3.2:devel/py-qtconsole@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}qstylizer>=0.2.2:devel/py-qstylizer@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}QtAwesome>0:x11-fonts/py-QtAwesome@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}qtconsole>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.3.3:devel/py-spyder-kernels@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}spyder-kernels>=2.4.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/py-spyder/distinfo b/devel/py-spyder/distinfo index d2b2120d366b..ae870f74bd71 100644 --- a/devel/py-spyder/distinfo +++ b/devel/py-spyder/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1665651743 -SHA256 (spyder-ide-spyder-v5.3.3_GH0.tar.gz) = 1e59bbddb1846e777e6938d6f600c57466bf8df8c30fdccf17838838b8666ec7 -SIZE (spyder-ide-spyder-v5.3.3_GH0.tar.gz) = 24443628 +TIMESTAMP = 1667752855 +SHA256 (spyder-ide-spyder-v5.4.0_GH0.tar.gz) = 9e0bfc68baaa420cb894539d07ebab412f03b98499376106191245f14d216b77 +SIZE (spyder-ide-spyder-v5.4.0_GH0.tar.gz) = 24497211 diff --git a/devel/py-spyder/files/patch-binder_environment.yml b/devel/py-spyder/files/patch-binder_environment.yml index 8bf4bcbdb80a..838b4e9c6f95 100644 --- a/devel/py-spyder/files/patch-binder_environment.yml +++ b/devel/py-spyder/files/patch-binder_environment.yml @@ -1,20 +1,18 @@ ---- binder/environment.yml.orig 2022-08-29 23:48:19 UTC +--- binder/environment.yml.orig 2022-11-04 20:45:25 UTC +++ binder/environment.yml -@@ -33,7 +33,7 @@ - pyzmq >=22.1.0 - - python-lsp-server >=1.5.0,<1.6.0 +@@ -31,12 +31,12 @@ dependencies: + - pyqt <5.16 + - pyqtwebengine <5.16 + - python-lsp-black >=1.2.0 +-- python-lsp-server >=1.6.0,<1.7.0 ++- python-lsp-server >0 - pyxdg >=0.26 - pyzmq >=22.1.0 -- qdarkstyle >=3.0.2,<3.1.0 +- qdarkstyle >=3.0.2 - - qstylizer >=0.1.10 - - qtawesome >=1.0.2 - - qtconsole >=5.3.2,<5.4.0 -@@ -41,7 +41,7 @@ - sphinx >=0.6.6 + - qstylizer >=0.2.2 +-- qtawesome >=1.2.1 ++- qtawesome >0 + - qtconsole >=5.4.0,<5.5.0 + - qtpy >=2.1.0 - rtree >=0.9.7 - - setuptools >=49.6.0 - - sphinx >=0.6.6 --- spyder-kernels >=2.3.3,<2.4.0 -+- spyder-kernels >=2.3.3,<2.4.1 - - textdistance >=4.2.0 - - three-merge >=0.1.1 - - watchdog >=0.10.3 diff --git a/devel/py-spyder/files/patch-requirements_main.yml b/devel/py-spyder/files/patch-requirements_main.yml index 9cd3f6a77a11..3ed1e779ee88 100644 --- a/devel/py-spyder/files/patch-requirements_main.yml +++ b/devel/py-spyder/files/patch-requirements_main.yml @@ -1,20 +1,17 @@ ---- requirements/main.yml.orig 2022-08-29 23:48:19 UTC +--- requirements/main.yml.orig 2022-11-04 20:45:25 UTC +++ requirements/main.yml -@@ -30,7 +30,7 @@ dependencies: +@@ -29,11 +29,11 @@ dependencies: + - pyqt <5.16 + - pyqtwebengine <5.16 - python-lsp-black >=1.2.0 - - python-lsp-server >=1.5.0,<1.6.0 +- - python-lsp-server >=1.6.0,<1.7.0 ++ - python-lsp-server >0 - pyzmq >=22.1.0 - - qdarkstyle >=3.0.2,<3.1.0 + - qdarkstyle >=3.0.2 - - qstylizer >=0.1.10 - - qtawesome >=1.0.2 - - qtconsole >=5.3.2,<5.4.0 -@@ -38,7 +38,7 @@ dependencies: + - qstylizer >=0.2.2 +- - qtawesome >=1.2.1 ++ - qtawesome >=0 + - qtconsole >=5.4.0,<5.5.0 + - qtpy >=2.1.0 - rtree >=0.9.7 - - setuptools >=49.6.0 - - sphinx >=0.6.6 -- - spyder-kernels >=2.3.3,<2.4.0 -+ - spyder-kernels >=2.3.3,<2.4.1 - - textdistance >=4.2.0 - - three-merge >=0.1.1 - - watchdog >=0.10.3 diff --git a/devel/py-spyder/files/patch-setup.py b/devel/py-spyder/files/patch-setup.py index c8d2aefccc70..92b9fdaca28e 100644 --- a/devel/py-spyder/files/patch-setup.py +++ b/devel/py-spyder/files/patch-setup.py @@ -1,4 +1,4 @@ ---- setup.py.orig 2022-08-29 23:48:19 UTC +--- setup.py.orig 2022-11-04 20:45:25 UTC +++ setup.py @@ -91,7 +91,7 @@ def get_data_files(): """ @@ -17,25 +17,22 @@ ) -@@ -229,17 +228,17 @@ install_requires = [ +@@ -229,13 +228,13 @@ install_requires = [ + 'pyls-spyder>=0.4.0', 'pyqt5<5.16', 'pyqtwebengine<5.16', - 'python-lsp-server[all]>=1.5.0,<1.6.0', +- 'python-lsp-server[all]>=1.6.0,<1.7.0', - 'pyxdg>=0.26;platform_system=="Linux"', ++ 'python-lsp-server[all]>0', # maybe dangerous to ignore >=1.6.0,<1.7.0 + 'pyxdg>=0.26', 'pyzmq>=22.1.0', - 'qdarkstyle>=3.0.2,<3.1.0', + 'qdarkstyle>=3.0.2', - 'qstylizer>=0.1.10', - 'qtawesome>=1.0.2', -- 'qtconsole>=5.3.2,<5.4.0', + 'qstylizer>=0.2.2', +- 'qtawesome>=1.2.1', +- 'qtconsole>=5.4.0,<5.5.0', ++ 'qtawesome', # maybe dangerous to ignore >=1.2.1 + 'qtconsole', 'qtpy>=2.1.0', 'rtree>=0.9.7', 'setuptools>=49.6.0', - 'sphinx>=0.6.6', -- 'spyder-kernels>=2.3.3,<2.4.0', -+ 'spyder-kernels>=2.3.3,<2.4.1', - 'textdistance>=4.2.0', - 'three-merge>=0.1.1', - 'watchdog>=0.10.3' diff --git a/devel/py-spyder/files/patch-spyder_dependencies.py b/devel/py-spyder/files/patch-spyder_dependencies.py index a6ab54dc79a7..926bbbeed58a 100644 --- a/devel/py-spyder/files/patch-spyder_dependencies.py +++ b/devel/py-spyder/files/patch-spyder_dependencies.py @@ -1,21 +1,22 @@ ---- spyder/dependencies.py.orig 2022-08-29 23:48:19 UTC +--- spyder/dependencies.py.orig 2022-11-04 20:45:25 UTC +++ spyder/dependencies.py -@@ -57,15 +57,15 @@ PYZMQ_REQVER = '>=22.1.0' +@@ -53,15 +53,15 @@ PSUTIL_REQVER = '>=5.3' + PYGMENTS_REQVER = '>=2.0' + PYLINT_REQVER = '>=2.5.0;<3.0' + PYLINT_VENV_REQVER = '>=2.1.1' +-PYLSP_REQVER = '>=1.6.0;<1.7.0' ++PYLSP_REQVER = '>0' # until dependency is updated + PYLSP_BLACK_REQVER = '>=1.2.0' PYLS_SPYDER_REQVER = '>=0.4.0' PYXDG_REQVER = '>=0.26' PYZMQ_REQVER = '>=22.1.0' -QDARKSTYLE_REQVER = '>=3.0.2;<3.1.0' +QDARKSTYLE_REQVER = '>=3.0.2' - QSTYLIZER_REQVER = '>=0.1.10' - QTAWESOME_REQVER = '>=1.0.2' --QTCONSOLE_REQVER = '>=5.3.2;<5.4.0' -+QTCONSOLE_REQVER = '>0' + QSTYLIZER_REQVER = '>=0.2.2' +-QTAWESOME_REQVER = '>=1.2.1' +-QTCONSOLE_REQVER = '>=5.4.0;<5.5.0' ++QTAWESOME_REQVER = '>0' # until dependency is updated ++QTCONSOLE_REQVER = '>0' # until dependency is updated QTPY_REQVER = '>=2.1.0' RTREE_REQVER = '>=0.9.7' SETUPTOOLS_REQVER = '>=49.6.0' - SPHINX_REQVER = '>=0.6.6' --SPYDER_KERNELS_REQVER = '>=2.3.3;<2.4.0' -+SPYDER_KERNELS_REQVER = '>=2.3.3;<2.4.1' - TEXTDISTANCE_REQVER = '>=4.2.0' - THREE_MERGE_REQVER = '>=0.1.1' - # None for pynsist install for now