<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/d0f39b7305391881e6607f4d3923168fe545775f">https://github.com/macports/macports-ports/commit/d0f39b7305391881e6607f4d3923168fe545775f</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d0f39b7305391881e6607f4d3923168fe545775f
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Wed Apr 1 15:03:06 2020 -0400

<span style='display:block; white-space:pre;color:#404040;'>    py-spyder-devel: update to 20200321-20775c6f
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    - add workaround for jedi and parso versioning caps
</span>---
 python/py-spyder-devel/Portfile                    | 20 +++++++++++---------
 ...ndow.py.diff => patch-spyder_app_utils.py.diff} | 22 +++++++++++-----------
 .../patch-spyder_plugins_editor_plugin.py.diff     |  6 +++---
 python/py-spyder-devel/files/spyder-34             |  1 -
 4 files changed, 25 insertions(+), 24 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 d5f2207..d1163a5 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 9148c1a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup        spyder-ide spyder 20775c6fd7760fb0494990aecd8b49c5b770b624
</span> name                py-spyder-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             20200130-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             20200321-[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  fe0b3c811b76f4dc17a774697a3ddc7e58abdaac \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  7c7585ac2b0c1f65d0dfc1c52790f4a56ba74b10b52c844de25816893c67b0df \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    11008147
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  51d0fe9b1a9d64fcca636497d84a8980584bd285 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  41dc9a5c7e67b4c069ca3b24713046f5c931e277427b1d8f9e35a7df536e2167 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    11150342
</span> 
 python.versions     36 37
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,7 +94,7 @@ if {${name} ne ${subport}} {
</span>                     patch-spyder_config_base.py.diff \
                     patch-spyder_plugins_editor_plugin.py.diff \
                     patch-spyder_app_start.py.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    patch-spyder_app_mainwindow.py.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-spyder_app_utils.py.diff \
</span>                     patch-spyder_utils_programs.py.diff
 
     set WINPDB_BIN_NAME winpdb-${python.branch}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -110,12 +110,14 @@ if {${name} ne ${subport}} {
</span>         reinplace "s|\"designer\"|\"Designer\"|g" \
             ${worksrcpath}/spyder/app/mainwindow.py
         reinplace "s|@@PREFIX@@|${prefix}|g" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            ${worksrcpath}/spyder/app/mainwindow.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ${worksrcpath}/spyder/app/utils.py
</span>         reinplace "s|@@APPS_DIR@@|${applications_dir}/Qt5|g" \
             ${worksrcpath}/spyder/utils/programs.py
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        # temporary workaround for jedi restriction
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        reinplace "s|JEDI_REQVER = '=0.14.1'|JEDI_REQVER = '>=0.14.1'|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # temporary workaround for jedi and parso restrictions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace {s|JEDI_REQVER = '=0\.15\.2'|JEDI_REQVER = '>=0.15.2'|g} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ${worksrcpath}/spyder/dependencies.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace {s|PARSO_REQVER = '=0\.5\.2'|PARSO_REQVER = '>=0.5.2'|g} \
</span>             ${worksrcpath}/spyder/dependencies.py
     }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder-devel/files/patch-spyder_app_mainwindow.py.diff b/python/py-spyder-devel/files/patch-spyder_app_utils.py.diff
</span>similarity index 55%
rename from python/py-spyder-devel/files/patch-spyder_app_mainwindow.py.diff
rename to python/py-spyder-devel/files/patch-spyder_app_utils.py.diff
<span style='display:block; white-space:pre;color:#808080;'>index 8da5e73..e78ff8b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder-devel/files/patch-spyder_app_mainwindow.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder-devel/files/patch-spyder_app_utils.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- spyder/app/mainwindow.py.orig  2019-09-26 21:52:39.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/app/mainwindow.py       2019-09-27 14:19:41.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -208,7 +208,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             return file_uri(osp.join(doc_path, python_chm[0]))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         vinf = sys.version_info
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        doc_path = '/usr/share/doc/python%d.%d/html' % (vinf[0], vinf[1])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        doc_path = '@@PREFIX@@/share/doc/python%d%d-doc' % (vinf[0], vinf[1])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     python_doc = osp.join(doc_path, "index.html")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     if osp.isfile(python_doc):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         return file_uri(python_doc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/app/utils.py.orig       2020-03-13 14:50:17.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/app/utils.py    2020-03-13 14:50:57.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -44,7 +44,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             return file_uri(osp.join(doc_path, python_chm[0]))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         vinf = sys.version_info
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        doc_path = '/usr/share/doc/python%d.%d/html' % (vinf[0], vinf[1])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        doc_path = '@@PREFIX@@/share/doc/python%d.%d/html' % (vinf[0], vinf[1])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     python_doc = osp.join(doc_path, "index.html")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if osp.isfile(python_doc):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         return file_uri(python_doc)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder-devel/files/patch-spyder_plugins_editor_plugin.py.diff b/python/py-spyder-devel/files/patch-spyder_plugins_editor_plugin.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 1ca3cbd..5e2b68e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder-devel/files/patch-spyder_plugins_editor_plugin.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder-devel/files/patch-spyder_plugins_editor_plugin.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- spyder/plugins/editor/plugin.py.orig   2019-09-26 21:52:39.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/plugins/editor/plugin.py        2019-09-27 14:19:41.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -61,7 +61,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/plugins/editor/plugin.py.orig   2020-03-31 21:03:01.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/plugins/editor/plugin.py        2020-04-01 14:25:20.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -60,7 +60,7 @@
</span>  logger = logging.getLogger(__name__)
  
  
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder-devel/files/spyder-34 b/python/py-spyder-devel/files/spyder-34
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1fa3393..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder-devel/files/spyder-34
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-bin/spyder-3.4
</span></pre><pre style='margin:0'>

</pre>