Normalize package layout with nbcelltests

jpmorganchase · Jun 4, 2024 · 5cb371f · 5cb371f
1 parent 5da519a
commit 5cb371f
Show file tree

Hide file tree

Showing 22 changed files with 3,769 additions and 3,428 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -50,7 +50,7 @@ jobs:
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'yarn'
-        cache-dependency-path: yarn.lock
+        cache-dependency-path: js/yarn.lock
 
     - name: Install yarn
       run: npm install -g yarn

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,4 @@
+{
+  "typescript.tsdk": "./js/node_modules/typescript/lib",
+  "eslint.workingDirectories": ["./js"]
+}
diff --git a/.vscode/settings.json.template b/.vscode/settings.json.template
diff --git a/Makefile b/Makefile
@@ -1,5 +1,4 @@
 DOCKER_COMPOSE := podman-compose
-YARN := jlpm
 
 ###############
 # Build Tools #
@@ -52,7 +51,7 @@ testpy: ## Clean and Make unit tests
 	python -m pytest -v jupyterfs/tests --junitxml=junit.xml --cov=jupyterfs --cov-report=xml:.coverage.xml --cov-branch --cov-fail-under=20 --cov-report term-missing
 
 testjs: ## Clean and Make js tests
-	cd js; ${YARN} test
+	cd js; jlpm test
 
 test: tests
 tests: testpy testjs ## run the tests
@@ -67,15 +66,15 @@ lintpy:  ## Lint Python with Ruff
 	python -m ruff format --check jupyterfs setup.py
 
 lintjs:  ## Lint Javascript with ESlint
-	cd js; ${YARN} lint
+	cd js; jlpm lint
 
 lint: lintpy lintjs  ## run linter
 
 fixpy:  ## Autoformat Python with Ruff
 	python -m ruff format jupyterfs/ setup.py
 
 fixjs:  ## Autoformat JavaScript with ESlint
-	cd js; ${YARN} fix
+	cd js; jlpm fix
 
 fix: fixpy fixjs  ## run black/tslint fix
 format: fix
@@ -122,7 +121,7 @@ clean: ## clean the repository
 	find . -name ".ipynb_checkpoints" | xargs  rm -rf
 	rm -rf .coverage coverage *.xml build dist *.egg-info lib node_modules .pytest_cache *.egg-info
 	rm -rf jupyterfs/labextension jupyterfs/nbextension/static/index*
-	cd js && ${YARN} clean
+	cd js && jlpm clean
 	git clean -fd
 
 ###########

