From 3237bf83e3b8d148a8d60e4fd5137ab27a36124e Mon Sep 17 00:00:00 2001 From: Nicholas Bollweg Date: Thu, 5 Nov 2020 23:20:55 -0500 Subject: [PATCH 1/6] remove travis, update setup-miniconda --- .github/workflows/job.lint.yml | 3 +- .github/workflows/job.test.yml | 3 +- .travis.yml | 47 ------------------- README.md | 2 +- .../jupyterlab-go-to-definition/README.md | 2 +- 5 files changed, 6 insertions(+), 51 deletions(-) delete mode 100644 .travis.yml diff --git a/.github/workflows/job.lint.yml b/.github/workflows/job.lint.yml index ed86e34fb..d09a640f3 100644 --- a/.github/workflows/job.lint.yml +++ b/.github/workflows/job.lint.yml @@ -33,7 +33,8 @@ jobs: nodejs: '${{ matrix.nodejs }}' - name: Set up Python and conda - uses: goanpeca/setup-miniconda@v1 + # uses: conda-incubator/setup-miniconda@v2 + uses: conda-incubator/setup-miniconda@16930e6 with: python-version: ${{ matrix.python }} channels: conda-forge, defaults diff --git a/.github/workflows/job.test.yml b/.github/workflows/job.test.yml index 30a21df67..a9277f383 100644 --- a/.github/workflows/job.test.yml +++ b/.github/workflows/job.test.yml @@ -74,7 +74,8 @@ jobs: key: ${{ matrix.os }}-${{ matrix.python }}-conda-${{ env.CACHE_NUMBER }}-${{ hashFiles('requirements/github-actions.yml') }} - name: Set up Python and conda - uses: goanpeca/setup-miniconda@v1 + # uses: conda-incubator/setup-miniconda@v2 + uses: conda-incubator/setup-miniconda@16930e6 with: python-version: ${{ matrix.python }} channels: conda-forge, defaults diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 379440604..000000000 --- a/.travis.yml +++ /dev/null @@ -1,47 +0,0 @@ -language: python - -cache: - directories: - - .yarn-packages - - $HOME/.cache/yarn - - $HOME/.cache/pip - -env: - global: - - TRAVIS_NVM_VERSION=0.35.2 - -matrix: - include: - - python: '3.5' - env: TRAVIS_NODE_VERSION=10 - - python: '3.8' - env: TRAVIS_NODE_VERSION=12 - - python: '3.9-dev' - env: TRAVIS_NODE_VERSION=13 - - os: osx - env: TRAVIS_NODE_VERSION=12 - osx_image: xcode11 - language: shell - allow_failures: - - os: osx - -before_install: - - wget -qO- https://raw.githubusercontent.com/creationix/nvm/v${TRAVIS_NVM_VERSION}/install.sh | bash - - source ~/.nvm/nvm.sh && nvm install $TRAVIS_NODE_VERSION - - python3 -m pip install -r requirements/utest.txt - - python3 -m pip freeze - - python3 setup.py sdist - - python3 setup.py bdist_wheel - -install: - - python3 -m pip install dist/jupyter_lsp*.whl --no-deps -vv - - jlpm - -before_script: - - jlpm build - -script: - - jlpm test - - python3 -m jupyter serverextension list - - python3 -m jupyter serverextension list | grep jupyter_lsp - - python3 scripts/utest.py diff --git a/README.md b/README.md index e554d16ab..8097ed757 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Language Server Protocol integration for Jupyter(Lab) -[![Build Status](https://travis-ci.org/krassowski/jupyterlab-lsp.svg?branch=master)](https://travis-ci.org/krassowski/jupyterlab-lsp) ![tests](https://github.com/krassowski/jupyterlab-lsp/workflows/tests/badge.svg) [![Documentation Status](https://readthedocs.org/projects/jupyterlab-lsp/badge/?version=latest)](https://jupyterlab-lsp.readthedocs.io/en/latest/?badge=latest) [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/krassowski/jupyterlab-lsp/master?urlpath=lab%2Ftree%2Fexamples%2FPython.ipynb) +![tests](https://github.com/krassowski/jupyterlab-lsp/workflows/tests/badge.svg) [![Documentation Status](https://readthedocs.org/projects/jupyterlab-lsp/badge/?version=latest)](https://jupyterlab-lsp.readthedocs.io/en/latest/?badge=latest) [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/krassowski/jupyterlab-lsp/master?urlpath=lab%2Ftree%2Fexamples%2FPython.ipynb) > _This project is still maturing, but you are welcome to check it out, leave feedback and/or a PR_ diff --git a/packages/jupyterlab-go-to-definition/README.md b/packages/jupyterlab-go-to-definition/README.md index 65b6d76c2..34c40c303 100644 --- a/packages/jupyterlab-go-to-definition/README.md +++ b/packages/jupyterlab-go-to-definition/README.md @@ -1,6 +1,6 @@ # Go to definition extension for JupyterLab -[![Build Status](https://travis-ci.org/krassowski/jupyterlab-go-to-definition.svg?branch=master)](https://travis-ci.org/krassowski/jupyterlab-go-to-definition) [![codebeat badge](https://codebeat.co/badges/89f4b78a-c28e-43a0-9b4c-35d36dbd9d5e)](https://codebeat.co/projects/github-com-krassowski-jupyterlab-go-to-definition-master) [![Binder](https://beta.mybinder.org/badge.svg)](https://mybinder.org/v2/gh/krassowski/jupyterlab-go-to-definition/master?urlpath=lab/tree/examples/demo.ipynb) +[![codebeat badge](https://codebeat.co/badges/89f4b78a-c28e-43a0-9b4c-35d36dbd9d5e)](https://codebeat.co/projects/github-com-krassowski-jupyterlab-go-to-definition-master) [![Binder](https://beta.mybinder.org/badge.svg)](https://mybinder.org/v2/gh/krassowski/jupyterlab-go-to-definition/master?urlpath=lab/tree/examples/demo.ipynb) Jump to definition of a variable or function in JupyterLab notebook and file editor. From b9aa1ea12fb4296d427cc8da3db88bdaa4e7a63a Mon Sep 17 00:00:00 2001 From: Nicholas Bollweg Date: Thu, 5 Nov 2020 23:36:54 -0500 Subject: [PATCH 2/6] remove channels specified in workflows --- .github/workflows/job.lint.yml | 1 - .github/workflows/job.test.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/workflows/job.lint.yml b/.github/workflows/job.lint.yml index d09a640f3..86adc89fe 100644 --- a/.github/workflows/job.lint.yml +++ b/.github/workflows/job.lint.yml @@ -37,7 +37,6 @@ jobs: uses: conda-incubator/setup-miniconda@16930e6 with: python-version: ${{ matrix.python }} - channels: conda-forge, defaults channel-priority: true activate-environment: jupyterlab-lsp environment-file: requirements/github-actions.yml diff --git a/.github/workflows/job.test.yml b/.github/workflows/job.test.yml index a9277f383..4f9d90cf9 100644 --- a/.github/workflows/job.test.yml +++ b/.github/workflows/job.test.yml @@ -78,7 +78,6 @@ jobs: uses: conda-incubator/setup-miniconda@16930e6 with: python-version: ${{ matrix.python }} - channels: conda-forge, defaults channel-priority: true auto-activate-base: true activate-environment: jupyterlab-lsp From cf9e190d3917d10d97da5921daeb7ee4a3676e1e Mon Sep 17 00:00:00 2001 From: Nicholas Bollweg Date: Sun, 8 Nov 2020 21:29:23 -0500 Subject: [PATCH 3/6] use released setup-miniconda --- .github/workflows/job.lint.yml | 3 +-- .github/workflows/job.test.yml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/job.lint.yml b/.github/workflows/job.lint.yml index 86adc89fe..a3b028274 100644 --- a/.github/workflows/job.lint.yml +++ b/.github/workflows/job.lint.yml @@ -33,8 +33,7 @@ jobs: nodejs: '${{ matrix.nodejs }}' - name: Set up Python and conda - # uses: conda-incubator/setup-miniconda@v2 - uses: conda-incubator/setup-miniconda@16930e6 + uses: conda-incubator/setup-miniconda@v2 with: python-version: ${{ matrix.python }} channel-priority: true diff --git a/.github/workflows/job.test.yml b/.github/workflows/job.test.yml index 4f9d90cf9..a64922b70 100644 --- a/.github/workflows/job.test.yml +++ b/.github/workflows/job.test.yml @@ -74,8 +74,7 @@ jobs: key: ${{ matrix.os }}-${{ matrix.python }}-conda-${{ env.CACHE_NUMBER }}-${{ hashFiles('requirements/github-actions.yml') }} - name: Set up Python and conda - # uses: conda-incubator/setup-miniconda@v2 - uses: conda-incubator/setup-miniconda@16930e6 + uses: conda-incubator/setup-miniconda@v2 with: python-version: ${{ matrix.python }} channel-priority: true From 2da63e2cb26f87e63f97cfca55ed293d7af9c038 Mon Sep 17 00:00:00 2001 From: Nicholas Bollweg Date: Sun, 8 Nov 2020 22:15:49 -0500 Subject: [PATCH 4/6] squash more warnings: setenv, osx --- .github/workflows/job.test.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/job.test.yml b/.github/workflows/job.test.yml index a64922b70..f246d989a 100644 --- a/.github/workflows/job.test.yml +++ b/.github/workflows/job.test.yml @@ -35,8 +35,8 @@ jobs: # TODO: maybe turn back on fail-fast: false matrix: + os: [ubuntu-latest, macos-latest, windows-latest] python: [3.6, 3.7, 3.8] - os: [ubuntu-16.04, macos-10.14, vs2017-win2016] lab: ['>=2.2.0,<3.0.0a0'] include: # if using 3.6, use an old node @@ -118,12 +118,13 @@ jobs: run: cd dist && python -m pip install jupyter_lsp-${{ env.PY_JLSP_VERSION }}-py3-none-any.whl --no-deps - name: Find out jedi cache location - run: python -c 'import jedi; print("::set-env name=JEDI_CACHE_DIR::" + jedi.settings.cache_directory)' + id: jedi-cache + run: python -c 'import jedi; print("::set-output name=dir::" + jedi.settings.cache_directory)' - name: Cache jedi cache uses: actions/cache@v1 with: - path: ${{ env.JEDI_CACHE_DIR }} + path: ${{ steps.jedi-cache.outputs.dir }} key: jedi-${{ matrix.os }}-${{ hashFiles('scripts/jedi_cache.py') }}-${{ hashFiles('requirements/github-actions.yml') }} - name: Warm up jedi cache @@ -143,7 +144,7 @@ jobs: run: python scripts/tectonic_cache.py - name: Run frontend unit tests - if: ${{ !contains(matrix.os, 'win') }} + if: ${{ !contains(matrix.os, 'windows') }} run: jlpm test # js_cov_packages: From 11a1ff677290b54b323d27cd1f840452393c1c05 Mon Sep 17 00:00:00 2001 From: Nicholas Bollweg Date: Sun, 8 Nov 2020 22:17:47 -0500 Subject: [PATCH 5/6] shorten names further --- .github/workflows/job.test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/job.test.yml b/.github/workflows/job.test.yml index f246d989a..7fb12e403 100644 --- a/.github/workflows/job.test.yml +++ b/.github/workflows/job.test.yml @@ -29,13 +29,13 @@ env: jobs: acceptance: - runs-on: ${{ matrix.os }} + runs-on: ${{ matrix.os }}-latest name: ${{ matrix.os }}, Python ${{ matrix.python }}, Node ${{ matrix.nodejs }} strategy: # TODO: maybe turn back on fail-fast: false matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + os: [ubuntu, macos, windows] python: [3.6, 3.7, 3.8] lab: ['>=2.2.0,<3.0.0a0'] include: From ad687df468f834dee8c0e9783aaa35d508ddcf64 Mon Sep 17 00:00:00 2001 From: Nicholas Bollweg Date: Sun, 8 Nov 2020 22:19:51 -0500 Subject: [PATCH 6/6] shorten names even further --- .github/workflows/job.test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/job.test.yml b/.github/workflows/job.test.yml index 7fb12e403..7a8a9c7b5 100644 --- a/.github/workflows/job.test.yml +++ b/.github/workflows/job.test.yml @@ -30,7 +30,7 @@ env: jobs: acceptance: runs-on: ${{ matrix.os }}-latest - name: ${{ matrix.os }}, Python ${{ matrix.python }}, Node ${{ matrix.nodejs }} + name: ${{ matrix.os }} py${{ matrix.python }} node${{ matrix.nodejs }} strategy: # TODO: maybe turn back on fail-fast: false