<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/19663a0323b6816739630497d25bf1f3bfbc5ac9">https://github.com/macports/macports-ports/commit/19663a0323b6816739630497d25bf1f3bfbc5ac9</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 19663a0323b6816739630497d25bf1f3bfbc5ac9
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Fri Dec 24 09:26:21 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> py-spyder-devel: update to 20211224-d023191d
</span>---
python/py-spyder-devel/Portfile | 14 +++++++-------
python/py-spyder-devel/files/patch-qdarkstyle.diff | 22 ++++++++++++++++++++++
python/py-spyder-devel/files/patch-setup.py.diff | 18 +++++-------------
3 files changed, 34 insertions(+), 20 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder-devel/Portfile b/python/py-spyder-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d9dfc820e97..b93967f89a7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,15 +6,14 @@ 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 4bbe5384d15af286a34c59ee02fc156c6c818cfa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup spyder-ide spyder d023191dc63ac55e0009cb4a324fb3c8ad513ef8
</span> name py-spyder-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20210923-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 20211224-[string range ${github.version} 0 7]
</span> revision 0
# the epoch is here for historical reasons and cannot be removed
epoch 20161005
categories-append devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> supported_archs noarch
license MIT
maintainers {reneeotten @reneeotten} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,9 +30,9 @@ long_description ${description}. \
</span>
homepage https://www.spyder-ide.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 2505068c9c3e18fd8d05b991abf92834eb6d1ab9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b6f1b3eb92308d341fb293199b4899be9637e623f3b941aecb64ecd486360225 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 23852088
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 f0674101e802d17dd8c3a9e0659264879f89e255 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2ca11c835cd4e201db1b6136b0640e1bf70a528b129d31a703b9100cf858fdb6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 23908506
</span>
python.versions 36 37 38 39
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,6 +56,7 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-diff-match-patch \
port:py${python.version}-intervaltree \
port:py${python.version}-ipython \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-jellyfish \
</span> port:py${python.version}-jsonschema \
port:py${python.version}-keyring \
port:py${python.version}-nbconvert \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -114,7 +114,7 @@ if {${name} ne ${subport}} {
</span> patch-spyder_utils_programs.py.diff \
patch-spyder_config_lsp.py.diff \
patch-setup.py.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-pylint-version.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-devel/files/patch-qdarkstyle.diff b/python/py-spyder-devel/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-devel/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-devel/files/patch-setup.py.diff b/python/py-spyder-devel/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 108716feb97..a77db91226c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder-devel/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder-devel/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,22 +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-09-23 15:56:57.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2021-09-24 16:25:59.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -201,7 +201,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install_requires = [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 'applaunchservices>=0.1.7;platform_system=="Darwin"',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'atomicwrites>=1.2.0',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'chardet>=2.0.0',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'cloudpickle>=0.5.0',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -224,8 +223,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'pylint>=2.5.0,<2.10.0',
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -225,8 +225,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'pylint>=2.5.0',
</span> '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.2.2,<1.3.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>