<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/a06277a68e878139c48ddda5e1821f301fd5d7ae">https://github.com/macports/macports-ports/commit/a06277a68e878139c48ddda5e1821f301fd5d7ae</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a06277a68e878139c48ddda5e1821f301fd5d7ae
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Thu Dec 16 10:17:58 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> py-spyder: update to 5.2.1
</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/64233
</span>---
python/py-spyder/Portfile | 11 ++++++-----
python/py-spyder/files/patch-qdarkstyle.diff | 22 ++++++++++++++++++++++
python/py-spyder/files/patch-setup.py.diff | 6 +++---
3 files changed, 31 insertions(+), 8 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 423ab6d7304..5dd9ae724c3 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.2.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup spyder-ide spyder 5.2.1 v
</span> github.tarball_from archive
name py-spyder
revision 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,9 +31,9 @@ long_description ${description}. \
</span>
homepage https://www.spyder-ide.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 b8469067171f386611503e4571aa6b2ea944b0b4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4a2a27809523f8113c25a6ee74c0450f021d2bbf5fd0bff53e384324448e9984 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 23901277
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 984d6ec5ece765f0a09edd00b42eff8241f3a88b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 dc8a50be08afc8c02480fd6a07a29101784294dfa19a63ab328287859f9e844c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 23903864
</span>
python.versions 36 37 38 39
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -114,7 +114,8 @@ 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:#e0ffe0;'>+ patch-setup.py.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-qdarkstyle.diff
</span>
set PYLS_BIN_NAME pyls-${python.branch}
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3ffaf4a5241
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder/files/patch-qdarkstyle.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig 2021-12-16 17:09:26.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py 2021-12-16 17:08:43.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -228,7 +228,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'python-lsp-server[all]>=1.3.2,<1.4.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'pyxdg>=0.26;platform_system=="Linux"',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'pyzmq>=17',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'qdarkstyle==3.0.2',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 'qdarkstyle>=3.0.2',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'qstylizer>=0.1.10',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'qtawesome>=1.0.2',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'qtconsole>=5.2.1,<5.3.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/dependencies.py.orig 2021-12-16 17:10:06.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/dependencies.py 2021-12-16 17:10:16.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -58,7 +58,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYLS_SPYDER_REQVER = '>=0.4.0'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYXDG_REQVER = '>=0.26'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYZMQ_REQVER = '>=17'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QDARKSTYLE_REQVER = '=3.0.2'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QDARKSTYLE_REQVER = '>=3.0.2'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QSTYLIZER_REQVER = '>=0.1.10'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QTAWESOME_REQVER = '>=1.0.2'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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-setup.py.diff b/python/py-spyder/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 839ff51f183..a77db91226c 100644
</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;'>+++ b/python/py-spyder/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,14 +7,14 @@ ports do not install an .egg-info file, so it appears that the package isn't pre
</span> Removing it here from the setup.py file assures that it doesn't end up in the requires.txt
file and allows spyder to start. This is likely something that should be fixed in these ports,
but for now just take the pragmatic approach.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig 2021-11-28 10:45:43.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2021-11-28 10:46:01.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig 2021-12-16 10:38:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py 2021-12-16 10:39:27.000000000 -0500
</span> @@ -225,8 +225,6 @@
'pylint>=2.5.0',
'python-lsp-black>=1.0.0',
'pyls-spyder>=0.4.0',
- 'pyqt5<5.13',
- 'pyqtwebengine<5.13',
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 'python-lsp-server[all]>=1.3.1,<1.4.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'python-lsp-server[all]>=1.3.2,<1.4.0',
</span> 'pyxdg>=0.26;platform_system=="Linux"',
'pyzmq>=17',
</pre><pre style='margin:0'>
</pre>