<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/798be8b26df7167f3164abff1acc848f604b8d76">https://github.com/macports/macports-ports/commit/798be8b26df7167f3164abff1acc848f604b8d76</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new 798be8b  py-spyder-devel: update to 6a7a0fb (20190425)
</span>798be8b is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 798be8b26df7167f3164abff1acc848f604b8d76
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Sat Apr 27 11:13:20 2019 -0400

<span style='display:block; white-space:pre;color:#404040;'>    py-spyder-devel: update to 6a7a0fb (20190425)
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    - remove incorrect patching of python-language-server (pyls); now it
</span><span style='display:block; white-space:pre;color:#404040;'>        actually works
</span>---
 python/py-spyder-devel/Portfile                     | 21 ++++++---------------
 .../files/patch-spyder_app_mainwindow.py.diff       |  6 +++---
 .../files/patch-spyder_config_main.py.diff          | 11 -----------
 .../patch-spyder_plugins_editor_lsp_client.py.diff  | 11 -----------
 ...spyder_plugins_editor_lsp_transport_main.py.diff | 11 -----------
 ...er_plugins_editor_lsp_transport_producer.py.diff | 11 -----------
 .../patch-spyder_plugins_editor_plugin.py.diff      |  6 +++---
 7 files changed, 12 insertions(+), 65 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 4238b3a..dcfe04c 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;'>@@ -7,8 +7,8 @@ PortGroup           qt5 1.0
</span> PortGroup           active_variants 1.1
 PortGroup           select 1.0
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup        spyder-ide spyder fa6df3f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version             3.3.0-20190404
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup        spyder-ide spyder 6a7a0fb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             3.3.0-20190425
</span> revision            0
 name                py-spyder-devel
 # Preference on mailing list is to use small numbers for epoch.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,9 +37,9 @@ long_description    ${description}. \
