Skip to content

Commit

Permalink
Merge pull request #8 from bollwyvl/jupyterlab-lsp-300rc0
Browse files Browse the repository at this point in the history
jupyterlab-lsp 3.0.0rc0 and jupyter-lsp 1.0.0rc0
  • Loading branch information
bollwyvl authored Jan 6, 2021
2 parents 85f3c85 + 0b79980 commit eb0bf2a
Show file tree
Hide file tree
Showing 7 changed files with 123 additions and 54 deletions.
4 changes: 2 additions & 2 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
cdt_name:
- cos6
channel_sources:
- conda-forge,defaults
- conda-forge/label/jupyterlab_rc,conda-forge/label/jupyterlab_server_rc,conda-forge
channel_targets:
- conda-forge main
- conda-forge jupyter_lsp_rc
docker_image:
- quay.io/condaforge/linux-anvil-comp7
12 changes: 8 additions & 4 deletions .scripts/run_docker_build.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions recipe/build_base.bat

This file was deleted.

1 change: 0 additions & 1 deletion recipe/build_base.sh

This file was deleted.

5 changes: 5 additions & 0 deletions recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
channel_sources:
- conda-forge/label/jupyterlab_rc,conda-forge/label/jupyterlab_server_rc,conda-forge

channel_targets:
- conda-forge jupyter_lsp_rc
146 changes: 104 additions & 42 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,68 +1,116 @@
{% set name = "jupyter-lsp" %}
{% set ext_name = "@krassowski/jupyterlab-lsp" %}
{% set version = "0.9.3" %}
{% set version = "3.0.0rc0" %}
{% set build_number = 0 %}

{% set py_spec = ">=3.6" %}
{% set lab_spec = ">=2.2,<3.0.0a0" %}
{% set ext_spec = "@^2.1.0" %}
{% set server_version = "1.0.0rc0" %}
{% set server_build_number = 0 %}

# List of jupyter_lsp py.tests ran for each known servers
{% set server_tests = ["serverextension", "start_known", "listeners"] %}

package:
name: {{ name }}-meta # To avoid issue https://github.com/conda/conda-build/issues/3933
name: jupyter-lsp-meta # To avoid issue https://github.com/conda/conda-build/issues/3933
version: {{ version }}

source:
url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz
sha256: 73b5cb47fbe672bee6c02ddc4f2fbe728dc3bff589b5741835ebb80a862163af
- folder: jupyterlab-lsp
url: https://pypi.io/packages/source/j/jupyterlab-lsp/jupyterlab-lsp-{{ version }}.tar.gz
sha256: 31318bc361f1036045c5143c5aabff690017a61767ae7daa006fe9baa4b401d5
- folder: jupyter-lsp
url: https://pypi.io/packages/source/j/jupyter-lsp/jupyter-lsp-{{ server_version }}.tar.gz
sha256: d5f2555c8a89b1a33026dfb19d4eb5de3b2db9e0e97c5ff4c5125aafd9709041

build:
noarch: python
number: {{ build_number }}

requirements:
host:
- pip
- python >=3.6
run:
- python >=3.6

test:
commands:
- echo "TBD"

outputs:
- name: {{ name }}
- name: jupyterlab-lsp
version: {{ version }}
build:
number: {{ build_number }}
noarch: python
script: build_base.bat # [win]
script: build_base.sh # [not win]
script: cd jupyterlab-lsp && {{ PYTHON }} -m pip install . --no-deps -vv
requirements:
host:
- pip
- python {{ py_spec }}
- python >=3.6
run:
- notebook >=4.3.1
- python {{ py_spec }}
- setuptools
- jupyter-lsp >={{ server_version }}
- jupyterlab >=3,<4
- python >=3.6
test:
requires:
- jupyterlab {{ lab_spec }}
- jupyterlab_server>=1.1.0
- nodejs >=10
- pip
commands:
- python -m pip check
- jupyter serverextension list 1>serverextensions 2>&1
- cat serverextensions | grep "{{ name|replace("-", "_") }}.*OK" # [unix]
- jupyter labextension install {{ ext_name }}{{ ext_spec }}
# TODO: restore after 1.0.0
# - python -m pip check
- jupyter labextension list
- jupyter labextension list 1>labextensions 2>&1
- cat labextensions | grep "{{ ext_name }}.*OK" # [unix]
- python -m jupyterlab.browser_check # [not linux]
- name: {{ name }}-python
- cat labextensions | grep "jupyterlab-lsp.*OK.*jupyterlab_lsp" # [unix]
about:
home: https://github.com/krassowski/jupyterlab-lsp
license_file: jupyterlab-lsp/LICENSE
license: BSD-3-Clause
license_family: BSD
summary: Language Server Protocol integration for JupyterLab
doc_url: https://jupyterlab-lsp.readthedocs.io
doc_source_url: https://github.com/krassowski/jupyterlab-lsp/blob/master/docs

