8000 Circle 2.0 (#481) · brandonwillard/python-lsp-server@46fd374 · GitHub
[go: up one dir, main page]
Skip to content

Commit 46fd374

Browse files
gatesngatesn
authored
Circle 2.0 (python-lsp#481)
1 parent 43f5343 commit 46fd374

File tree

7 files changed

+82
-57
lines changed

7 files changed

+82
-57
lines changed

‎.circleci/config.yml

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
version: 2
2+
3+
jobs:
4+
python2-test:
5+
docker:
6+
- image: "python:2.7-stretch"
7+
steps:
8+
- checkout
9+
- run: pip install -e .[all] .[test]
10+
- run: py.test test/
11+
- run: pylint pyls test
12+
- run: pycodestyle pyls test
13+
- run: pyflakes pyls test
14+
15+
python3-test:
16+
docker:
17+
- image: "python:3.4-stretch"
18+
steps:
19+
- checkout
20+
- run: pip install -e .[all] .[test]
21+
- run: py.test test/
22+
23+
lint:
24+
docker:
25+
- image: "python:2.7-stretch"
26+
steps:
27+
- checkout
28+
- run: pip install -e .[all] .[test]
29+
- run: pylint pyls test
30+
- run: pycodestyle pyls test
31+
- run: pyflakes pyls test
32+
33+
publish:
34+
docker:
35+
- image: "python:3.4-stretch"
36+
steps:
37+
- attach_workspace: { at: . }
38+
39+
workflows:
40+
version: 2
41+
build:
42+
jobs:
43+
- python2-test
44+
- python3-test
45+
- publish:
46+
filters:
47+
tags:
48+
only: /[0-9]+(\.[0-9]+)+((-(beta|rc)[0-9]{1,2})(\.[0-9])?)?/
49+
branches:
50+
ignore: /.*/
51+
requires:
52+
- python2-test
53+
- python3-test

‎appveyor.yml

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,27 @@
11
environment:
22
matrix:
3-
- TOXENV: py27
4-
- TOXENV: py34
5-
- TOXENV: lint
3+
- PYTHON: "C:\\Python27"
4+
PYTHON_VERSION: "2.7.15"
5+
PYTHON_ARCH: "64"
6+
7+
- PYTHON: "C:\\Python34"
8+
PYTHON_VERSION: "3.4.9"
9+
PYTHON_ARCH: "64"
610

711
matrix:
812
fast_finish: true
913

10-
install:
11-
- C:\Python27\python -m pip install --pre -U tox
14+
init:
15+
- "ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH%"
1216

13-
build: false # Not a C# project
17+
install:
18+
- "%PYTHON%/python.exe -m pip install --upgrade pip setuptools"
19+
- "%PYTHON%/python.exe -m pip install .[all] .[test]"
1420

1521
test_script:
16-
- C:\Python27\scripts\tox
22+
- "%PYTHON%/Scripts/pytest.exe test/"
23+
24+
build: false # Not a C# project
1725

1826
cache:
1927
- '%APPDATA%\pip\Cache'

‎circle.yml

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎setup.cfg

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,14 @@ versionfile_source = pyls/_version.py
55
versionfile_build = pyls/_version.py
66
tag_prefix =
77
parentdir_prefix =
8+
9+
[pycodestyle]
10+
ignore = E226, E722, W504
11+
max-line-length = 120
12+
exclude = test/plugins/.ropeproject,test/.ropeproject
13+
14+
[tool:pytest]
15+
testpaths = test
16+
addopts =
17+
--cov-report html --cov-report term --junitxml=pytest.xml
18+
--cov pyls --cov test

‎setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
'pyflakes': ['pyflakes>=1.6.0'],
6262
'rope': ['rope>0.10.5'],
6363
'yapf': ['yapf'],
64-
'test': ['tox', 'versioneer', 'pytest', 'mock', 'pytest-cov', 'coverage'],
64+
'test': ['versioneer', 'pylint', 'pytest', 'mock', 'pytest-cov', 'coverage'],
6565
},
6666

6767
# To provide executable scripts, use entry points in preference to the

‎test/test_language_server.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import os
33
from threading import Thread
44

5+
from test import unix_only
56
from pyls_jsonrpc.exceptions import JsonRpcMethodNotFound
67
import pytest
78

@@ -68,6 +69,7 @@ def test_initialize(client_server): # pylint: disable=redefined-outer-name
6869
assert 'capabilities' in response
6970

7071

72+
@unix_only
7173
def test_exit_with_parent_process_died(client_exited_server): # pylint: disable=redefined-outer-name
7274
# language server should have already exited before responding
7375
with pytest.raises(Exception):

‎tox.ini

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)
0