<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/b9b5785831f2c642fe600da920e99eb705e47367">https://github.com/macports/macports-ports/commit/b9b5785831f2c642fe600da920e99eb705e47367</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b9b5785831f2c642fe600da920e99eb705e47367
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Fri Nov 11 21:10:09 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> py-spyder: update to 5.4.0
</span>---
python/py-spyder/Portfile | 11 +++++------
python/py-spyder/files/patch-ipython.diff | 10 +++++-----
python/py-spyder/files/patch-setup.py.diff | 20 --------------------
3 files changed, 10 insertions(+), 31 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 09f0f5103e1..26437bb97aa 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,7 +6,7 @@ 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.3.3 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup spyder-ide spyder 5.4.0 v
</span> github.tarball_from archive
name py-spyder
revision 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,6 +14,7 @@ revision 0
</span> epoch 20111202
categories-append devel
<span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms {darwin any}
</span> supported_archs noarch
license MIT
maintainers {reneeotten @reneeotten} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,9 +31,9 @@ long_description ${description}. \
</span>
homepage https://www.spyder-ide.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 6cf9bfe8bd9cd3f9f6100f8015f645768e5d53cd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 1e59bbddb1846e777e6938d6f600c57466bf8df8c30fdccf17838838b8666ec7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 24443628
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 fd9de01dc5eee88d58c7ede77a602deefa73eb06 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9e0bfc68baaa420cb894539d07ebab412f03b98499376106191245f14d216b77 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 24497211
</span>
python.versions 37 38 39 310
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -115,8 +116,6 @@ if {${name} ne ${subport}} {
</span> patch-spyder_config_lsp.py.diff \
patch-ipython.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ##patch-setup.py.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> set PYLS_BIN_NAME pyls-${python.branch}
post-patch {
<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 7529163f456..a84e2158a8f 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,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig 2022-04-03 11:00:23.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2022-04-03 11:01:04.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig 2022-11-26 22:10:07
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py 2022-11-26 22:10:37
</span> @@ -209,7 +209,7 @@
'cookiecutter>=1.6.0',
'diff-match-patch>=20181111',
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,9 +9,9 @@
</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-04-03 11:16:04.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/dependencies.py 2022-04-03 11:16:19.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -39,7 +39,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/dependencies.py.orig 2022-11-26 22:11:12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/dependencies.py 2022-11-26 22:11:20
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -38,7 +38,7 @@
</span> # 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;color:#808080;'>diff --git a/python/py-spyder/files/patch-setup.py.diff b/python/py-spyder/files/patch-setup.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index decea216cf3..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-These dependencies are added in the Portfile. However, the py-pyqt5{-webengine} and py-pybojc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-ports do not install an .egg-info file, so it appears that the package isn't present.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Removing it here from the setup.py file assures that it doesn't end up in the requires.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-file and allows spyder to start. This is likely something that should be fixed in these ports,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-These dependencies are added in the Portfile. However, the py-pyqt5{-webengine} and py-pybojc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-ports do not install an .egg-info file, so it appears that the package isn't present.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Removing it here from the setup.py file assures that it doesn't end up in the requires.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-file and allows spyder to start. This is likely something that should be fixed in these ports,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-but for now just take the pragmatic approach.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig 2021-12-16 10:38:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2021-12-16 10:39:27.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -225,8 +225,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'pylint>=2.5.0,<3.0',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'python-lsp-black>=1.2.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;'>-- 'pyqt5<5.16',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 'pyqtwebengine<5.16',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'python-lsp-server[all]>=1.5.0,<1.6.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>=22.1.0',
</span></pre><pre style='margin:0'>
</pre>