</span> 
 supported_archs     noarch
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  48e801fc4e7655d87c2267e69a17e906d96a2162 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  67a18e1710db78d9801b05d420d1ab9e43df0af35b0a105315576ce84a839775 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    4195621
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  c162d78dfb833172be6907b3bdb867907783d0cd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  fe337b1041dea629d055b6a332367d5aefaef08d6e6f6aa9aaac90dca2988bcc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    4208100
</span> 
 if {${name} ne ${subport}} {
     require_active_variants py${python.version}-qtpy qt5
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -103,20 +103,11 @@ if {${name} ne ${subport}} {
</span>                             patch-spyder_plugins_editor_plugin.py.diff \
                             patch-spyder_app_start.py.diff \
                             patch-spyder_app_mainwindow.py.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            patch-spyder_utils_programs.py.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            patch-spyder_config_main.py.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            patch-spyder_plugins_editor_lsp_client.py.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            patch-spyder_plugins_editor_lsp_transport_main.py.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            patch-spyder_plugins_editor_lsp_transport_producer.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            patch-spyder_utils_programs.py.diff
</span> 
     post-patch {
         reinplace "s|@@WINPDB_BIN_NAME@@|${WINPDB_BIN_NAME}|g" \
             ${worksrcpath}/spyder/plugins/editor/plugin.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        reinplace "s|@@PYLS_BIN_NAME@@|${PYLS_BIN_NAME}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            ${worksrcpath}/spyder/config/main.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            ${worksrcpath}/spyder/plugins/editor/lsp/client.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            ${worksrcpath}/spyder/plugins/editor/lsp/transport/main.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            ${worksrcpath}/spyder/plugins/editor/lsp/transport/producer.py
</span>         reinplace "s|\"assistant\"|\"Assistant\"|g" \
             ${worksrcpath}/spyder/app/mainwindow.py
         reinplace "s|\"linguist\"|\"Linguist\"|g" \
<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_mainwindow.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 053248d..5858caa 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_mainwindow.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/app/mainwindow.py.orig  2019-03-09 09:56:47.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/app/mainwindow.py       2019-03-10 12:37:46.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -203,7 +203,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/app/mainwindow.py.orig  2019-04-25 13:26:57.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/app/mainwindow.py       2019-04-27 11:21:10.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -204,7 +204,7 @@
</span>              return file_uri(osp.join(doc_path, python_chm[0]))
      else:
          vinf = sys.version_info
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder-devel/files/patch-spyder_config_main.py.diff b/python/py-spyder-devel/files/patch-spyder_config_main.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7d37aa9..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder-devel/files/patch-spyder_config_main.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- spyder/config/main.py.orig     2019-04-03 08:12:28.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/config/main.py  2019-04-03 13:10:06.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -681,7 +681,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             ('lsp-server', {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                 'python': {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                     'index': 0,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                    'cmd': 'pyls',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+                    'cmd': '@@PYLS_BIN_NAME@@',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                     'args': '--host {host} --port {port} --tcp',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                     'host': '127.0.0.1',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                     'port': 2087,
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder-devel/files/patch-spyder_plugins_editor_lsp_client.py.diff b/python/py-spyder-devel/files/patch-spyder_plugins_editor_lsp_client.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0576779..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder-devel/files/patch-spyder_plugins_editor_lsp_client.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- spyder/plugins/editor/lsp/client.py.orig       2019-03-09 09:56:47.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/plugins/editor/lsp/client.py    2019-03-10 12:37:46.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -322,7 +322,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     from spyder.utils.qthelpers import qapplication
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     app = qapplication(test_time=8)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     server_args_fmt = '--host %(host)s --port %(port)s --tcp'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    server_settings = {'host': '127.0.0.1', 'port': 2087, 'cmd': 'pyls'}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    server_settings = {'host': '127.0.0.1', 'port': 2087, 'cmd': '@@PYLS_BIN_NAME@@'}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     lsp = LSPClient(app, server_args_fmt, server_settings)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     lsp.start()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder-devel/files/patch-spyder_plugins_editor_lsp_transport_main.py.diff b/python/py-spyder-devel/files/patch-spyder_plugins_editor_lsp_transport_main.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 23922de..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder-devel/files/patch-spyder_plugins_editor_lsp_transport_main.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- spyder/plugins/editor/lsp/transport/main.py.orig       2019-03-09 09:56:47.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/plugins/editor/lsp/transport/main.py    2019-03-10 12:37:46.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -47,7 +47,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                     help="Initial current working directory used to "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                          "initialize ls-server")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- parser.add_argument('--server',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                    default='pyls',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+                    default='@@PYLS_BIN_NAME@@',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                     help='Instruction executed to start the language server')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- parser.add_argument('--external-server',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                     action="store_true",
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder-devel/files/patch-spyder_plugins_editor_lsp_transport_producer.py.diff b/python/py-spyder-devel/files/patch-spyder_plugins_editor_lsp_transport_producer.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f7c80de..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder-devel/files/patch-spyder_plugins_editor_lsp_transport_producer.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- spyder/plugins/editor/lsp/transport/producer.py.orig   2019-03-09 09:56:47.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/plugins/editor/lsp/transport/producer.py        2019-03-10 12:37:46.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -46,7 +46,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     def __init__(self, host='127.0.0.1', port=2087, workspace=getcwd(),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                  use_external_server=False, zmq_in_port=7000,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                 zmq_out_port=7001, server='pyls', server_args=['--tcp']):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+                 zmq_out_port=7001, server='@@PYLS_BIN_NAME@@', server_args=['--tcp']):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         self.req_status = {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         self.host = host
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         self.port = port
</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 24a6dad..7ce356c 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-04-03 08:12:28.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/plugins/editor/plugin.py        2019-04-03 13:10:06.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73,7 +73,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/plugins/editor/plugin.py.orig   2019-04-25 13:26:57.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/plugins/editor/plugin.py        2019-04-27 11:21:10.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -72,7 +72,7 @@
</span>  dependencies.add("nbconvert", _("Manipulate Jupyter notebooks on the Editor"),
                   required_version=NBCONVERT_REQVER)
  
</pre><pre style='margin:0'>

</pre>