Skip to content
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

Fix compilation #28

Merged
merged 6 commits into from
Jan 19, 2024
Merged
Show file tree
Hide file tree
Changes from 3 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
4 changes: 2 additions & 2 deletions .bumpversion.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ tag = True
tag_name = v{new_version}
message = v{new_version}

[bumpversion:file:sparkmonitor/_version.py]

[bumpversion:file:package.json]
search = "version": "{current_version}"
replace = "version": "{new_version}"
31 changes: 0 additions & 31 deletions .eslintrc.js

This file was deleted.

131 changes: 118 additions & 13 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,21 +1,126 @@
.vscode/settings.json
*.pyc
*.bundle.*
lib/
node_modules/
*.log
**/.ipynb_checkpoints/
.eslintcache
.stylelintcache
*.egg-info/
.ipynb_checkpoints
*.tsbuildinfo
sparkmonitor/labextension
sparkmonitor/nbextension
scalalistener/project/
scalalistener/target/
sparkmonitor/*.jar
*.egg-info/
dist/
# Version file is handled by hatchling
sparkmonitor/_version.py

# Created by https://www.gitignore.io/api/python
# Edit at https://www.gitignore.io/?templates=python

### Python ###
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
build/
node_modules/
sparkmonitor/static/
docs/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
venv
.tox
.metals
*.tsbuildinfo
scalalistener/.bsp
.yarn
lib64/
parts/
sdist/
var/
wheels/
pip-wheel-metadata/
share/python-wheels/
.installed.cfg
*.egg
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage/
coverage.xml
*.cover
.hypothesis/
.pytest_cache/

# Translations
*.mo
*.pot

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
target/

# pyenv
.python-version

# celery beat schedule file
celerybeat-schedule

# SageMath parsed files
*.sage.py

# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# Mr Developer
.mr.developer.cfg
.project
.pydevproject

# mkdocs documentation
/site

# mypy
.mypy_cache/
.dmypy.json
dmypy.json

# Pyre type checker
.pyre/

# End of https://www.gitignore.io/api/python

# OSX files
.DS_Store

# Yarn cache
.yarn/
3 changes: 1 addition & 2 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
enableImmutableInstalls: false
nodeLinker: node-modules
nodeLinker: node-modules
6 changes: 3 additions & 3 deletions install.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"packageManager": "python",
"packageName": "sparkmonitor",
"uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package sparkmonitor"
"packageManager": "python",
"packageName": "sparkmonitor",
"uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package sparkmonitor"
}
153 changes: 131 additions & 22 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,33 +30,48 @@
},
"homepage": "https://github.com/swan-cern/sparkmonitor#readme",
"scripts": {
"build:prod": "jlpm run build:lib && jlpm run build:labextension && jlpm run build:nbextension && jlpm run build:scalalistener",
"build": "jlpm run build:lib && jlpm run build:labextension",
"build:lib": "tsc -p tsconfig.lab.json",
"build": "jlpm run build:lib && jlpm run build:labextension:dev",
"build:prod": "jlpm clean && jlpm run build:lib:prod && jlpm run build:labextension && jlpm run build:nbextension && jlpm run build:scalalistener",
"build:labextension": "jupyter labextension build .",
"build:labextension:dev": "jupyter labextension build --development True .",
"build:lib": "tsc -p tsconfig.lab.json --sourceMap",
"build:lib:prod": "tsc -p tsconfig.lab.json",
"build:nbextension": "webpack --config src/notebook-extension/webpack.config.js",
"build:scalalistener": "cd scalalistener && sbt +assembly",
"clean": "rimraf lib jupyterlab_sparkmonior:labextension",
"clean:all": "jlpm run clean:lib && jlpm run clean:labextension",
"clean": "jlpm clean:lib",
"clean:lib": "rimraf lib tsconfig.tsbuildinfo",
"clean:lintcache": "rimraf .eslintcache .stylelintcache",
"clean:labextension": "rimraf sparkmonitor/labextension sparkmonitor/_version.py",
"clean:nbextension": "rimraf sparkmonitor/nbextension",
"clean:scalalistener": "rimraf sparkmonitor/*.jar",
"clean:all": "jlpm clean:lib && jlpm clean:labextension && jlpm clean:nbextension && jlpm clean:scalalistener && jlpm clean:lintcache",
"eslint": "jlpm eslint:check --fix",
"eslint:check": "eslint . --cache --ext .ts,.tsx",
"install:extension": "jlpm build",
"lint": "jlpm stylelint && jlpm prettier && jlpm eslint",
"lint:check": "jlpm stylelint:check && jlpm prettier:check && jlpm eslint:check",
"prettier": "jlpm prettier:base --write --list-different",
"prettier:base": "prettier \"**/*{.ts,.tsx,.js,.jsx,.css,.json,.md}\"",
"prettier:check": "jlpm prettier:base --check",
"stylelint": "jlpm stylelint:check --fix",
"stylelint:check": "stylelint --cache \"style/**/*.css\"",
"watch": "run-p watch:src watch:labextension",
"watch:src": "tsc -w -p tsconfig.lab.json",
"watch:src": "tsc -w -p tsconfig.lab.json --sourceMap",
"watch:labextension": "jupyter labextension watch .",
"build:nbextension": "webpack --config src/notebook-extension/webpack.config.js",
"watch:nbextension": "webpack --config src/notebook-extension/webpack.config.js --mode development --watch",
"check:all": "jlpm run check:eslint && jlpm run check:nbextension && jlpm run check:labextension",
"check:eslint": "eslint .",
"check:nbextension": "tsc -p tsconfig.notebook.json",
"check:labextension": "tsc -p tsconfig.lab.json --noEmit"
"check:all": "jlpm run lint:check && jlpm run check:nbextension && jlpm run check:labextension",
"check:labextension": "tsc -p tsconfig.lab.json --noEmit",
"check:nbextension": "tsc -p tsconfig.notebook.json"
},
"dependencies": {
"@jupyterlab/application": "^4.0.9",
"@jupyterlab/apputils": "^4.1.9",
"@jupyterlab/cells": "^4.0.9",
"@jupyterlab/mainmenu": "^4.0.9",
"@jupyterlab/notebook": "^4.0.9",
"@jupyterlab/services": "^7.0.9",
"@lumino/coreutils": "^2.1.2",
"@lumino/widgets": "^2.3.1",
"@jupyterlab/application": "^4.0.10",
"@jupyterlab/apputils": "^4.1.10",
"@jupyterlab/cells": "^4.0.10",
"@jupyterlab/mainmenu": "^4.0.10",
"@jupyterlab/notebook": "^4.0.10",
"@jupyterlab/services": "^7.0.10",
"@lumino/coreutils": "^2.0.0",
"@lumino/widgets": "^2.0.1",
"hammerjs": "^2.0.8",
"keycharm": "^0.4.0",
"mobx": "^6.12.0",
Expand Down Expand Up @@ -84,6 +99,7 @@
"@types/plotly.js-basic-dist": "^1.54.4",
"@types/react": "^18.0.26",
"@types/react-addons-linked-state-mixin": "^0.14.22",
"@types/react-dom": "^18.2.18",
"@types/react-plotly.js": "^2.6.3",
"@types/react-timeago": "^4.1.6",
"@typescript-eslint/eslint-plugin": "^6.1.0",
Expand All @@ -107,7 +123,7 @@
"stylelint-prettier": "^4.0.0",
"typescript": "~5.0.2",
"webpack": "^5.89.0",
"yjs": "^13.5.0"
"yjs": "^13.5.40"
},
"jupyterlab": {
"extension": "lib/lab-extension/index",
Expand All @@ -116,6 +132,99 @@
"style": "style/lab.css",
"files": [
"lib/*",
"src/*"
]
"src/*",
"style/lab.js"
],
"eslintConfig": {
"extends": [
"eslint:recommended",
"plugin:@typescript-eslint/eslint-recommended",
"plugin:@typescript-eslint/recommended",
"plugin:prettier/recommended"
],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"project": "tsconfig.json",
"sourceType": "module"
},
"plugins": [
"@typescript-eslint"
],
"rules": {
"@typescript-eslint/naming-convention": [
"error",
{
"selector": "interface",
"format": [
"PascalCase"
],
"custom": {
"regex": "^I[A-Z]",
"match": true
}
}
],
"@typescript-eslint/no-unused-vars": [
"warn",
{
"args": "none"
}
],
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/no-namespace": "off",
"@typescript-eslint/no-use-before-define": "off",
"@typescript-eslint/quotes": [
"error",
"single",
{
"avoidEscape": true,
"allowTemplateLiterals": false
}
],
"curly": [
"error",
"all"
],
"eqeqeq": "error",
"prefer-arrow-callback": "error"
}
},
"eslintIgnore": [
"node_modules",
"dist",
"coverage",
"**/*.d.ts"
],
"prettier": {
"singleQuote": true,
"trailingComma": "none",
"arrowParens": "avoid",
"endOfLine": "auto",
"overrides": [
{
"files": "package.json",
"options": {
"tabWidth": 4
}
}
]
},
"stylelint": {
"extends": [
"stylelint-config-recommended",
"stylelint-config-standard",
"stylelint-prettier/recommended"
],
"plugins": [
"stylelint-csstree-validator"
],
"rules": {
"csstree/validator": true,
"property-no-vendor-prefix": null,
"selector-class-pattern": "^([a-z][A-z\\d]*)(-[A-z\\d]+)*$",
"selector-no-vendor-prefix": null,
"value-no-vendor-prefix": null
}
},
"styleModule": "style/lab.js"
}
Loading
Loading