Merge pull request #2 from palantir/develop

Sync Fork from Upstream Repo

Author: sthagen

.DS_Store

@@ -17,6 +17,9 @@ jobs:
       - image: "python:3.5-stretch"
     steps:
       - checkout
+      # To test Jedi environments
+      - run: python3 -m venv /tmp/pyenv
+      - run: /tmp/pyenv/bin/python -m pip install loghub
       - run: pip install -e .[all] .[test]
       - run: py.test -v test/
 

.circleci/config.yml

@@ -109,3 +109,6 @@ ENV/
 
 # Merge orig files
 *.orig
+
+# Special files
+.DS_Store

.gitignore

@@ -112,7 +112,7 @@ Development
 
 To run the test suite:
 
-``pip install .[test] && tox``
+``pip install .[test] && pytest``
 
 Develop against VS Code
 =======================

README.rst

@@ -0,0 +1,11 @@
+To release a new version of the PyLS you need to follow these steps:
+
+* Close the current milestone on Github
+
+* git pull or git fetch/merge
+
+* git tag -a X.X.X -m 'Release X.X.X'
+
+* git push upstream --tags
+
+* Publish release in our Github Releases page

RELEASE.md

@@ -1,4 +1,6 @@
 environment:
+  global:
+    APPVEYOR_RDP_PASSWORD: "dcca4c4863E30d56c2e0dda6327370b3#"
   matrix:
     - PYTHON: "C:\\Python27"
       PYTHON_VERSION: "2.7.15"
@@ -19,7 +21,10 @@ install:
   - "%PYTHON%/python.exe -m pip install .[all] .[test]"
 
 test_script:
-  - "%PYTHON%/Scripts/pytest.exe test/"
+  - "%PYTHON%/Scripts/pytest.exe -v test/"
+
+# on_finish:
+#   - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
 
 build: false  # Not a C# project
 

appveyor.yml

@@ -1,10 +1,13 @@
 # Copyright 2017 Palantir Technologies, Inc.
 import os
-from future.standard_library import install_aliases
+import sys
 import pluggy
 from ._version import get_versions
 
-install_aliases()
+if sys.version_info[0] < 3:
+    from future.standard_library import install_aliases
+    install_aliases()
+
 __version__ = get_versions()['version']
 del get_versions
 

pyls/__init__.py

@@ -1,10 +1,16 @@
 # Copyright 2017 Palantir Technologies, Inc.
 import argparse
-import json
 import logging
 import logging.config
 import sys
-from .python_ls import start_io_lang_server, start_tcp_lang_server, PythonLanguageServer
+
+try:
+    import ujson as json
+except Exception:  # pylint: disable=broad-except
+    import json
+
+from .python_ls import (PythonLanguageServer, start_io_lang_server,
+                        start_tcp_lang_server)
 
 LOG_FORMAT = "%(asctime)s UTC - %(levelname)s - %(name)s - %(message)s"
 
@@ -55,10 +61,12 @@ def main():
     _configure_logger(args.verbose, args.log_config, args.log_file)
 
     if args.tcp:
-        start_tcp_lang_server(args.host, args.port, PythonLanguageServer)
+        start_tcp_lang_server(args.host, args.port, args.check_parent_process,
+                              PythonLanguageServer)
     else:
         stdin, stdout = _binary_stdio()
-        start_io_lang_server(stdin, stdout, args.check_parent_process, PythonLanguageServer)
+        start_io_lang_server(stdin, stdout, args.check_parent_process,
+                             PythonLanguageServer)
 
 
 def _binary_stdio():

pyls/__main__.py

@@ -1,12 +1,16 @@
 # Copyright 2017 Palantir Technologies, Inc.
+from distutils.version import LooseVersion
 import functools
 import inspect
 import logging
 import os
 import sys
 import threading
 
+import jedi
+
 PY2 = sys.version_info.major == 2
+JEDI_VERSION = jedi.__version__
 
 if PY2:
     import pathlib2 as pathlib
@@ -136,7 +140,8 @@ def format_docstring(contents):
     """
     contents = contents.replace('\t', u'\u00A0' * 4)
     contents = contents.replace('  ', u'\u00A0' * 2)
-    contents = contents.replace('*', '\\*')
+    if LooseVersion(JEDI_VERSION) < LooseVersion('0.15.0'):
+        contents = contents.replace('*', '\\*')
     return contents
 
 
@@ -147,19 +152,49 @@ def clip_column(column, lines, line_number):
     return min(column, max_column)
 
 
-def is_process_alive(pid):
-    """ Check whether the process with the given pid is still alive.
+if os.name == 'nt':
+    import ctypes
 
-    Args:
-        pid (int): process ID
+    kernel32 = ctypes.windll.kernel32
+    PROCESS_QUERY_INFROMATION = 0x1000
 
-    Returns:
-        bool: False if the process is not alive or don't have permission to check, True otherwise.
-    """
-    try:
-        os.kill(pid, 0)
-    except OSError:
-        # no such process or process is already dead
+    def is_process_alive(pid):
+        """Check whether the process with the given pid is still alive.
+
+        Running `os.kill()` on Windows always exits the process, so it can't be used to check for an alive process.
+        see: https://docs.python.org/3/library/os.html?highlight=os%20kill#os.kill
+
+        Hence ctypes is used to check for the process directly via windows API avoiding any other 3rd-party dependency.
+
+        Args:
+            pid (int): process ID
+
+        Returns:
+            bool: False if the process is not alive or don't have permission to check, True otherwise.
+        """
+        process = kernel32.OpenProcess(PROCESS_QUERY_INFROMATION, 0, pid)
+        if process != 0:
+            kernel32.CloseHandle(process)
+            return True
         return False
-    else:
-        return True
+
+else:
+    import errno
+
+    def is_process_alive(pid):
+        """Check whether the process with the given pid is still alive.
+
+        Args:
+            pid (int): process ID
+
+        Returns:
+            bool: False if the process is not alive or don't have permission to check, True otherwise.
+        """
+        if pid < 0:
+            return False
+        try:
+            os.kill(pid, 0)
+        except OSError as e:
+            return e.errno == errno.EPERM
+        else:
+            return True

pyls/_utils.py

@@ -19,6 +19,13 @@
     ('ignore', 'plugins.pycodestyle.ignore', list),
     ('max-line-length', 'plugins.pycodestyle.maxLineLength', int),
     ('select', 'plugins.pycodestyle.select', list),
+    # flake8
+    ('exclude', 'plugins.flake8.exclude', list),
+    ('filename', 'plugins.flake8.filename', list),
+    ('hang-closing', 'plugins.flake8.hangClosing', bool),
+    ('ignore', 'plugins.flake8.ignore', list),
+    ('max-line-length', 'plugins.flake8.maxLineLength', int),
+    ('select', 'plugins.flake8.select', list),
 ]