Skip to content

Commit

Permalink
Install jupyterlab during normal builds
Browse files Browse the repository at this point in the history
In elyra-ai#2709 I removed jupyterlab from the build_requires.txt so that
the local versaion of jupyterlab could be used if installed. This
has caused frustration in users, so I've added the dependency back
and update the make dev-install target to not use the dependency
file at all, instead using a new make target to install the
required dependency.
  • Loading branch information
ajbozarth committed Jun 22, 2022
1 parent 66e4009 commit b6cd2bd
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ jobs:
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
- name: Build
run: |
pip install "jupyterlab>=3.4.0"
make build-dependencies
make yarn-install
make build-ui
Expand Down Expand Up @@ -152,7 +151,6 @@ jobs:
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
- name: Build
run: |
pip install "jupyterlab>=3.4.0"
make build-dependencies
make yarn-install
make build-ui
Expand Down
9 changes: 7 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
.PHONY: help purge uninstall-src uninstall clean
.PHONY: lint-dependencies lint-server black-format prettier-check-ui eslint-check-ui prettier-ui eslint-ui lint-ui lint
.PHONY: dev-link dev-unlink
.PHONY: build-dependencies yarn-install build-ui package-ui package-ui-dev build-server install-server-package install-server
.PHONY: build-dependencies dev-dependencies yarn-install build-ui package-ui package-ui-dev
.PHONY: build-server install-server-package install-server
.PHONY: install install-all install-dev install-examples install-gitlab-dependency check-install watch release
.PHONY: test-dependencies pytest test-server test-ui-unit test-integration test-integration-debug test-ui test
.PHONY: docs-dependencies docs
Expand Down Expand Up @@ -151,6 +152,10 @@ build-dependencies:
@$(PYTHON_PIP) install -q --upgrade pip
@$(PYTHON_PIP) install -q -r build_requirements.txt

dev-dependencies:
@$(PYTHON_PIP) install -q --upgrade pip
@$(PYTHON_PIP) install -q jupyter-packaging

yarn-install:
yarn install

Expand All @@ -159,7 +164,7 @@ build-ui: # Build packages

package-ui: build-dependencies yarn-install lint-ui build-ui

package-ui-dev: build-dependencies yarn-install dev-link lint-ui build-ui
package-ui-dev: dev-dependencies yarn-install dev-link lint-ui build-ui

build-server: # Build backend
$(PYTHON) -m setup bdist_wheel sdist
Expand Down
1 change: 1 addition & 0 deletions build_requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
jupyterlab>=3.4.0
jupyter-packaging>=0.10

0 comments on commit b6cd2bd

Please sign in to comment.