diff --git a/js/.eslintrc.js b/js/.eslintrc.js
@@ -1,3 +1,11 @@
+/******************************************************************************
+ *
+ * Copyright (c) 2019, the jupyter-fs authors.
+ *
+ * This file is part of the jupyter-fs library, distributed under the terms of
+ * the Apache License 2.0.  The full license can be found in the LICENSE file.
+ *
+ */
 module.exports = {
   ignorePatterns: ["lib/**", "node_modules/**", "filetree.ts", "utils.ts"],
   env: {

diff --git a/.yarnrc.yml → js/.yarnrc.yml b/.yarnrc.yml → js/.yarnrc.yml
diff --git a/js/babel.config.js b/js/babel.config.js
@@ -1,3 +1,11 @@
+/******************************************************************************
+ *
+ * Copyright (c) 2019, the jupyter-fs authors.
+ *
+ * This file is part of the jupyter-fs library, distributed under the terms of
+ * the Apache License 2.0.  The full license can be found in the LICENSE file.
+ *
+ */
 module.exports = {
   presets: [
     [

diff --git a/js/jest.config.js b/js/jest.config.js
@@ -1,3 +1,11 @@
+/******************************************************************************
+ *
+ * Copyright (c) 2019, the jupyter-fs authors.
+ *
+ * This file is part of the jupyter-fs library, distributed under the terms of
+ * the Apache License 2.0.  The full license can be found in the LICENSE file.
+ *
+ */
 const esModules = ["@jupyter", "@jupyterlab", "@jupyter-widgets", "@lumino", "lib0", "nanoid", "y-protocols", "internmap", "delaunator", "robust-predicates", "lodash-es", "tree-finder"].join("|");
 
 module.exports = {

diff --git a/js/package.json b/js/package.json
@@ -18,18 +18,17 @@
     "build:prod": "jlpm build:lib && jlpm build:labextension:prod",
     "build:labextension:prod": "jupyter labextension build --source-map=True .",
     "build:lib": "tsc -b",
-    "clean": "rimraf *junit.xml .jupyter coverage* dist lib tsconfig.tsbuildinfo",
+    "clean": "rimraf dist lib tsconfig.tsbuildinfo",
     "clean:labextension": "rimraf ../jupyterfs/labextension",
     "clean:slate": "jlpm clean && jlpm clean:labextension && rimraf node_modules",
-    "deduplicate": "jlpm yarn-deduplicate -s fewer ../yarn.lock || jlpm yarn-deduplicate -s fewer",
+    "deduplicate": "jlpm yarn-deduplicate -s fewer yarn.lock || jlpm yarn-deduplicate -s fewer",
     "fix": "jlpm lint --fix",
     "integrity": "jlpm install && jlpm deduplicate && jlpm install",
     "lint": "eslint -c .eslintrc.js --ext .js,.ts,.tsx src/ tests/",
     "postpack": "shx rm README.md",
     "prepack": "shx cp ../README.md .",
     "prepublishOnly": "jlpm clean && jlpm clean:labextension && jlpm integrity && jlpm build:prod",
     "test": "jest --coverage",
-    "test:browser": "../ci/browser_check.sh",
     "watch": "run-p watch:lib watch:labextension",
     "watch:lib": "tsc -b -w",
     "watch:labextension": "jupyter labextension watch ."

diff --git a/js/style/index.js b/js/style/index.js
@@ -1 +1,9 @@
+/******************************************************************************
+ *
+ * Copyright (c) 2019, the jupyter-fs authors.
+ *
+ * This file is part of the jupyter-fs library, distributed under the terms of
+ * the Apache License 2.0.  The full license can be found in the LICENSE file.
+ *
+ */
 import './index.css';
diff --git a/js/tests/activate.test.ts b/js/tests/activate.test.ts
@@ -1,3 +1,11 @@
+/******************************************************************************
+ *
+ * Copyright (c) 2019, the jupyter-fs authors.
+ *
+ * This file is part of the jupyter-fs library, distributed under the terms of
+ * the Apache License 2.0.  The full license can be found in the LICENSE file.
+ *
+ */
 import "isomorphic-fetch";
 
 import { browser, progressStatus } from "../src/index";

diff --git a/js/tests/assetsTransformer.js b/js/tests/assetsTransformer.js
@@ -1,3 +1,11 @@
+/******************************************************************************
+ *
+ * Copyright (c) 2019, the jupyter-fs authors.
+ *
+ * This file is part of the jupyter-fs library, distributed under the terms of
+ * the Apache License 2.0.  The full license can be found in the LICENSE file.
+ *
+ */
 const path = require("path");
 
 module.exports = {

diff --git a/js/tests/export.test.ts b/js/tests/export.test.ts
@@ -1,3 +1,11 @@
+/******************************************************************************
+ *
+ * Copyright (c) 2019, the jupyter-fs authors.
+ *
+ * This file is part of the jupyter-fs library, distributed under the terms of
+ * the Apache License 2.0.  The full license can be found in the LICENSE file.
+ *
+ */
 import "isomorphic-fetch";
 
 import * as extension from "../src/index";

diff --git a/js/tests/fileMock.js b/js/tests/fileMock.js
@@ -1 +1,9 @@
+/******************************************************************************
+ *
+ * Copyright (c) 2019, the jupyter-fs authors.
+ *
+ * This file is part of the jupyter-fs library, distributed under the terms of
+ * the Apache License 2.0.  The full license can be found in the LICENSE file.
+ *
+ */
 module.exports = "test-file-stub";
diff --git a/js/tests/jest-setup.js b/js/tests/jest-setup.js
@@ -1,3 +1,11 @@
+/******************************************************************************
+ *
+ * Copyright (c) 2019, the jupyter-fs authors.
+ *
+ * This file is part of the jupyter-fs library, distributed under the terms of
+ * the Apache License 2.0.  The full license can be found in the LICENSE file.
+ *
+ */
 /* eslint-disable no-undef */
 //global.fetch = require("jest-fetch-mock");
 const version = process.version.match(/^v((\d+)\.(\d+))/).slice(2, 4).map(v => parseInt(v));

diff --git a/js/tests/settings.test.ts b/js/tests/settings.test.ts
@@ -1,3 +1,11 @@
+/******************************************************************************
+ *
+ * Copyright (c) 2019, the jupyter-fs authors.
+ *
+ * This file is part of the jupyter-fs library, distributed under the terms of
+ * the Apache License 2.0.  The full license can be found in the LICENSE file.
+ *
+ */
 import "isomorphic-fetch";
 
 import { unpartialResource } from "../src/settings";

diff --git a/js/tests/setup.js b/js/tests/setup.js
@@ -1,3 +1,11 @@
+/******************************************************************************
+ *
+ * Copyright (c) 2019, the jupyter-fs authors.
+ *
+ * This file is part of the jupyter-fs library, distributed under the terms of
+ * the Apache License 2.0.  The full license can be found in the LICENSE file.
+ *
+ */
 Object.defineProperty(window, "DragEvent", {
   value: class DragEvent {},
 });
diff --git a/js/tests/snippets.test.ts b/js/tests/snippets.test.ts
@@ -1,3 +1,11 @@
+/******************************************************************************
+ *
+ * Copyright (c) 2019, the jupyter-fs authors.
+ *
+ * This file is part of the jupyter-fs library, distributed under the terms of
+ * the Apache License 2.0.  The full license can be found in the LICENSE file.
+ *
+ */
 import "isomorphic-fetch";
 
 import {

diff --git a/js/tests/styleMock.js b/js/tests/styleMock.js
@@ -1 +1,9 @@
+/******************************************************************************
+ *
+ * Copyright (c) 2019, the jupyter-fs authors.
+ *
+ * This file is part of the jupyter-fs library, distributed under the terms of
+ * the Apache License 2.0.  The full license can be found in the LICENSE file.
+ *
+ */
 module.exports = {};