Skip to content
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
github: [datalayer]
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1

- name: Install dependencies
run: python -m pip install -U jupyterlab==4.1.0b0
run: python -m pip install -U jupyterlab==4.1.0

- name: Lint the extension
run: |
Expand Down Expand Up @@ -81,7 +81,7 @@ jobs:
sudo rm -rf $(which node)
sudo rm -rf $(which node)

pip install "jupyterlab==4.1.0b0" jupyter_viewer*.whl
pip install "jupyterlab==4.1.0" jupyter_viewer*.whl


jupyter server extension list
Expand Down Expand Up @@ -114,7 +114,7 @@ jobs:
- name: Install the extension
run: |
set -eux
python -m pip install "jupyterlab==4.1.0b0" jupyter_viewer*.whl
python -m pip install "jupyterlab==4.1.0" jupyter_viewer*.whl

- name: Install dependencies
working-directory: ui-tests
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -139,3 +139,4 @@ dmypy.json
!**/.env
!.github
!.devcontainer
!.licenserc.yaml
37 changes: 37 additions & 0 deletions .licenserc.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
header:
license:
spdx-id: Datalayer
copyright-owner: Datalayer, Inc.
copyright-year: 2021-2024
content: |
Copyright (c) [year] [owner]
Distributed under the terms of the Modified BSD License.

paths-ignore:
- '**/*.ipynb'
- '**/*.json'
- '**/*.txt'
- '**/*.md'
- '**/*.svg'
- '**/*.tsbuildinfo'
- '**/*.yml'
- '**/*.yaml'
- '**/build'
- '**/lib'
- '**/node_modules'
- '**/MANIFEST.in'
- '**/static'
- '**/typings'
- '**/schemas'
- '**/themes'
- '*.map.js'
- '*.bundle.js'
- '**/.*'
- 'LICENSE'
- '.devcontainer/resources/'
- '**/LICENSE.txt'
- '**/*.nblink'
- 'docs/docs'
- 'patches/'

comment: on-failure
25 changes: 16 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,33 +15,33 @@ help: ## display this help
default: help ## default target is help

env: warning ## env
micromamba env create -y -n ${ENV_NAME} -f environment.yml
conda env create -y -n ${ENV_NAME} -f environment.yml
@exec echo "-------------------------------------------------------"
@exec echo "micromamba activate ${ENV_NAME}"
@exec echo "conda activate ${ENV_NAME}"
@exec echo "-------------------------------------------------------"

env-rm: warning ## env-rm
micromamba deactivate && \
micromamba remove -y --name ${ENV_NAME} --all || true
conda deactivate && \
conda remove -y --name ${ENV_NAME} --all || true

kill:
yarn kill
npm kill

warning:
echo "\x1b[34m\x1b[43mEnsure you have run \x1b[1;37m\x1b[41m conda deactivate \x1b[22m\x1b[34m\x1b[43m before invoking this.\x1b[0m"

clean: ## clean
yarn clean
npm clean

build: ## build
yarn build
npm run build

build-webpack: ## build-webpack
yarn build:webpack
npm run build:webpack

build-webpack-prod: ## build-webpack-prod
rm -fr ./dist
yarn build:webpack:prod
npm run build:webpack:prod

build-prod: ## build-prod
git clean -fdx
Expand Down Expand Up @@ -98,3 +98,10 @@ publish: build-webpack-prod ## publish
--paths "/*" \
--profile datalayer && \
echo open ✨ https://viewer.datalayer.tech )

clean: ## clean
npm run clean

publish-npm: clean build ## publish-npm
npm publish
echo open https://www.npmjs.com/package/@datalayer/jupyter-viewer
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ open http://localhost:8888/jupyter_viewer/github/datalayer/examples/main/pytorch
Develop the Web application.

```bash
yarn
yarn start
npm i
npm run start
```

```bash
Expand Down Expand Up @@ -74,7 +74,7 @@ pip install -e .[test]
jupyter labextension develop . --overwrite
jupyter labextension list
jupyter server extension list
yarn jupyterlab
npm jupyterlab
```

