From 1e8edcff4649fef092f954b4034586048e656ea5aa76c364cbf6e4fa08ff3c8e Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Sun, 20 Jul 2025 16:24:55 +0000 Subject: [PATCH] - Update node build preparation and fix jupyter extension package version OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-bqplot?expand=0&rev=46 --- create_node_modules.sh | 5 +- node_modules.tar.xz | 4 +- package.json | 112 ----------------------------------------- python-bqplot.changes | 6 +++ python-bqplot.spec | 9 ++-- 5 files changed, 15 insertions(+), 121 deletions(-) delete mode 100644 package.json diff --git a/create_node_modules.sh b/create_node_modules.sh index 2e9fe10..e0d4569 100644 --- a/create_node_modules.sh +++ b/create_node_modules.sh @@ -3,6 +3,9 @@ # Script to create node_modules.tar.xz # needs bower, webpack and webpack-cli installed +pushd js +sed -i '/builder/ s/\^3/\^4/' package.json jlpm install jlpm run build -tar cJf node_modules.tar.xz node_modules +popd +tar cJf node_modules.tar.xz js/node_modules diff --git a/node_modules.tar.xz b/node_modules.tar.xz index 442625f..55ec682 100644 --- a/node_modules.tar.xz +++ b/node_modules.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ac2b05f55e4df4a91651ba2a5f3cac889743ba803df90fdac2f75c8b54e77318 -size 31979380 +oid sha256:e5f77e199dd5799ed55bb83c7355fefd48e9cc2ea4990a9758f523a083b1d11c +size 30182476 diff --git a/package.json b/package.json deleted file mode 100644 index c81abc6..0000000 --- a/package.json +++ /dev/null @@ -1,112 +0,0 @@ -{ - "name": "bqplot", - "version": "0.5.46", - "description": "bqplot", - "keywords": [ - "jupyter", - "jupyterlab", - "jupyterlab notebook", - "jupyterlab-extension" - ], - "author": { - "name": "BQPlot Development team", - "email": "bqplot@bloomberg.net" - }, - "license": "Apache-2.0", - "main": "lib/index.js", - "repository": { - "type": "git", - "url": "https://github.com/bloomberg/bqplot.git" - }, - "scripts": { - "build": "jlpm run build:css && jlpm run build:js && jlpm run build:labextension && webpack --mode=production", - "build:css": "lessc less/bqplot.less css/bqplot.css", - "build:js": "tsc", - "build:labextension": "jupyter labextension build .", - "watch": "npm-run-all -p watch:*", - "watch:js": "tsc --watch", - "watch:nbextension": "webpack --watch --mode=development", - "watch:labextension": "jupyter labextension watch .", - "prepare": "jlpm run build", - "test": "karma start --single-run", - "prettify": "yarn prettier --write .", - "lint": "eslint . --ext .ts --fix" - }, - "devDependencies": { - "@jupyter-widgets/base-manager": "^1.0.0", - "@jupyter-widgets/controls": "^5", - "@jupyterlab/builder": "^4.0.0", - "@types/chai": "^4.1.7", - "@types/d3": "^5.7.2", - "@types/expect.js": "^0.3.29", - "@types/mocha": "^7.0.2", - "@types/node": "^13.13.2", - "@types/sinon": "^9.0.0", - "chai": "^4.1.2", - "css-loader": "^5.0.0", - "eslint": "^7.22.0", - "eslint-config-prettier": "^8.1.0", - "eslint-config-standard": "^16.0.2", - "eslint-plugin-import": "^2.22.1", - "eslint-plugin-node": "^11.1.0", - "eslint-plugin-prettier": "^3.3.1", - "eslint-plugin-promise": "^4.2.1", - "karma": "^6.3.14", - "karma-chai": "^0.1.0", - "karma-chrome-launcher": "^3.1.0", - "karma-mocha": "^2.0.0", - "karma-mocha-reporter": "^2.2.5", - "karma-sinon": "^1.0.5", - "karma-sourcemap-loader": "^0.3.7", - "karma-typescript": "^5.0.2", - "karma-typescript-es6-transform": "^5.0.2", - "karma-webpack": "^5.0.0", - "less": "^3.8.1", - "less-loader": "^5.0.0", - "mocha": "^7.1.1", - "npm-run-all": "^4.1.3", - "prettier": "^2.2.1", - "raw-loader": "~4.0.1", - "rimraf": "^3.0.2", - "sinon": "^9.0.2", - "sinon-chai": "^3.3.0", - "style-loader": "^1.2.0", - "typescript": "~4.2.0", - "webpack": "^5", - "webpack-cli": "^3.3.12" - }, - "dependencies": { - "@jupyter-widgets/base": "^2 || ^3 || ^4 || ^5 || ^6", - "@lumino/messaging": "^1", - "@lumino/widgets": "^1", - "d3": "^5.7.0", - "d3-selection": "^1", - "is-typedarray": "^1.0.0", - "popper.js": "^1.0.0", - "three": "^0.91.0", - "topojson": "^1.6.24", - "underscore": "^1.8.3" - }, - "resolutions": { - "@jupyterlab/services": "6.4.5", - "@jupyter-widgets/base": "6.0.0", - "@types/lodash": "4.14.184" - }, - "jupyterlab": { - "extension": "lib/jupyterlab-plugin", - "webpackConfig": "webpack.lab.config.js", - "outputDir": "../share/jupyter/labextensions/bqplot", - "sharedPackages": { - "@jupyter-widgets/base": { - "bundled": false, - "singleton": true - } - } - }, - "files": [ - "dist/", - "css/", - "lib/", - "shaders/" - ] -} diff --git a/python-bqplot.changes b/python-bqplot.changes index 07a5fcd..eb80a18 100644 --- a/python-bqplot.changes +++ b/python-bqplot.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Jul 20 16:19:08 UTC 2025 - Ben Greiner + +- Update node build preparation and fix jupyter extension package + version + ------------------------------------------------------------------- Thu Jun 26 12:04:55 UTC 2025 - Daniel Garcia diff --git a/python-bqplot.spec b/python-bqplot.spec index 42f95da..ff07402 100644 --- a/python-bqplot.spec +++ b/python-bqplot.spec @@ -20,7 +20,7 @@ %define skip_python312 1 %define skip_python313 1 %define pyver 0.12.45 -%define jupver 0.5.44 +%define jupver 0.5.46 Name: python-bqplot Version: %{pyver} Release: 0 @@ -31,8 +31,6 @@ Source0: https://github.com/bqplot/bqplot/archive/refs/tags/%{pyver}.tar. Source1: node_modules.tar.xz # Script to vendor node_modules sources Source2: create_node_modules.sh -# Copied from bqplot/js and force some "resolutions" to fix js conflicts -Source3: package.json BuildRequires: %{python_module jupyter-packaging} BuildRequires: %{python_module jupyterlab} BuildRequires: %{python_module pip} @@ -97,9 +95,8 @@ This package provides the jupyterlab extension. %prep %autosetup -p1 -n bqplot-%{pyver} -a1 -pushd js -mv ../node_modules . -popd +# sync with create_node_modules.sh +sed -i '/builder/ s/\^3/\^4/' js/package.json rm bqplot/install.py %build