<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/c44daac09cca13e5ba85d5f7a3c37bfbbe7c78b3">https://github.com/macports/macports-ports/commit/c44daac09cca13e5ba85d5f7a3c37bfbbe7c78b3</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c44daac09cca13e5ba85d5f7a3c37bfbbe7c78b3
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Fri Jun 4 20:41:15 2021 -0400

<span style='display:block; white-space:pre;color:#404040;'>    py-spyder-devel: update to 20210604-17335f31
</span>---
 python/py-spyder-devel/Portfile                  | 12 +++++++-----
 python/py-spyder-devel/files/patch-setup.py.diff | 20 ++++++++++++--------
 2 files changed, 19 insertions(+), 13 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 4046c328709..4698a634550 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,9 +6,9 @@ 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 06562dd073d3473c24e658849a09ab6266af3426
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup        spyder-ide spyder 17335f31521846449fc49a64bb68cd1ec4b1ac17
</span> name                py-spyder-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             20210223-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             20210604-[string range ${github.version} 0 7]
</span> revision            0
 # the epoch is here for historical reasons and cannot be removed
 epoch               20161005
<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  cf069489d95dcf0597112e93c1ee3d5f7821b173 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  a0ef0954e72308c3c3a33218b733470870c4d4b1d6514108b03b51c023c86e8f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    11613194
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  3ce9aa5e9abab2867597f0556b8ae1ec890cee3a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  42771d5246e676495c86afb4f01a8c441095cdca574ff41f1d991f640ab12f14 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    20592690
</span> 
 python.versions     36 37 38 39
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,9 +64,11 @@ if {${name} ne ${subport}} {
</span>                     port:py${python.version}-pyqt5 \
                     port:py${python.version}-pyqt5-webengine \
                     port:py${python.version}-qdarkstyle \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:py${python.version}-qstylizer \
</span>                     port:py${python.version}-qtawesome \
                     port:py${python.version}-qtconsole \
                     port:py${python.version}-qtpy \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:py${python.version}-rtree \
</span>                     port:py${python.version}-setuptools \
                     port:py${python.version}-sphinx \
                     port:py${python.version}-spyder-kernels \
<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 bb914c15792..1a7114a6d76 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;'>@@ -2,9 +2,13 @@ These dependencies are added in the Portfile. However, the py-pyqt5{-webengine}
</span> ports do not install an .egg-info file, so it appears that the package isn't present.
 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,
<span style='display:block; white-space:pre;background:#ffe0e0;'>-but for now just take the pragmatic approach in this -devel port.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig  2021-03-06 18:58:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py       2021-03-06 19:00:29.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+These dependencies are added in the Portfile. However, the py-pyqt5{-webengine} and py-pybojc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+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:#e0ffe0;'>+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:#e0ffe0;'>+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:#e0ffe0;'>+but for now just take the pragmatic approach.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig  2021-05-10 00:29:01.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py       2021-05-11 22:36:42.000000000 -0400
</span> @@ -201,7 +201,6 @@
 
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,12 +17,12 @@ but for now just take the pragmatic approach in this -devel port.
</span>      'atomicwrites>=1.2.0',
      'chardet>=2.0.0',
      'cloudpickle>=0.5.0',
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -222,8 +221,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     'psutil>=5.3',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     'pygments>=2.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -224,8 +223,6 @@
</span>      'pylint>=1.0',
<span style='display:block; white-space:pre;background:#e0ffe0;'>+     'pyls-black>=0.4.6',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     'pyls-spyder>=0.3.2,<0.4.0',
</span> -    'pyqt5<5.13',
 -    'pyqtwebengine<5.13',
      'python-language-server[all]>=0.36.2,<1.0.0',
<span style='display:block; white-space:pre;background:#ffe0e0;'>-     'pyls-black>=0.4.6',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     'pyls-spyder>=0.3.2',
</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></pre><pre style='margin:0'>

</pre>