```bash
Expand Down
8 changes: 4 additions & 4 deletions docs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,19 @@ env:

clean: ## clear
($(CONDA_ACTIVATE) ${ENV_NAME}; \
yarn clear )
npm clear )

install: ## install
($(CONDA_ACTIVATE) ${ENV_NAME}; \
yarn install )
npm install )

start: ## start
($(CONDA_ACTIVATE) ${ENV_NAME}; \
yarn start )
npm start )

build: ## build
($(CONDA_ACTIVATE) ${ENV_NAME}; \
yarn build )
npm run build )

publish: build ## publish
($(CONDA_ACTIVATE) ${ENV_NAME}; \
Expand Down
6 changes: 3 additions & 3 deletions docs/docs/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ open http://localhost:8888/jupyter_viewer/github/datalayer/examples/main/pytorch
Develop the Web application.

```bash
yarn
yarn start
npm i
npm run start
```

```bash
Expand Down Expand Up @@ -73,7 +73,7 @@ pip install -e .[test]
jupyter labextension develop . --overwrite
jupyter labextension list
jupyter server extension list
yarn jupyterlab
npm jupyterlab
```

```bash
Expand Down
16 changes: 8 additions & 8 deletions docs/docusaurus.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,19 @@ module.exports = {
href: 'https://www.linkedin.com/company/datalayer',
position: 'right',
className: 'header-linkedin-link',
'aria-label': 'Linkedin',
'aria-label': 'LinkedIn',
},
{
href: 'https://x.com/DatalayerIO',
href: 'https://bsky.app/profile/datalayer.ai',
position: 'right',
className: 'header-x-link',
'aria-label': 'X',
className: 'header-bluesky-link',
'aria-label': 'Bluesky',
},
{
href: 'https://github.com/datalayer/jupyter-viewer',
position: 'right',
className: 'header-github-link',
'aria-label': 'GitHub repository',
'aria-label': 'GitHub',
},
{
href: 'https://datalayer.io',
Expand Down Expand Up @@ -73,11 +73,11 @@ module.exports = {
href: 'https://github.com/datalayer',
},
{
label: 'X',
href: 'https://x.com/datalayerio',
label: 'Bluesky',
href: 'https://assets.datalayer.tech/logos-social-grey/youtube.svg',
},
{
label: 'Linkedin',
label: 'LinkedIn',
href: 'https://www.linkedin.com/company/datalayer',
},
],
Expand Down
16 changes: 8 additions & 8 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
"write-heading-ids": "docusaurus write-heading-ids"
},
"dependencies": {
"@docusaurus/core": "2.4.0",
"@docusaurus/preset-classic": "2.4.0",
"@mdx-js/react": "^1.6.22",
"clsx": "^1.2.1",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-modal-image": "2.5.0",
"react-router-dom": "6.22.3"
"@docusaurus/core": "^3.5.2",
"@docusaurus/preset-classic": "^3.5.2",
"@mdx-js/react": "^3.0.1",
"clsx": "^2.1.1",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-modal-image": "^2.6.0",
"react-router-dom": "^6.22.3"
},
"browserslist": {
"production": [
Expand Down
10 changes: 5 additions & 5 deletions docs/src/css/custom.css
Original file line number Diff line number Diff line change
Expand Up @@ -60,21 +60,21 @@
no-repeat;
}

.header-x-link::before {
.header-bluesky-link::before {
content: '';
width: 24px;
height: 24px;
display: flex;
background: url("data:image/svg+xml,%0A%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 1200 1227' fill='rgb(149, 157, 165)'%3E%3Cpath d='M714.163 519.284 1160.89 0h-105.86L667.137 450.887 357.328 0H0l468.492 681.821L0 1226.37h105.866l409.625-476.152 327.181 476.152H1200L714.137 519.284h.026ZM569.165 687.828l-47.468-67.894-377.686-540.24h162.604l304.797 435.991 47.468 67.894 396.2 566.721H892.476L569.165 687.854v-.026Z' /%3E%3C/svg%3E%0A")
background: url("data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22UTF-8%22%20standalone%3D%22no%22%3F%3E%0A%3Csvg%0A%20%20%20width%3D%2224%22%0A%20%20%20height%3D%2224%22%0A%20%20%20viewBox%3D%220%200%202.88%202.88%22%0A%20%20%20version%3D%221.1%22%0A%20%20%20id%3D%22svg4%22%0A%20%20%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%0A%20%20%20xmlns%3Asvg%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%0A%20%20%3Cdefs%0A%20%20%20%20%20id%3D%22defs8%22%20%2F%3E%0A%20%20%3Cpath%0A%20%20%20%20%20fill%3D%22%23959da5%22%0A%20%20%20%20%20d%3D%22M%201.44%2C1.306859%20C%201.30956%2C1.053179%200.95447995%2C0.58049901%200.62423999%2C0.34745901%200.30791999%2C0.12413901%200.18732%2C0.16277901%200.10824%2C0.19865901%200.01668%2C0.23981901%200%2C0.38045901%200%2C0.46301901%20c%200%2C0.0828%200.04536%2C0.67799999%200.07488%2C0.77747999%200.0978%2C0.32832%200.44556%2C0.4392%200.76595999%2C0.4036799%200.01632%2C-0.0024%200.033%2C-0.00468%200.0498%2C-0.00672%20-0.01656%2C0.00264%20-0.03312%2C0.0048%20-0.0498%2C0.00672%20C%200.3714%2C1.7137789%20-0.0456%2C1.884779%200.50124%2C2.493539%201.1027999%2C3.1163391%201.3256399%2C2.359979%201.44%2C1.976579%201.55436%2C2.359979%201.686%2C3.0890991%202.36796%2C2.493539%202.88%2C1.976579%202.5086%2C1.713779%202.0391599%2C1.6441789%20a%201.04892%2C1.04892%200%200%201%20-0.0498%2C-0.00672%20c%200.0168%2C0.00204%200.03348%2C0.00432%200.0498%2C0.00672%20C%202.35956%2C1.6798189%202.7073199%2C1.5688189%202.80512%2C1.240499%202.8346401%2C1.141139%202.88%2C0.54569891%202.88%2C0.46313901%20c%200%2C-0.0828%20-0.01668%2C-0.22332%20-0.10824%2C-0.26472%20-0.07908%2C-0.03576%20-0.19968%2C-0.0744%20-0.516%2C0.1488%20C%201.92552%2C0.58061901%201.5704399%2C1.053299%201.44%2C1.306859%22%0A%20%20%20%20%20style%3D%22stroke-width%3A0.12%22%0A%20%20%20%20%20id%3D%22path2%22%20%2F%3E%0A%3C%2Fsvg%3E%0A")
no-repeat;
}

.header-x-link:hover {
.header-bluesky-link:hover {
opacity: 0.6;
}

[data-theme='dark'] .header-x-link::before {
background: url("data:image/svg+xml,%0A%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 1200 1227' fill='rgb(149, 157, 165)'%3E%3Cpath d='M714.163 519.284 1160.89 0h-105.86L667.137 450.887 357.328 0H0l468.492 681.821L0 1226.37h105.866l409.625-476.152 327.181 476.152H1200L714.137 519.284h.026ZM569.165 687.828l-47.468-67.894-377.686-540.24h162.604l304.797 435.991 47.468 67.894 396.2 566.721H892.476L569.165 687.854v-.026Z' /%3E%3C/svg%3E%0A")
[data-theme='dark'] .header-bluesky-link::before {
background: url("data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22UTF-8%22%20standalone%3D%22no%22%3F%3E%0A%3Csvg%0A%20%20%20width%3D%2224%22%0A%20%20%20height%3D%2224%22%0A%20%20%20viewBox%3D%220%200%202.88%202.88%22%0A%20%20%20version%3D%221.1%22%0A%20%20%20id%3D%22svg4%22%0A%20%20%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%0A%20%20%20xmlns%3Asvg%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%0A%20%20%3Cdefs%0A%20%20%20%20%20id%3D%22defs8%22%20%2F%3E%0A%20%20%3Cpath%0A%20%20%20%20%20fill%3D%22%23959da5%22%0A%20%20%20%20%20d%3D%22M%201.44%2C1.306859%20C%201.30956%2C1.053179%200.95447995%2C0.58049901%200.62423999%2C0.34745901%200.30791999%2C0.12413901%200.18732%2C0.16277901%200.10824%2C0.19865901%200.01668%2C0.23981901%200%2C0.38045901%200%2C0.46301901%20c%200%2C0.0828%200.04536%2C0.67799999%200.07488%2C0.77747999%200.0978%2C0.32832%200.44556%2C0.4392%200.76595999%2C0.4036799%200.01632%2C-0.0024%200.033%2C-0.00468%200.0498%2C-0.00672%20-0.01656%2C0.00264%20-0.03312%2C0.0048%20-0.0498%2C0.00672%20C%200.3714%2C1.7137789%20-0.0456%2C1.884779%200.50124%2C2.493539%201.1027999%2C3.1163391%201.3256399%2C2.359979%201.44%2C1.976579%201.55436%2C2.359979%201.686%2C3.0890991%202.36796%2C2.493539%202.88%2C1.976579%202.5086%2C1.713779%202.0391599%2C1.6441789%20a%201.04892%2C1.04892%200%200%201%20-0.0498%2C-0.00672%20c%200.0168%2C0.00204%200.03348%2C0.00432%200.0498%2C0.00672%20C%202.35956%2C1.6798189%202.7073199%2C1.5688189%202.80512%2C1.240499%202.8346401%2C1.141139%202.88%2C0.54569891%202.88%2C0.46313901%20c%200%2C-0.0828%20-0.01668%2C-0.22332%20-0.10824%2C-0.26472%20-0.07908%2C-0.03576%20-0.19968%2C-0.0744%20-0.516%2C0.1488%20C%201.92552%2C0.58061901%201.5704399%2C1.053299%201.44%2C1.306859%22%0A%20%20%20%20%20style%3D%22stroke-width%3A0.12%22%0A%20%20%20%20%20id%3D%22path2%22%20%2F%3E%0A%3C%2Fsvg%3E%0A")
no-repeat;
}

Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ dependencies:
- build
- hatch
- jupyter-packaging
- jupyterlab==4.1.0b0
- jupyterlab==4.1.0
4 changes: 2 additions & 2 deletions hatch_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@

def build_javascript():
check_call(
['yarn', 'install'],
['npm', 'install'],
cwd=here,
)
check_call(
['yarn', 'build:webpack', '--mode=production'],
['npm', 'run', 'build:webpack', '--', '--mode=production'],
cwd=here,
)
for file in glob.glob(r'./dist/*.js'):
Expand Down
Loading
Loading