Skip to content

Lab 4 conversion prototype 1 #218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 4 commits into
base: maintenance/lab4
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion mamba_gator/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import os.path as osp

# flake8: noqa
from ._version import version_info, __version__
from ._version import __version__
from .handlers import _load_jupyter_server_extension
from .navigator.main import MambaNavigator

Expand Down
2 changes: 0 additions & 2 deletions mamba_gator/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,3 @@
# - modify
# - track in version control e.g. be sure to add to .gitignore
__version__ = VERSION = '5.2.1'

version_info = tuple(__version__.split('.'))
9 changes: 4 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,15 @@
},
"devDependencies": {
"@jupyterlab/builder": "^4.0.0",
"@types/json-schema": "^7.0.11",
"@types/react": "^18.0.26",
"@types/react": "^18.2.0",
"@types/react-addons-linked-state-mixin": "^0.14.22",
"@typescript-eslint/eslint-plugin": "^6.1.0",
"@typescript-eslint/parser": "^6.1.0",
"css-loader": "^6.7.1",
"eslint": "^8.36.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-react": "^7.18.3",
"eslint-config-prettier": "~8.7.0",
"eslint-plugin-prettier": "~4.2.1",
"eslint-plugin-react": "~7.32.2",
"husky": "^8.0.3",
"lerna": "^7.4.2",
"lint-staged": "^9.4.3",
Expand Down
7 changes: 4 additions & 3 deletions packages/common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,17 @@
"@babel/core": "^7.0.0",
"@babel/preset-env": "^7.0.0",
"@jupyterlab/testutils": "^4.0.0",
"@types/jest": "^29.0.0",
"@types/jest": "^29.2.0",
"@types/node": "^20.11.27",
"@types/react": "^18.2.0",
"@types/react-d3-graph": "^2.6.7",
"@types/react-virtualized-auto-sizer": "^1.0.0",
"@types/react-window": "^1.8.2",
"@types/semver": "^7.3.1",
"jest": "^29.0.0",
"jest": "^29.2.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"ts-jest": "^29.0.0"
"ts-jest": "^29.1.0"
},
"peerDependencies": {
"react": "^18.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/labextension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"@jupyterlab/settingregistry": "^4.0.0",
"@lumino/coreutils": "^2.0.0",
"@lumino/widgets": "^2.0.0",
"@mamba-org/gator-common": "^3.0.2",
"@mamba-org/gator-common": "^3.1.0",
"semver": "^6.0.0||^7.0.0"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/navigator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"build": "tsc && webpack --mode=production",
"build:dev": "tsc && webpack",
"build:prod": "yarn run build",
"clean": "rimraf lib tsconfig.tsbuildinfo ../../mamba_gator/navigator/static/*.* ../../mamba_gator/nbextension/static/*.*",
"clean": "rimraf lib tsconfig.tsbuildinfo ../../mamba_gator/navigator/static/*.* ../../mamba_gator/labextension/static/*.*",
"prepublishOnly": "yarn run build",
"watch:ts": "tsc -w --listEmittedFiles",
"watch:webpack": "webpack --watch",
Expand All @@ -32,7 +32,7 @@
"@jupyterlab/theme-light-extension": "^4.0.0",
"@jupyterlab/ui-components": "^4.0.0",
"@lumino/widgets": "^2.0.0",
"@mamba-org/gator-common": "^3.0.2",
"@mamba-org/gator-common": "^3.1.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"whatwg-fetch": "^3.0.0"
Expand Down
5 changes: 3 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ classifiers = [
dependencies = [
# "conda>=4.5", # Required conda not available through PyPi anymore
"jupyter_client",
"jupyter_server>=2.0.1,<3",
"jupyterlab_server",
"jupyter_server>=2.4.0,<3",
"jupyterlab_server>=2.27.1,<3",
"packaging",
"tornado",
"traitlets",
Expand Down Expand Up @@ -60,6 +60,7 @@ exclude = [".github", "binder"]

[tool.hatch.build.targets.wheel.shared-data]
"mamba_gator/labextension" = "share/jupyter/labextensions/gator"
"mamba_gator/labextension/schemas/@mamba-org/gator-lab/plugin.json" = "share/jupyter/lab/schemas/@mamba-org/gator-lab/plugin.json"
"install.json" = "share/jupyter/labextensions/gator/install.json"
"jupyter-config/server-config" = "etc/jupyter/jupyter_server_config.d"

Expand Down
Loading