<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/59459b8851b84e5bd3a13e6227db2ae9899d1e69">https://github.com/macports/macports-ports/commit/59459b8851b84e5bd3a13e6227db2ae9899d1e69</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 59459b8851b84e5bd3a13e6227db2ae9899d1e69
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Sat Nov 27 16:58:38 2021 -0500

<span style='display:block; white-space:pre;color:#404040;'>    py-spyder: update to 5.2.0
</span>---
 python/py-spyder/Portfile                        | 14 +++++++-------
 python/py-spyder/files/patch-pylint-version.diff | 22 ----------------------
 python/py-spyder/files/patch-setup.py.diff       | 10 +++++-----
 3 files changed, 12 insertions(+), 34 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 ada7ab56e2a..423ab6d7304 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,10 +6,10 @@ 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.1.5 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup        spyder-ide spyder 5.2.0 v
</span> github.tarball_from archive
 name                py-spyder
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            0
</span> # the epoch is here for historical reasons and cannot be removed
 epoch               20111202
 
<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  205bf44182680ef3f3c3dc192eba9c51941f8a6e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  1a5dd3a7d7919b5bdc48fa4177c0fe1579bdc734272ad57bac6b7460b280d850 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    23849672
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  b8469067171f386611503e4571aa6b2ea944b0b4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  4a2a27809523f8113c25a6ee74c0450f021d2bbf5fd0bff53e384324448e9984 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    23901277
</span> 
 python.versions     36 37 38 39
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,6 +57,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;'>@@ -113,8 +114,7 @@ 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:#ffe0e0;'>-                    patch-pylint-version.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-setup.py.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-pylint-version.diff b/python/py-spyder/files/patch-pylint-version.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c7f9edbafed..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder/files/patch-pylint-version.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- spyder/dependencies.py.orig    2021-09-04 13:40:19.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/dependencies.py 2021-09-04 13:40:40.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -51,7 +51,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PICKLESHARE_REQVER = '>=0.4'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PSUTIL_REQVER = '>=5.3'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYGMENTS_REQVER = '>=2.0'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PYLINT_REQVER = '>=2.5.0;<2.10.0'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PYLINT_REQVER = '>=2.5.0'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYLSP_REQVER = '>=1.2.2;<1.3.0'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYLSP_BLACK_REQVER = '>=1.0.0'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYLS_SPYDER_REQVER = '>=0.4.0'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig  2021-09-04 13:43:11.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py       2021-09-04 13:43:20.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -220,7 +220,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     'pickleshare>=0.4',
</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:#ffe0e0;'>--    'pylint>=2.5.0,<2.10.0',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    'pylint>=2.5.0',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     'python-lsp-black>=1.0.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;'>-     'python-lsp-server[all]>=1.2.2,<1.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 5b853595559..839ff51f183 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-09-04 13:42:15.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py       2021-09-04 13:42:26.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -223,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-11-28 10:45:43.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py       2021-11-28 10:46:01.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.1,<1.4.0',
</span>      'pyxdg>=0.26;platform_system=="Linux"',
      'pyzmq>=17',
</pre><pre style='margin:0'>

</pre>