diff --git a/.github/workflows/pytest-lsp-pr.yml b/.github/workflows/pytest-lsp-pr.yml index c861a78..cad5b0c 100644 --- a/.github/workflows/pytest-lsp-pr.yml +++ b/.github/workflows/pytest-lsp-pr.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] - os: [ubuntu-latest] + os: [ubuntu-latest, windows-latest] steps: - uses: actions/checkout@v3 @@ -38,24 +38,25 @@ jobs: # dev version number e.g. v1.2.3-dev4 ./scripts/make-release.sh pytest-lsp name: Set Version - if: matrix.python-version == '3.10' + if: matrix.python-version == '3.10' && matrix.os == 'ubuntu-latest' - run: | cd lib/pytest-lsp version=$(echo ${{ matrix.python-version }} | tr -d .) python -m tox run -f "py${version}" + shell: bash name: Test - name: Package run: | cd lib/pytest-lsp python -m build - if: always() && matrix.python-version == '3.10' + if: always() && matrix.python-version == '3.10' && matrix.os == 'ubuntu-latest' - name: 'Upload Artifact' uses: actions/upload-artifact@v3 with: name: 'dist' path: lib/pytest-lsp/dist - if: always() && matrix.python-version == '3.10' + if: always() && matrix.python-version == '3.10' && matrix.os == 'ubuntu-latest' diff --git a/lib/pytest-lsp/changes/72.enhancement.rst b/lib/pytest-lsp/changes/72.enhancement.rst new file mode 100644 index 0000000..5afc834 --- /dev/null +++ b/lib/pytest-lsp/changes/72.enhancement.rst @@ -0,0 +1 @@ +It is now possible to set the environment variables that the server under test is launched with. diff --git a/lib/pytest-lsp/tests/test_client.py b/lib/pytest-lsp/tests/test_client.py index 1bfc74e..102bc7f 100644 --- a/lib/pytest-lsp/tests/test_client.py +++ b/lib/pytest-lsp/tests/test_client.py @@ -52,14 +52,14 @@ def test_client_capabilities( @pytest_lsp.fixture( config=ClientServerConfig( - server_command=["{python}", "{server}"], + server_command=[r"{python}", r"{server}"], ) ) async def client(lsp_client: LanguageClient): await lsp_client.initialize_session( InitializeParams( capabilities=client_capabilities("{client_spec}"), - root_uri="{root_uri}" + root_uri=r"{root_uri}" ) ) yield diff --git a/lib/pytest-lsp/tests/test_plugin.py b/lib/pytest-lsp/tests/test_plugin.py index a964aca..15f5b13 100644 --- a/lib/pytest-lsp/tests/test_plugin.py +++ b/lib/pytest-lsp/tests/test_plugin.py @@ -33,14 +33,14 @@ def setup_test(pytester: pytest.Pytester, server_name: str, test_code: str): @pytest_lsp.fixture( config=ClientServerConfig( - server_command=["{python}", "{server}"], + server_command=[r"{python}", r"{server}"], ) ) async def client(lsp_client: LanguageClient): await lsp_client.initialize_session( InitializeParams( capabilities=client_capabilities("visual-studio-code"), - root_uri="{root_uri}" + root_uri=r"{root_uri}" ) ) yield