From nobody Mon Mar 27 01:29:26 2023 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 4PlFbV5DkWz41T8H; Mon, 27 Mar 2023 01:29:26 +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 4PlFbV4cdDz3Jjd; Mon, 27 Mar 2023 01:29:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679880566; 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=CcLLA6W8jkLMFnVNJwZKn/x8c1nI1VAcwvTS1UvaTNc=; b=nvlhdMU1UsCdQqqkwRiVSCugjgBbDjqFgq/3btD0OxPh6aiomjBVf4nyuN4n4tWwgomQz6 lurSvX4c4exJBQKkpXt79MvTXwet2bNKYYfqRcQB6YFkfqHd2QbiKeL2ww1mJSMmWj+PK8 xSQARnqCBXqvZ3u/hnLKeXd6QdSnT5iKHj4tlmF2duNBAHQdE8Y74Q2tW90/KBgo1Fmf+4 BEhx4z6iSuuhMG2WUCuDDnft5i1cmiEXganp/VCbyZiMlAeJKik/EJEjp2HVQj5ba6YOgp muR69tnS0X05e6JUj97lFLYt86G/JrtxcczEWU+JeMDRJMSTYBEE46vFXGb35Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679880566; 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=CcLLA6W8jkLMFnVNJwZKn/x8c1nI1VAcwvTS1UvaTNc=; b=oJK4zEidofuJ+Y3+GHmFq+FGJU0+EWND5pfp17qgx8UUVaBVZNUviiQYQsYjZaVvaQnyon qvAhMgxakHik2KHyoK0wU3mfWQcFeWNoVkyZVCvmnqPY2ubUiiXyigm6dAmkHXiW3Y8WN+ znpiCqwoBsgnFuusSh0glGm9JnFui71GwCgSYSmbp4SuAWmlA3DEjRc7CjyTWKQAM7XG97 x6mqSUaJCIB3o1vTIMQLafxENxZ3wIRaMCevu95Y62kfpCdLhQBPNXdG4sWwcEi34mZdl2 awtwMP/8JNFBML8s4gpOKoq5WwUIp5E2v1PKob8uX/MjwxdiyarylXs18ZJ9XA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679880566; a=rsa-sha256; cv=none; b=CRD2fboYFF0PE5nkO8T1M/ESgJ37YBNDA3HuLJAeJQROIdFjKRIfMFZaiaX7L3pEQMpv+i 2ZmTVnQZmWeUrbg2UaWJ263wTf0tLk+w06azXmwV/YIbtL2Tpm2WOja7rW7olRDl61z53z YC9/4swbSdpxAwF07Vj+khlZbUA7sM8HmZSSptF2i8g5o9X4jQEzPqeQ0ebadwC8JyaVXP lt9hBXt7Tpk4wY+2QvG2vIESGKDWG4xFCHHwvR0ATcHou72f7WkeGQaIzOv/LOpZfoK5Gp TktzBnWNCemxS61YcyN939vsUokp+7f3IGZtIXu40wVecGNWwsXmx3pKJ1lH1g== 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 4PlFbV3M0Nz135B; Mon, 27 Mar 2023 01:29:26 +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 32R1TQM7071483; Mon, 27 Mar 2023 01:29:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32R1TQBc071482; Mon, 27 Mar 2023 01:29:26 GMT (envelope-from git) Date: Mon, 27 Mar 2023 01:29:26 GMT Message-Id: <202303270129.32R1TQBc071482@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: b16985093aa1 - main - =?utf-8?Q?devel/spyder:=20Update=205.4.0=20=E2=86=92=205.4.2?= 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: b16985093aa15fd4c39768d932fb632c6d162f23 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=b16985093aa15fd4c39768d932fb632c6d162f23 commit b16985093aa15fd4c39768d932fb632c6d162f23 Author: Yuri Victorovich AuthorDate: 2023-03-26 23:31:58 +0000 Commit: Yuri Victorovich CommitDate: 2023-03-27 01:29:21 +0000 devel/spyder: Update 5.4.0 → 5.4.2 Reported by: portscout --- devel/spyder/Makefile | 9 ++++----- devel/spyder/distinfo | 6 +++--- devel/spyder/files/patch-binder_environment.yml | 11 ++++------- devel/spyder/files/patch-requirements_main.yml | 13 +++++-------- devel/spyder/files/patch-setup.py | 20 +++++++------------- devel/spyder/files/patch-spyder_dependencies.py | 17 ++++++----------- 6 files changed, 29 insertions(+), 47 deletions(-) diff --git a/devel/spyder/Makefile b/devel/spyder/Makefile index 413185ec9323..b3fdf4e0764a 100644 --- a/devel/spyder/Makefile +++ b/devel/spyder/Makefile @@ -1,7 +1,6 @@ PORTNAME= spyder DISTVERSIONPREFIX= v -DISTVERSION= 5.4.0 -PORTREVISION= 2 +DISTVERSION= 5.4.2 CATEGORIES= devel science python MAINTAINER= yuri@FreeBSD.org @@ -40,12 +39,12 @@ RUN_DEPENDS= \ ${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.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}QtAwesome>=1.2.1:x11-fonts/py-QtAwesome@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}qtconsole>=5.4.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.0:devel/py-spyder-kernels@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}spyder-kernels>=2.4.2: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 ae870f74bd71..52feda538016 100644 --- a/devel/spyder/distinfo +++ b/devel/spyder/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1667752855 -SHA256 (spyder-ide-spyder-v5.4.0_GH0.tar.gz) = 9e0bfc68baaa420cb894539d07ebab412f03b98499376106191245f14d216b77 -SIZE (spyder-ide-spyder-v5.4.0_GH0.tar.gz) = 24497211 +TIMESTAMP = 1679793033 +SHA256 (spyder-ide-spyder-v5.4.2_GH0.tar.gz) = 6011b9cd0a09c8393351548a299d4e0ffa2903a1f1fede7427ed78b89f35f0fc +SIZE (spyder-ide-spyder-v5.4.2_GH0.tar.gz) = 24523453 diff --git a/devel/spyder/files/patch-binder_environment.yml b/devel/spyder/files/patch-binder_environment.yml index 838b4e9c6f95..168de394dc37 100644 --- a/devel/spyder/files/patch-binder_environment.yml +++ b/devel/spyder/files/patch-binder_environment.yml @@ -1,18 +1,15 @@ ---- binder/environment.yml.orig 2022-11-04 20:45:25 UTC +--- binder/environment.yml.orig 2023-01-18 21:16:10 UTC +++ binder/environment.yml -@@ -31,12 +31,12 @@ dependencies: +@@ -31,10 +31,10 @@ 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 >=1.7.1,<1.8.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.2.2 --- qtawesome >=1.2.1 -+- qtawesome >0 + - qtawesome >=1.2.1 - qtconsole >=5.4.0,<5.5.0 - - qtpy >=2.1.0 - - rtree >=0.9.7 diff --git a/devel/spyder/files/patch-requirements_main.yml b/devel/spyder/files/patch-requirements_main.yml index 3ed1e779ee88..2c2310dad432 100644 --- a/devel/spyder/files/patch-requirements_main.yml +++ b/devel/spyder/files/patch-requirements_main.yml @@ -1,17 +1,14 @@ ---- requirements/main.yml.orig 2022-11-04 20:45:25 UTC +--- requirements/main.yml.orig 2023-01-18 21:16:10 UTC +++ requirements/main.yml -@@ -29,11 +29,11 @@ dependencies: +@@ -29,9 +29,9 @@ 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 +- - python-lsp-server >=1.7.1,<1.8.0 ++ - python-lsp-server - pyzmq >=22.1.0 - - qdarkstyle >=3.0.2,<3.1.0 + - qdarkstyle >=3.0.2 - qstylizer >=0.2.2 -- - qtawesome >=1.2.1 -+ - qtawesome >=0 + - qtawesome >=1.2.1 - qtconsole >=5.4.0,<5.5.0 - - qtpy >=2.1.0 - - rtree >=0.9.7 diff --git a/devel/spyder/files/patch-setup.py b/devel/spyder/files/patch-setup.py index 92b9fdaca28e..e7b8cd97487f 100644 --- a/devel/spyder/files/patch-setup.py +++ b/devel/spyder/files/patch-setup.py @@ -1,4 +1,4 @@ ---- setup.py.orig 2022-11-04 20:45:25 UTC +--- setup.py.orig 2023-01-18 21:16:10 UTC +++ setup.py @@ -91,7 +91,7 @@ def get_data_files(): """ @@ -17,22 +17,16 @@ ) -@@ -229,13 +228,13 @@ install_requires = [ +@@ -229,10 +228,10 @@ install_requires = [ 'pyls-spyder>=0.4.0', 'pyqt5<5.16', 'pyqtwebengine<5.16', -- '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', +- 'python-lsp-server[all]>=1.7.1,<1.8.0', ++ 'python-lsp-server[all]', + 'pyxdg>=0.26;platform_system=="Linux"', 'pyzmq>=22.1.0', - 'qdarkstyle>=3.0.2,<3.1.0', + 'qdarkstyle>=3.0.2', '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', + 'qtawesome>=1.2.1', + 'qtconsole>=5.4.0,<5.5.0', diff --git a/devel/spyder/files/patch-spyder_dependencies.py b/devel/spyder/files/patch-spyder_dependencies.py index 926bbbeed58a..31eaedb84652 100644 --- a/devel/spyder/files/patch-spyder_dependencies.py +++ b/devel/spyder/files/patch-spyder_dependencies.py @@ -1,11 +1,11 @@ ---- spyder/dependencies.py.orig 2022-11-04 20:45:25 UTC +--- spyder/dependencies.py.orig 2023-01-18 21:16:10 UTC +++ spyder/dependencies.py -@@ -53,15 +53,15 @@ PSUTIL_REQVER = '>=5.3' +@@ -53,12 +53,12 @@ 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_REQVER = '>=1.7.1;<1.8.0' ++PYLSP_REQVER = '>0' PYLSP_BLACK_REQVER = '>=1.2.0' PYLS_SPYDER_REQVER = '>=0.4.0' PYXDG_REQVER = '>=0.26' @@ -13,10 +13,5 @@ -QDARKSTYLE_REQVER = '>=3.0.2;<3.1.0' +QDARKSTYLE_REQVER = '>=3.0.2' 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' + QTAWESOME_REQVER = '>=1.2.1' + QTCONSOLE_REQVER = '>=5.4.0;<5.5.0'