Skip to content

Commit 53b1dc1

Browse files
committed
try updating base
1 parent ebdbf17 commit 53b1dc1

File tree

1 file changed

+18
-17
lines changed

1 file changed

+18
-17
lines changed

ci/job.test.yml

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ parameters:
22
platforms:
33
- name: Linux
44
vmImage: ubuntu-16.04
5-
activate: source activate
5+
activate: source activate base
66
- name: MacOSX
77
vmImage: macos-10.14
88
activate: source activate
@@ -25,7 +25,7 @@ parameters:
2525
js_cov_packages:
2626
- jupyterlab-go-to-definition
2727
- jupyterlab-lsp
28-
env_update: conda env update -n jupyterlab-lsp --file env-test.yml --quiet
28+
env_update: conda env update -n base --file env-test.yml --quiet
2929
lab_link: jupyter labextension link --debug --no-build $(LINKED_EXTENSIONS)
3030
lab_ext: jupyter labextension install --debug --no-build $(FIRST_PARTY_LABEXTENSIONS)
3131
lab_build: jupyter lab build --debug --dev-build=False --minimize=True
@@ -40,32 +40,33 @@ jobs:
4040
- template: steps.conda.yml
4141
parameters:
4242
name: ${{ platform.name }}
43+
packages: "'python${{ python.spec }}'"
4344

4445
- script: ${{ platform.activate }} && cd ci && python env_template.py "${{ python.spec }}" "${{ python.lab }}" "${{ python.nodejs }}"
4546
displayName: generate env with python, lab, and nodejs version
4647

4748
- script: ${{ parameters.env_update }} || ${{ parameters.env_update }} || ${{ parameters.env_update }}
4849
displayName: update conda environment with test dependencies
4950

50-
- script: conda info && conda list -n jupyterlab-lsp
51+
- script: conda info && conda list -n ${{ parameters.env_name }}
5152
displayName: list conda packages and info
5253

53-
- script: ${{ platform.activate }} jupyterlab-lsp && jlpm || jlpm || jlpm
54+
- script: ${{ platform.activate }} && jlpm || jlpm || jlpm
5455
displayName: install npm dependencies
5556

56-
- script: ${{ platform.activate }} jupyterlab-lsp && jlpm build
57+
- script: ${{ platform.activate }} && jlpm build
5758
displayName: build typescript
5859

59-
- script: ${{ platform.activate }} jupyterlab-lsp && python setup.py sdist bdist_wheel
60+
- script: ${{ platform.activate }} && python setup.py sdist bdist_wheel
6061
displayName: build python distributions
6162

62-
- script: ${{ platform.activate }} jupyterlab-lsp && jlpm lerna run bundle
63+
- script: ${{ platform.activate }} && jlpm lerna run bundle
6364
displayName: build npm bundles
6465

65-
- script: ${{ platform.activate }} jupyterlab-lsp && cd dist && python -m pip install jupyter_lsp-$(PY_JLSP_VERSION)-py3-none-any.whl --no-deps
66+
- script: ${{ platform.activate }} && cd dist && python -m pip install jupyter_lsp-$(PY_JLSP_VERSION)-py3-none-any.whl --no-deps
6667
displayName: install python wheel
6768

68-
- script: ${{ platform.activate }} jupyterlab-lsp && jlpm test
69+
- script: ${{ platform.activate }} && jlpm test
6970
displayName: run frontend unit tests
7071

7172
- task: PublishTestResults@2
@@ -84,28 +85,28 @@ jobs:
8485
summaryFileLocation: 'packages/${{ js_package }}/coverage/cobertura-coverage.xml'
8586
condition: always()
8687

87-
- script: ${{ platform.activate }} jupyterlab-lsp && jupyter serverextension list
88+
- script: ${{ platform.activate }} && jupyter serverextension list
8889
displayName: list server extensions
8990

90-
- script: ${{ platform.activate }} jupyterlab-lsp && python scripts/utest.py --test-run-title="Pytest ${{ platform.name }}${{ python.name }}"
91+
- script: ${{ platform.activate }} && python scripts/utest.py --test-run-title="Pytest ${{ platform.name }}${{ python.name }}"
9192
displayName: run python tests
9293

93-
- script: ${{ platform.activate }} jupyterlab-lsp && ${{ parameters.lab_link }} || ${{ parameters.lab_link }} || ${{ parameters.lab_link }}
94+
- script: ${{ platform.activate }} && ${{ parameters.lab_link }} || ${{ parameters.lab_link }} || ${{ parameters.lab_link }}
9495
displayName: install support packages
9596

96-
- script: ${{ platform.activate }} jupyterlab-lsp && ${{ parameters.lab_ext }} || ${{ parameters.lab_ext }} || ${{ parameters.lab_ext }}
97+
- script: ${{ platform.activate }} && ${{ parameters.lab_ext }} || ${{ parameters.lab_ext }} || ${{ parameters.lab_ext }}
9798
displayName: install labextensions
9899

99-
- script: ${{ platform.activate }} jupyterlab-lsp && jupyter labextension list
100+
- script: ${{ platform.activate }} && jupyter labextension list
100101
displayName: list labextensions before build
101102

102-
- script: ${{ platform.activate }} jupyterlab-lsp && ${{ parameters.lab_build }} || ${{ parameters.lab_build }} || ${{ parameters.lab_build }}
103+
- script: ${{ platform.activate }} && ${{ parameters.lab_build }} || ${{ parameters.lab_build }} || ${{ parameters.lab_build }}
103104
displayName: build lab
104105

105-
- script: ${{ platform.activate }} jupyterlab-lsp && jupyter labextension list
106+
- script: ${{ platform.activate }} && jupyter labextension list
106107
displayName: list labextensions after build
107108

108-
- script: ${{ platform.activate }} jupyterlab-lsp && python scripts/atest.py
109+
- script: ${{ platform.activate }} && python scripts/atest.py
109110
displayName: run browser tests
110111

111112
- task: PublishTestResults@2

0 commit comments

Comments
 (0)