<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/65ac9782f6def4a104ce0457aa8f8e469ce73a6b">https://github.com/macports/macports-ports/commit/65ac9782f6def4a104ce0457aa8f8e469ce73a6b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 65ac9782f6def4a104ce0457aa8f8e469ce73a6b
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Sun Apr 3 10:36:00 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-spyder: update to 5.3.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/64569
</span>---
python/py-spyder/Portfile | 19 ++++++++-----------
python/py-spyder/files/patch-ipython.diff | 18 +++++++++---------
.../py-spyder/files/patch-python-lsp-server.diff | 22 ----------------------
python/py-spyder/files/patch-qdarkstyle.diff | 22 ----------------------
.../py-spyder/files/patch-spyder_app_utils.py.diff | 6 +++---
.../files/patch-spyder_config_base.py.diff | 6 +++---
.../files/patch-spyder_utils_programs.py.diff | 6 +++---
python/py-spyder/files/spyder-36 | 1 -
8 files changed, 26 insertions(+), 74 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder/Portfile b/python/py-spyder/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 21d2930ca86..b6681848e3f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,10 +6,10 @@ PortGroup python 1.0
</span> PortGroup qt5 1.0
PortGroup select 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup spyder-ide spyder 5.2.2 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup spyder-ide spyder 5.3.0 v
</span> github.tarball_from archive
name py-spyder
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> # the epoch is here for historical reasons and cannot be removed
epoch 20111202
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,9 +30,9 @@ long_description ${description}. \
</span>
homepage https://www.spyder-ide.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 201553962055a55abe3fff97675be26f41b04f6b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 46b93e6ec0905a92e9a0082afad3325bd8f8f5dd090ba4bccf70c8c59eebfe96 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 23913924
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 bff78af3d4e4347ecd02bc70ec8a94a03bcc948a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b49a1113074f232625cfdfe4caded046ba1decfbbbeeee8ef4591fa8a176b92f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 24404638
</span>
python.versions 37 38 39 310
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -113,10 +113,9 @@ if {${name} ne ${subport}} {
</span> patch-spyder_app_utils.py.diff \
patch-spyder_utils_programs.py.diff \
patch-spyder_config_lsp.py.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-setup.py.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-qdarkstyle.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-ipython.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-python-lsp-server.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-ipython.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ##patch-setup.py.diff \
</span>
set PYLS_BIN_NAME pyls-${python.branch}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -152,8 +151,6 @@ when you execute the commands without a version suffix, e.g. 'spyder', run:
</span>
sudo port select --set ${select.group} [file tail ${select.file}]
"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type none
</span> } else {
github.livecheck.regex {([0-9.]+)}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder/files/patch-ipython.diff b/python/py-spyder/files/patch-ipython.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index fd76ebd4df5..a041975cdb4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder/files/patch-ipython.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder/files/patch-ipython.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +1,22 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig 2022-01-25 13:24:13.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2022-01-25 13:24:24.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -208,7 +208,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig 2022-04-03 11:00:23.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py 2022-04-03 11:01:04.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -209,7 +209,7 @@
</span> 'cookiecutter>=1.6.0',
'diff-match-patch>=20181111',
'intervaltree>=3.0.2',
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- 'ipython>=7.6.0,<8.0.0',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'ipython>=7.6.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'ipython>=7.31.1,<8.0.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 'ipython>=7.31.1',
</span> 'jedi>=0.17.2,<0.19.0',
'jellyfish>=0.7',
'jsonschema>=3.2.0',
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- spyder/dependencies.py.orig 2022-01-25 13:24:56.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/dependencies.py 2022-01-25 13:25:04.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/dependencies.py.orig 2022-04-03 11:16:04.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/dependencies.py 2022-04-03 11:16:19.000000000 -0400
</span> @@ -39,7 +39,7 @@
# None for pynsist install for now
# (check way to add dist.info/egg.info from packages without wheels available)
INTERVALTREE_REQVER = None if is_pynsist() else '>=3.0.2'
<span style='display:block; white-space:pre;background:#ffe0e0;'>--IPYTHON_REQVER = ">=7.6.0;<8.0.0"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IPYTHON_REQVER = ">=7.6.0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-IPYTHON_REQVER = ">=7.31.1;<8.0.0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++IPYTHON_REQVER = ">=7.31.1"
</span> JEDI_REQVER = '>=0.17.2;<0.19.0'
JELLYFISH_REQVER = '>=0.7'
JSONSCHEMA_REQVER = '>=3.2.0'
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder/files/patch-python-lsp-server.diff b/python/py-spyder/files/patch-python-lsp-server.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3ad21321822..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder/files/patch-python-lsp-server.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig 2022-03-18 12:40:17.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2022-03-18 12:40:28.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -225,7 +225,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'pylint>=2.5.0',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'python-lsp-black>=1.0.0',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'pyls-spyder>=0.4.0',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 'python-lsp-server[all]>=1.3.2,<1.4.0',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'python-lsp-server[all]>=1.3.2,<1.5.0',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'pyxdg>=0.26;platform_system=="Linux"',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'pyzmq>=17',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'qdarkstyle>=3.0.2',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- spyder/dependencies.py.orig 2022-03-18 12:40:43.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/dependencies.py 2022-03-18 12:40:57.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -53,7 +53,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PSUTIL_REQVER = '>=5.3'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYGMENTS_REQVER = '>=2.0'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYLINT_REQVER = '>=2.5.0'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PYLSP_REQVER = '>=1.3.2;<1.4.0'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PYLSP_REQVER = '>=1.3.2;<1.5.0'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYLSP_BLACK_REQVER = '>=1.0.0'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYLS_SPYDER_REQVER = '>=0.4.0'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYXDG_REQVER = '>=0.26'
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder/files/patch-qdarkstyle.diff b/python/py-spyder/files/patch-qdarkstyle.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3ffaf4a5241..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder/files/patch-qdarkstyle.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig 2021-12-16 17:09:26.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2021-12-16 17:08:43.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -228,7 +228,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'python-lsp-server[all]>=1.3.2,<1.4.0',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'pyxdg>=0.26;platform_system=="Linux"',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'pyzmq>=17',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 'qdarkstyle==3.0.2',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'qdarkstyle>=3.0.2',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'qstylizer>=0.1.10',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'qtawesome>=1.0.2',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'qtconsole>=5.2.1,<5.3.0',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- spyder/dependencies.py.orig 2021-12-16 17:10:06.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/dependencies.py 2021-12-16 17:10:16.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -58,7 +58,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYLS_SPYDER_REQVER = '>=0.4.0'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYXDG_REQVER = '>=0.26'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYZMQ_REQVER = '>=17'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--QDARKSTYLE_REQVER = '=3.0.2'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+QDARKSTYLE_REQVER = '>=3.0.2'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QSTYLIZER_REQVER = '>=0.1.10'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QTAWESOME_REQVER = '>=1.0.2'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QTCONSOLE_REQVER = '>=5.2.1;<5.3.0'
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder/files/patch-spyder_app_utils.py.diff b/python/py-spyder/files/patch-spyder_app_utils.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index aeec7d79967..be0644e94d4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder/files/patch-spyder_app_utils.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder/files/patch-spyder_app_utils.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- spyder/app/utils.py.orig 2021-09-02 00:24:22.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/app/utils.py 2021-09-04 13:45:24.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -76,7 +76,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/app/utils.py.orig 2022-03-30 18:54:18.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/app/utils.py 2022-04-03 11:02:06.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -80,7 +80,7 @@
</span> return file_uri(osp.join(doc_path, python_chm[0]))
else:
vinf = sys.version_info
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder/files/patch-spyder_config_base.py.diff b/python/py-spyder/files/patch-spyder_config_base.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index fa5ae7271bc..d8d729bc958 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder/files/patch-spyder_config_base.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder/files/patch-spyder_config_base.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- spyder/config/base.py.orig 2021-09-02 00:24:22.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/config/base.py 2021-09-04 13:44:18.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -130,23 +130,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/config/base.py.orig 2022-03-30 18:54:18.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/config/base.py 2022-04-03 11:02:06.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -132,23 +132,29 @@
</span> #==============================================================================
def get_conf_subfolder():
"""Return the configuration subfolder for different ooperating systems."""
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder/files/patch-spyder_utils_programs.py.diff b/python/py-spyder/files/patch-spyder_utils_programs.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index ead092882c9..06512e64a2a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder/files/patch-spyder_utils_programs.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder/files/patch-spyder_utils_programs.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- spyder/utils/programs.py.orig 2021-09-02 00:24:22.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/utils/programs.py 2021-09-04 13:45:46.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -122,6 +122,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/utils/programs.py.orig 2022-03-30 18:54:18.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/utils/programs.py 2022-04-03 11:02:06.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -126,6 +126,11 @@
</span> abspath = osp.join(path, basename)
if osp.isfile(abspath):
return abspath
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder/files/spyder-36 b/python/py-spyder/files/spyder-36
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 22b47ce5c6f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder/files/spyder-36
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-bin/spyder-3.6
</span></pre><pre style='margin:0'>
</pre>