Skip to content

Ensure using python 3.6 when building VSIX with JediLSP #16124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
karthiknadig merged 4 commits into from
May 5, 2021
Merged

Ensure using python 3.6 when building VSIX with JediLSP #16124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a18e5a9
Ensure using python 3.6 when building VSIX with JediLSP
karthiknadig May 4, 2021
df8ecbd
Fix builds
karthiknadig May 4, 2021
384d9d4
Fix pr-check
karthiknadig May 4, 2021
acffd9e
Clean up
karthiknadig May 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 24 additions & 11 deletions .github/actions/build-vsix/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,36 +9,49 @@ outputs:
runs:
using: 'composite'
steps:
# For faster/better builds of sdists.
- run: python -m pip install wheel
Comment thread
karthiknadig marked this conversation as resolved.
- name: Upgrade Pip
run: python -m pip install -U pip
shell: bash

- run: python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python --no-cache-dir --implementation py --no-deps --upgrade -r requirements.txt
# For faster/better builds of sdists.
- name: Install build pre-requisite
run: python -m pip install wheel
shell: bash

- run: |
python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/jedilsp --no-cache-dir --implementation py --platform any --abi none --no-deps --only-binary :all: --upgrade -r jedils_requirements.txt
- name: Install python dependencies
run: python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python --no-cache-dir --implementation py --no-deps --upgrade -r requirements.txt
shell: bash

- run: |
- name: Install debugpy
run: |
python -m pip --disable-pip-version-check install -r build/debugger-install-requirements.txt
python ./pythonFiles/install_debugpy.py
shell: bash

- run: npm ci --prefer-offline
- name: Install Jedi LSP
run: |
python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/jedilsp --no-cache-dir --implementation py --platform any --abi none --no-deps --only-binary :all: --upgrade -r jedils_requirements.txt
shell: bash

- name: Run npm ci
run: npm ci --prefer-offline
shell: bash

# Use the GITHUB_RUN_ID environment variable to update the build number.
# GITHUB_RUN_ID is a unique number for each run within a repository.
# This number does not change if you re-run the workflow run.
- run: npm run updateBuildNumber -- --buildNumber $GITHUB_RUN_ID
- name: Update extension build number
run: npm run updateBuildNumber -- --buildNumber $GITHUB_RUN_ID
shell: bash

- run: npm run addExtensionDependencies
- name: Update extension dependencies
run: npm run addExtensionDependencies
shell: bash

- run: npm run addExtensionPackDependencies
- name: Update Optional extension dependencies
run: npm run addExtensionPackDependencies
shell: bash

- run: npm run package
- name: Build VSIX
run: npm run package
shell: bash
8 changes: 3 additions & 5 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,11 @@ jobs:
with:
node-version: ${{env.NODE_VERSION}}

- name: Use Python 3.x
# Jedi LS depends on dataclasses which was a pypi install in 3.6
Comment thread
karthiknadig marked this conversation as resolved.
- name: Use Python 3.6 for JediLSP
uses: actions/setup-python@v2
with:
python-version: 3.x

- name: Upgrade pip
run: python -m pip install -U pip
python-version: 3.6

- name: Build VSIX
uses: ./.github/actions/build-vsix
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/pr-check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,11 @@ jobs:
with:
node-version: ${{env.NODE_VERSION}}

- name: Use Python ${{env.PYTHON_VERSION}}
# Jedi LS depends on dataclasses which was a pypi install in 3.6
Comment thread
karthiknadig marked this conversation as resolved.
- name: Use Python 3.6 for JediLSP
uses: actions/setup-python@v2
with:
python-version: ${{env.PYTHON_VERSION}}

- name: Upgrade pip
run: python -m pip install -U pip
python-version: 3.6

- name: Build VSIX
uses: ./.github/actions/build-vsix
Expand Down
1 change: 1 addition & 0 deletions news/2 Fixes/16119.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Ensure that `dataclasses` is installed when using Jedi LSP.