- name: jupyter-lsp
version: {{ server_version }}
build:
number: {{ build_number }}
noarch: generic
number: {{ server_build_number }}
noarch: python
script: cd jupyter-lsp && {{ PYTHON }} -m pip install . --no-deps -vv
requirements:
host:
- pip
- python >=3.6
run:
- entrypoints
- jupyter_server >={{ server_version }}
- python >=3.6
test:
requires:
- pip
commands:
- python -m pip check
- jupyter server extension list
- jupyter server extension list 1>serverextensions 2>&1
- cat serverextensions | grep "jupyter_lsp.*OK" # [unix]
about:
home: https://github.com/krassowski/jupyterlab-lsp
license: BSD-3-Clause
license_family: BSD
license_file: jupyter-lsp/LICENSE
summary: Multi-Language Server WebSocket proxy for Jupyter Server
doc_url: https://jupyterlab-lsp.readthedocs.io
doc_source_url: https://github.com/krassowski/jupyterlab-lsp/blob/master/docs

- name: jupyter-lsp-python
version: {{ server_version }}
build:
number: {{ server_build_number }}
noarch: python
requirements:
host:
- python >=3.6
run:
- {{ pin_subpackage(name, exact=True) }}
- {{ pin_subpackage("jupyter-lsp", exact=True) }}
- python-language-server >=0.31.9
test:
requires:
- jupyterlab {{ lab_spec }}
- jupyterlab_server>=1.1.0
- pip
- pytest-asyncio
- pytest-runner
Expand All @@ -71,41 +119,55 @@ outputs:
# TODO add test for current ls by adding " or pyls" to -k option - but 1 test is failing
- pytest -vv -p no:warnings --pyargs jupyter_lsp -k "not ({{ server_tests|join(' or ') }})"
about:
home: https://github.com/krassowski/jupyterlab-lsp
license: BSD-3-Clause
license_family: BSD
license_file: jupyter-lsp/LICENSE
summary: A metapackage for jupyter-lsp and python-language-server
- name: {{ name }}-r
doc_url: https://jupyterlab-lsp.readthedocs.io
doc_source_url: https://github.com/krassowski/jupyterlab-lsp/blob/master/docs

- name: jupyter-lsp-r
version: {{ server_version }}
build:
number: {{ build_number }}
noarch: generic
number: {{ server_build_number }}
noarch: python
requirements:
host:
- python >=3.6
run:
- {{ pin_subpackage(name, exact=True) }}
- {{ pin_subpackage("jupyter-lsp", exact=True) }}
# Snippets support https://github.com/krassowski/jupyterlab-lsp/issues/208
- r-languageserver >=0.3.5
test:
requires:
- jupyterlab {{ lab_spec }}
- jupyterlab_server>=1.1.0
- pip
- pytest-asyncio
- pytest-runner
commands:
- python -m pip check
# TODO add test for current ls
- pytest -vv -p no:warnings --pyargs jupyter_lsp -k "not ({{ server_tests|join(' or ') }})"
about:
home: https://github.com/krassowski/jupyterlab-lsp
license: BSD-3-Clause
license_family: BSD
license_file: jupyter-lsp/LICENSE
summary: A metapackage jupyter-lsp and r-languageserver
doc_url: https://jupyterlab-lsp.readthedocs.io
doc_source_url: https://github.com/krassowski/jupyterlab-lsp/blob/master/docs


about:
home: https://github.com/krassowski/jupyterlab-lsp
license: BSD-3-Clause
license_family: BSD
license_file: LICENSE
summary: Multi-Language Server WebSocket proxy for Jupyter notebook or lab server for Python 3.5+.
license_file: jupyterlab-lsp/LICENSE
summary: Multi-Language Server WebSocket proxy for Jupyter Server
doc_url: https://jupyterlab-lsp.readthedocs.io
doc_source_url: https://github.com/krassowski/jupyterlab-lsp/blob/v{{ version }}/docs
doc_source_url: https://github.com/krassowski/jupyterlab-lsp/blob/master/docs

extra:
feedstock-name: {{ name }}
feedstock-name: jupyter-lsp
recipe-maintainers:
- bollwyvl
- fcollonval
Expand Down

0 comments on commit eb0bf2a

Please sign in to comment.