Skip to content

Commit

Permalink
Merge pull request #23 from bollwyvl/jupyterlab-lsp-360
Browse files Browse the repository at this point in the history
jupyterlab-lsp 3.6.0 and jupyter-lsp 1.2.0, new metapackage
  • Loading branch information
bollwyvl authored Apr 26, 2021
2 parents 02a06fb + 417fc68 commit b5f4399
Show file tree
Hide file tree
Showing 6 changed files with 97 additions and 30 deletions.
27 changes: 16 additions & 11 deletions .scripts/build_steps.sh

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

9 changes: 7 additions & 2 deletions .scripts/logging_utils.sh

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

19 changes: 12 additions & 7 deletions .scripts/run_docker_build.sh

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

6 changes: 4 additions & 2 deletions README.md

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

27 changes: 24 additions & 3 deletions build-locally.py

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

39 changes: 34 additions & 5 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# this is the version the bot will _hopefully_ pick up and PR.
{% set version = "3.5.0" %}
{% set version = "3.6.0" %}
# Leave the build number the same if only the server version changes.
{% set build_number = 0 %}

# this will likely have to be hand-updated.
{% set server_version = "1.1.4" %}
{% set server_version = "1.2.0" %}
# Leave the build number the same if only the labextension changes.
{% set server_build_number = 0 %}

Expand All @@ -18,10 +18,10 @@ package:
source:
- folder: jupyterlab-lsp
url: https://pypi.io/packages/source/j/jupyterlab-lsp/jupyterlab-lsp-{{ version }}.tar.gz
sha256: 93359371fe51491f98a421b1658de5ec55e15e6400a7cf6adcaabf4cbc45cb52
sha256: f1f03b4e1072920ac951dbd9b0b6db60b23a1585317698c09b3a1fff35281292
- folder: jupyter-lsp
url: https://pypi.io/packages/source/j/jupyter-lsp/jupyter-lsp-{{ server_version }}.tar.gz
sha256: d40bb1ebb79057e17fc3d629ba516a6be401876e23f4494fd6a3cb30a6df808d
sha256: 0f1e25a2f8b598b53ada5e9fcffc7659c2a3cf448f9640997abc2fc5d4735b2a

build:
noarch: python
Expand Down Expand Up @@ -60,7 +60,7 @@ outputs:
- pip check
- jupyter labextension list
- jupyter labextension list 1>labextensions 2>&1
- cat labextensions | grep "jupyterlab-lsp.*OK.*jupyterlab_lsp" # [unix]
- cat labextensions | grep "jupyterlab-lsp.*OK.*jupyterlab-lsp" # [unix]
# tests nbclassic machinery
- jupyter serverextension list
- jupyter serverextension list 1>serverextensions 2>&1
Expand Down Expand Up @@ -167,6 +167,35 @@ outputs:
doc_url: https://jupyterlab-lsp.readthedocs.io
doc_source_url: https://github.com/krassowski/jupyterlab-lsp/blob/master/docs

- name: jupyter-lsp-python-lsp-server
version: {{ server_version }}
build:
number: {{ server_build_number }}
noarch: python
requirements:
host:
- python >=3.6
run:
- {{ pin_subpackage("jupyter-lsp", exact=True) }}
- python-lsp-server >=1
test:
requires:
- pip
- pytest-asyncio
- pytest-runner
commands:
- pip check
# 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 ') }} or r_package_detection)"
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-lsp-server
doc_url: https://jupyterlab-lsp.readthedocs.io
doc_source_url: https://github.com/krassowski/jupyterlab-lsp/blob/master/docs

- name: jupyter-lsp-python-plugins
version: {{ server_version }}
build:
Expand Down

0 comments on commit b5f4399

Please sign in to comment.