<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/2cde73ef4883eeaad4828ae17f9e03e6b5cf8ed5">https://github.com/macports/macports-ports/commit/2cde73ef4883eeaad4828ae17f9e03e6b5cf8ed5</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 2cde73ef4883eeaad4828ae17f9e03e6b5cf8ed5
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Fri Apr 16 23:13:27 2021 -0400

<span style='display:block; white-space:pre;color:#404040;'>    py-spyder: update to 5.0.1
</span>---
 python/py-spyder/Portfile                  | 17 +++++------------
 python/py-spyder/files/patch-setup.py.diff | 20 ++++++++++++--------
 2 files changed, 17 insertions(+), 20 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 a20c8f53ee2..28ed4828116 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.0.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup        spyder-ide spyder 5.0.1 v
</span> github.tarball_from archive
 name                py-spyder
 revision            0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,16 +31,14 @@ long_description    ${description}. \
</span> 
 homepage            https://www.spyder-ide.org/
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  b7a290dcb3198e4ee4cd03e79086a3f78933e053 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  49b0d42970f0bb114c7318b464bc70419327cf00c1d651821099ccf3d9ec6365 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    19967667
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  8118ee337871311ea53f456faa88bc0de9634d0b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  883ce874ede4275596990f2fd6e00001d9206fd290a950cc3e41da88c39fb5dd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    19973650
</span> 
 python.versions     36 37 38 39
 
 if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {${python.version} >= 36} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        conflicts   py${python.version}-spyder-devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    conflicts       py${python.version}-spyder-devel
</span> 
     depends_lib-append \
                     port:py${python.version}-applaunchservices \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -136,11 +134,6 @@ if {${name} ne ${subport}} {
</span>         reinplace {s|JEDI_REQVER = '=0\.17\.2'|JEDI_REQVER = '>=0.17.2'|g} \
             ${worksrcpath}/spyder/dependencies.py
         reinplace {s|jedi==0\.17\.2|jedi>=0.17.2|g} ${worksrcpath}/setup.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        # temporary fix for spyder-kernels version detection
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        # see: https://github.com/spyder-ide/spyder/commit/755c09cfe65df961bc3898d4ab55cc0336fcac61
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        reinplace {s|SPYDER_KERNELS_REQVER = '>=2.0.1,<2.1.0'|SPYDER_KERNELS_REQVER = '>=2.0.1;<2.1.0'|g} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            ${worksrcpath}/spyder/dependencies.py
</span>     }
 
     post-destroot {
<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 bb914c15792..5a31fbc3fe1 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;'>@@ -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-04-17 19:05:38.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py       2021-04-17 19:06:11.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',
</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>