Merge branch 'master' into unpin-jedi

Author: krassowski

.github/pull_request_template.md

@@ -7,7 +7,8 @@ https://github.com/jupyterlab/jupyterlab/blob/master/CONTRIBUTING.md
 
 ## References
 
-<!-- Note issue numbers this pull request addresses (should be at least one, see contributing guidelines above). -->
+<!-- Note issue numbers this pull request addresses (should be at least one, see contributing guidelines above).
+Use "fixes" and "closes" linking phrases as appropriate. -->
 
 <!-- Note any other pull requests that address this issue and how this pull request is different. -->
 
@@ -27,7 +28,7 @@ https://github.com/jupyterlab/jupyterlab/blob/master/CONTRIBUTING.md
 
 ## Chores
 
-- [ ] linted
-- [ ] tested
-- [ ] documented
-- [ ] changelog entry
+- [ ] linted <!-- Required: Run "jlpm lint" and "python scripts/lint.py" from the root of the repository, then check this box like this: [x] -->
+- [ ] tested <!-- Recommended: Let us know if you already added a test case (if relevant). -->
+- [ ] documented <!-- Optional: Would it be good to improve the documentation? If yes, please consider doing this and checking this box. -->
+- [ ] changelog entry <!-- Recommended: Add a note in the CHANGELOG.md file under the most recent >unreleased< version; if one does not exist, feel free to create one by increasing the version number (no worries if you are not certain of the details - we can improve it later; let's just have something to work with) -->

.github/workflows/job.test.yml

@@ -16,17 +16,17 @@ defaults:
     shell: bash -l {0}
 
 env:
-  # Increase this value to reset all caches
-  CACHE_EPOCH: 0
-
-  JLPM_CMD: jlpm --ignore-optional --prefer-offline --frozen-lockfile
-
+  JULIA_NUM_THREADS: 2
+  MAMBA_NO_BANNER: 1
+  PIP_DISABLE_PIP_VERSION_CHECK: 1
   PYTHONUNBUFFERED: 1
+
   ATEST_RETRIES: 3
-  PIP_DISABLE_PIP_VERSION_CHECK: 1
+  JLPM_CMD: jlpm --ignore-optional --prefer-offline --frozen-lockfile
 
-  # TODO: replace once mambaforge "just works" with setup-miniconda
-  MAMBAFORGE_URL: https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge
+  # Increase this value to reset all caches
+  CACHE_EPOCH: 2
+  JULIA_LANGSERVER: 3.2.0
 
 jobs:
   lint:
@@ -50,7 +50,7 @@ jobs:
           nodejs: '${{ matrix.nodejs }}'
 
       - name: Cache conda
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ~/conda_pkgs_dir
           key: |
@@ -61,11 +61,9 @@ jobs:
       - name: Set up Python and mamba
         uses: conda-incubator/setup-miniconda@v2
         with:
-          installer-url: ${{ env.MAMBAFORGE_URL }}-Linux-x86_64.sh
-          condarc-file: .github/.condarc
-
-      - name: Install base conda dependencies
-        run: mamba env update -n test --file requirements/github-actions.yml
+          environment-file: requirements/github-actions.yml
+          miniforge-variant: Mambaforge
+          use-mamba: true
 
       - name: Install linting dependencies
         run: mamba env update -n test --file requirements/lint.yml
@@ -78,15 +76,17 @@ jobs:
         uses: actions/cache@v2
         with:
           path: '**/node_modules'
-          key: ${{ env.CACHE_EPOCH }}-${{ runner.os }}-node-lint-${{ hashFiles('yarn.lock', 'requirements/github-actions.yml') }}
+          key: |
+            ${{ env.CACHE_EPOCH }}-${{ runner.os }}-node-lint-${{ hashFiles('yarn.lock', 'requirements/github-actions.yml') }}
 
       - name: Cache yarn packages
         id: cache-yarn-packages
         if: steps.cache-node-modules.outputs.cache-hit != 'true'
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: .yarn-packages
-          key: ${{ env.CACHE_EPOCH }}-yarn-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
+          key: |
+            ${{ env.CACHE_EPOCH }}-yarn-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
           restore-keys: |
             ${{ env.CACHE_EPOCH }}-yarn-${{ runner.os }}-
             ${{ env.CACHE_EPOCH }}-yarn-
@@ -107,6 +107,9 @@ jobs:
       - name: Lint frontend
         run: jlpm lint:check
 
+      - name: Check distributions
+        run: python scripts/distcheck.py
+
   build:
     name: build
     runs-on: ${{ matrix.os }}
@@ -128,7 +131,7 @@ jobs:
           nodejs: '${{ matrix.nodejs }}'
 
       - name: Cache conda
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ~/conda_pkgs_dir
           key: |
@@ -139,8 +142,7 @@ jobs:
       - name: Set up Python and mamba
         uses: conda-incubator/setup-miniconda@v2
         with:
-          installer-url: ${{ env.MAMBAFORGE_URL }}-Linux-x86_64.sh
-          condarc-file: .github/.condarc
+          miniforge-variant: Mambaforge
 
       - name: Install minimal build deps
         shell: bash -l {0}
@@ -151,15 +153,17 @@ jobs:
         uses: actions/cache@v2
         with:
           path: '**/node_modules'
-          key: ${{ env.CACHE_EPOCH }}-${{ runner.os }}-node-build-${{ hashFiles('yarn.lock', 'requirements/github-actions.yml') }}
+          key: |
+            ${{ env.CACHE_EPOCH }}-${{ runner.os }}-node-build-${{ hashFiles('yarn.lock', 'requirements/github-actions.yml') }}
 
       - name: Cache yarn packages
         id: cache-yarn-packages
         if: steps.cache-node-modules.outputs.cache-hit != 'true'
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: .yarn-packages
-          key: ${{ env.CACHE_EPOCH }}-yarn-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
+          key: |
+            ${{ env.CACHE_EPOCH }}-yarn-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
           restore-keys: |
             ${{ env.CACHE_EPOCH }}-yarn-${{ runner.os }}-
             ${{ env.CACHE_EPOCH }}-yarn-
@@ -210,15 +214,16 @@ jobs:
         include:
           # if using 3.6, use an old node
           - python: 3.6
-            # Node 10 end-of-life: April 2021
-            nodejs: '>=10,<11.0.0.a0'
-          # if using 3.7, use newer node, etc...
-          - python: 3.7
             # Node 12 end-of-life: April 2022
             nodejs: '>=12,<13.0.0.a0'
-          - python: 3.8
+          # if using 3.7, use newer node, etc...
+          - python: 3.7
             # Node 14 end-of-life: April 2023
             nodejs: '>=14,<15.0.0.a0'
+          - python: 3.8
+            # TODO: switch to Node 16 once gets merged https://github.com/conda-forge/nodejs-feedstock/pull/189
+            # Node 15 end-of-life: June 2021
+            nodejs: '>=15,<16.0.0.a0'
           # TODO: remove when mambaforge just works on setup-miniconda
           - os: ubuntu
             mambaforge: Linux-x86_64.sh
@@ -230,11 +235,6 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - uses: julia-actions/setup-julia@v1
-
-      - name: Install Julia language server
-        run: julia -e 'using Pkg; Pkg.add("LanguageServer")'
-
       - name: Set JupyterLab and Node versions
         uses: cschleiden/replace-tokens@v1
         with:
@@ -246,7 +246,7 @@ jobs:
           nodejs: '${{ matrix.nodejs }}'
 
       - name: Cache conda
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ~/conda_pkgs_dir
           key: |
@@ -257,24 +257,9 @@ jobs:
       - name: Set up Python and mamba
         uses: conda-incubator/setup-miniconda@v2
         with:
-          installer-url: ${{ env.MAMBAFORGE_URL }}-${{ matrix.mambaforge }}
-          python-version: ${{ matrix.python }}
-          condarc-file: .github/.condarc
-
-      - name: Describe conda
-        run: |
-          conda info
-          conda config --show-sources
-          conda config --show
-
-      - name: Install conda dependencies (unix)
-        if: ${{ matrix.os != 'windows' }}
-        run: mamba env update -n test --file requirements/github-actions.yml
-
-      - name: Install conda dependencies (windows)
-        if: ${{ matrix.os == 'windows' }}
-        shell: cmd /C call {0}
-        run: mamba env update -n test --file requirements/github-actions.yml
+          environment-file: requirements/github-actions.yml
+          miniforge-variant: Mambaforge
+          use-mamba: true
 
       - name: List all packages
         run: conda list
@@ -284,22 +269,26 @@ jobs:
         uses: actions/cache@v2
         with:
           path: '**/node_modules'
-          key: ${{ env.CACHE_EPOCH }}-${{ runner.os }}-node-test-${{ hashFiles('yarn.lock', 'requirements/github-actions.yml') }}
+          key: |
+            ${{ env.CACHE_EPOCH }}-${{ runner.os }}-node-atest-${{ hashFiles('yarn.lock') }}
 
       - name: Cache yarn packages
         id: cache-yarn-packages
         if: steps.cache-node-modules.outputs.cache-hit != 'true'
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: .yarn-packages
-          key: ${{ env.CACHE_EPOCH }}-yarn-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
+          key: |
+            ${{ env.CACHE_EPOCH }}-yarn-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
           restore-keys: |
             ${{ env.CACHE_EPOCH }}-yarn-${{ runner.os }}-
             ${{ env.CACHE_EPOCH }}-yarn-
 
-      - name: install npm dependencies
-        if: steps.cache-node-modules.outputs.cache-hit != 'true'
-        run: ${{ env.JLPM_CMD }}
+      - uses: actions/cache@v2
+        with:
+          path: ~/.julia/artifacts
+          key: |
+            ${{ env.CACHE_EPOCH }}-julia-test-${{ runner.os }}-${{ env.JULIA_LANGSERVER }}
 
       - uses: actions/download-artifact@v2
         with:
@@ -313,11 +302,28 @@ jobs:
         run: python -m pip check
 
       - name: List server extensions
-        run: jupyter server extension list
+        run: |
+          jupyter server extension list
+          jupyter server extension list 2>&1 | grep -ie "jupyter_lsp.*enabled" -
+
+      - name: List notebook server extensions
+        run: |
+          jupyter serverextension list
+          jupyter serverextension list 2>&1 | grep -ie "jupyter_lsp.*enabled" -
 
       - name: List frontend extensions
         run: jupyter labextension list
 
+      - name: install node-based language servers
+        if: steps.cache-node-modules.outputs.cache-hit != 'true'
+        run: ${{ env.JLPM_CMD }}
+
+      - name: Install Julia
+        uses: julia-actions/setup-julia@v1
+
+      - name: Install Julia language server
+        run: julia -e 'using Pkg; Pkg.add(Pkg.PackageSpec(;name="LanguageServer", version="${{ env.JULIA_LANGSERVER }}"))'
+
       - name: Run python tests
         run: python scripts/utest.py
 
@@ -382,3 +388,47 @@ jobs:
           jupyter server extension list
           jupyter labextension list 2>&1 | grep -ie "jupyterlab-lsp.*enabled.*ok" -
           jupyter server extension list 2>&1 | grep -ie "jupyter_lsp.*enabled" -
+
+  source:
+    name: smoke source install ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}-latest
+    needs: [build]
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu]
+        python: ['3.6']
+        nodejs: ['14']
+        lab: ['>=3.0.0,<4.0.0a0']
+    steps:
+      - name: Install Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python }}
+          architecture: 'x64'
+      - name: Setup Node
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{matrix.nodejs}}
+      - uses: actions/download-artifact@v2
+        with:
+          name: jupyterlab-lsp dist ${{ github.run_number }}
+          path: ./dist
+      - name: Install the prerequisites
+        run: python -m pip install pip wheel
+      - name: Install JupyterLab
+        shell: bash -l {0}
+        run: python -m pip install 'jupyterlab${{ matrix.lab }}'
+      - name: Install the server package
+        run: cd dist && python -m pip install -vv jupyter_lsp*.whl
+      - name: install the source extension
+        run: cd dist && jupyter labextension install krassowski-jupyterlab-lsp-*.tgz --log-level DEBUG
+      - name: Validate the install
+        run: |
+          set -eux
+          jupyter labextension list
+          jupyter server extension list
+          jupyter serverextension list
+          jupyter labextension list 2>&1 | grep -ie "jupyterlab-lsp.*enabled.*ok" -
+          jupyter server extension list 2>&1 | grep -ie "jupyter_lsp.*enabled" -
+          jupyter serverextension list 2>&1 | grep -ie "jupyter_lsp.*enabled" -