From aaa6a6014aad43d5fbbaee4a0a06ed229b47662f Mon Sep 17 00:00:00 2001 From: Carlos Cordoba Date: Wed, 4 Aug 2021 12:25:02 -0500 Subject: [PATCH 1/3] Remove temp file and ignore that kind of files --- .gitignore | 1 + CHANGELOG.temp | 13 ------------- 2 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 CHANGELOG.temp diff --git a/.gitignore b/.gitignore index 4f47251d..c878736e 100644 --- a/.gitignore +++ b/.gitignore @@ -115,3 +115,4 @@ ENV/ # Special files .DS_Store +*.temp diff --git a/CHANGELOG.temp b/CHANGELOG.temp deleted file mode 100644 index ee66964b..00000000 --- a/CHANGELOG.temp +++ /dev/null @@ -1,13 +0,0 @@ -## Version 1.2.1 (2021-08-04) - -### Issues Closed - -* [Issue 65](https://github.com/python-lsp/python-lsp-server/issues/65) - Release v1.2.1 - -In this release 1 issue was closed. - -### Pull Requests Merged - -* [PR 64](https://github.com/python-lsp/python-lsp-server/pull/64) - Catch errors when getting docstrings on _resolve_completion, by [@ccordoba12](https://github.com/ccordoba12) - -In this release 1 pull request was closed. From acbb90fb694ea4ca3681edb50816f2a5c180c388 Mon Sep 17 00:00:00 2001 From: Carlos Cordoba Date: Wed, 4 Aug 2021 13:15:53 -0500 Subject: [PATCH 2/3] Testing: Remove old constants and add a new one --- test/test_language_server.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/test/test_language_server.py b/test/test_language_server.py index 3602b10b..2118800b 100644 --- a/test/test_language_server.py +++ b/test/test_language_server.py @@ -14,8 +14,7 @@ from pylsp.python_lsp import start_io_lang_server, PythonLSPServer CALL_TIMEOUT = 10 -PY2 = sys.version_info[0] == 2 -PY3 = sys.version_info[0] == 3 +RUNNING_IN_CI = bool(os.environ.get('CI')) def start_client(client): @@ -87,8 +86,7 @@ def test_initialize(client_server): # pylint: disable=redefined-outer-name @flaky(max_runs=10, min_passes=1) -@pytest.mark.skipif(os.name == 'nt' or (sys.platform.startswith('linux') and PY3), - reason='Skipped on win and fails on linux >=3.6') +@pytest.mark.skipif(not sys.platform == 'darwin', reason='Skipped on win and fails on linux') def test_exit_with_parent_process_died(client_exited_server): # pylint: disable=redefined-outer-name # language server should have already exited before responding lsp_server, mock_process = client_exited_server.client, client_exited_server.process @@ -104,8 +102,7 @@ def test_exit_with_parent_process_died(client_exited_server): # pylint: disable assert not client_exited_server.client_thread.is_alive() -@pytest.mark.skipif(sys.platform.startswith('linux') and PY3, - reason='Fails on linux and py3') +@pytest.mark.skipif(sys.platform.startswith('linux'), reason='Fails on linux') def test_not_exit_without_check_parent_process_flag(client_server): # pylint: disable=redefined-outer-name response = client_server._endpoint.request('initialize', { 'processId': 1234, @@ -115,7 +112,7 @@ def test_not_exit_without_check_parent_process_flag(client_server): # pylint: d assert 'capabilities' in response -@pytest.mark.skipif(bool(os.environ.get('CI')), reason='This test is hanging on CI') +@pytest.mark.skipif(RUNNING_IN_CI, reason='This test is hanging on CI') def test_missing_message(client_server): # pylint: disable=redefined-outer-name with pytest.raises(JsonRpcMethodNotFound): client_server._endpoint.request('unknown_method').result(timeout=CALL_TIMEOUT) From ee3b2b7632cde13500d9c1844c30f019c951fa29 Mon Sep 17 00:00:00 2001 From: Carlos Cordoba Date: Wed, 4 Aug 2021 13:21:26 -0500 Subject: [PATCH 3/3] Try to fix a test --- test/test_language_server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_language_server.py b/test/test_language_server.py index 2118800b..8d1f8927 100644 --- a/test/test_language_server.py +++ b/test/test_language_server.py @@ -86,7 +86,7 @@ def test_initialize(client_server): # pylint: disable=redefined-outer-name @flaky(max_runs=10, min_passes=1) -@pytest.mark.skipif(not sys.platform == 'darwin', reason='Skipped on win and fails on linux') +@pytest.mark.skipif(not sys.platform.startswith('Linux'), reason='Skipped on win and flaky on mac') def test_exit_with_parent_process_died(client_exited_server): # pylint: disable=redefined-outer-name # language server should have already exited before responding lsp_server, mock_process = client_exited_server.client, client_exited_server.process