py-spyder-devel: update to 6a7a0fb (20190425)

- remove incorrect patching of python-language-server (pyls); now it
    actually works

python/py-spyder-devel/Portfile

@@ -7,8 +7,8 @@ PortGroup           qt5 1.0
 PortGroup           active_variants 1.1
 PortGroup           select 1.0
 
-github.setup        spyder-ide spyder fa6df3f
-version             3.3.0-20190404
+github.setup        spyder-ide spyder 6a7a0fb
+version             3.3.0-20190425
 revision            0
 name                py-spyder-devel
 # Preference on mailing list is to use small numbers for epoch.
@@ -37,9 +37,9 @@ long_description    ${description}. \
 
 supported_archs     noarch
 
-checksums           rmd160  48e801fc4e7655d87c2267e69a17e906d96a2162 \
-                    sha256  67a18e1710db78d9801b05d420d1ab9e43df0af35b0a105315576ce84a839775 \
-                    size    4195621
+checksums           rmd160  c162d78dfb833172be6907b3bdb867907783d0cd \
+                    sha256  fe337b1041dea629d055b6a332367d5aefaef08d6e6f6aa9aaac90dca2988bcc \
+                    size    4208100
 
 if {${name} ne ${subport}} {
     require_active_variants py${python.version}-qtpy qt5
@@ -103,20 +103,11 @@ if {${name} ne ${subport}} {
                             patch-spyder_plugins_editor_plugin.py.diff \
                             patch-spyder_app_start.py.diff \
                             patch-spyder_app_mainwindow.py.diff \
-                            patch-spyder_utils_programs.py.diff \
-                            patch-spyder_config_main.py.diff \
-                            patch-spyder_plugins_editor_lsp_client.py.diff \
-                            patch-spyder_plugins_editor_lsp_transport_main.py.diff \
-                            patch-spyder_plugins_editor_lsp_transport_producer.py.diff
+                            patch-spyder_utils_programs.py.diff
 
     post-patch {
         reinplace "s|@@WINPDB_BIN_NAME@@|${WINPDB_BIN_NAME}|g" \
             ${worksrcpath}/spyder/plugins/editor/plugin.py
-        reinplace "s|@@PYLS_BIN_NAME@@|${PYLS_BIN_NAME}|g" \
-            ${worksrcpath}/spyder/config/main.py \
-            ${worksrcpath}/spyder/plugins/editor/lsp/client.py \
-            ${worksrcpath}/spyder/plugins/editor/lsp/transport/main.py \
-            ${worksrcpath}/spyder/plugins/editor/lsp/transport/producer.py
         reinplace "s|\"assistant\"|\"Assistant\"|g" \
             ${worksrcpath}/spyder/app/mainwindow.py
         reinplace "s|\"linguist\"|\"Linguist\"|g" \

python/py-spyder-devel/files/patch-spyder_app_mainwindow.py.diff

@@ -1,6 +1,6 @@
---- spyder/app/mainwindow.py.orig	2019-03-09 09:56:47.000000000 -0500
-+++ spyder/app/mainwindow.py	2019-03-10 12:37:46.000000000 -0400
-@@ -203,7 +203,7 @@
+--- spyder/app/mainwindow.py.orig	2019-04-25 13:26:57.000000000 -0400
++++ spyder/app/mainwindow.py	2019-04-27 11:21:10.000000000 -0400
+@@ -204,7 +204,7 @@
              return file_uri(osp.join(doc_path, python_chm[0]))
      else:
          vinf = sys.version_info

python/py-spyder-devel/files/patch-spyder_plugins_editor_plugin.py.diff

@@ -1,6 +1,6 @@
---- spyder/plugins/editor/plugin.py.orig	2019-04-03 08:12:28.000000000 -0400
-+++ spyder/plugins/editor/plugin.py	2019-04-03 13:10:06.000000000 -0400
-@@ -73,7 +73,7 @@
+--- spyder/plugins/editor/plugin.py.orig	2019-04-25 13:26:57.000000000 -0400
++++ spyder/plugins/editor/plugin.py	2019-04-27 11:21:10.000000000 -0400
+@@ -72,7 +72,7 @@
  dependencies.add("nbconvert", _("Manipulate Jupyter notebooks on the Editor"),
                   required_version=NBCONVERT_REQVER)