diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4f778b72..c8fb7457 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -64,8 +64,8 @@ jobs: set -eux yarn install yarn dev - jupyter labextension list 2>&1 | grep -ie "jupytercad-core.*OK" - jupyter labextension list 2>&1 | grep -ie "jupytercad-lab.*OK" + jupyter labextension list 2>&1 | grep -ie "jupytercad_core.*OK" + jupyter labextension list 2>&1 | grep -ie "jupytercad_lab.*OK" - name: Test import shell: bash -l {0} @@ -83,9 +83,9 @@ jobs: with: name: extension-artifacts path: | - python/jupytercad-core/dist/jupytercad* - python/jupytercad-lab/dist/jupytercad* - python/jupytercad-app/dist/jupytercad* + python/jupytercad_core/dist/jupytercad* + python/jupytercad_lab/dist/jupytercad* + python/jupytercad_app/dist/jupytercad* if-no-files-found: error test_isolated: @@ -111,7 +111,7 @@ jobs: sudo rm -rf $(which node) sudo rm -rf $(which node) - cp ./jupytercad-core/dist/jupytercad*.whl ./jupytercad-lab/dist/jupytercad*.whl ./jupytercad-app/dist/jupytercad*.whl . + cp ./jupytercad_core/dist/jupytercad*.whl ./jupytercad_lab/dist/jupytercad*.whl ./jupytercad_app/dist/jupytercad*.whl . python -m pip install "jupyterlab>=4.0.0" jupytercad*.whl jupyter labextension list @@ -153,7 +153,7 @@ jobs: shell: bash -l {0} run: | set -eux - cp ./jupytercad-core/dist/jupytercad*.whl ./jupytercad-lab/dist/jupytercad*.whl ./jupytercad-app/dist/jupytercad*.whl . + cp ./jupytercad_core/dist/jupytercad*.whl ./jupytercad_lab/dist/jupytercad*.whl ./jupytercad_app/dist/jupytercad*.whl . python -m pip install jupytercad*.whl - name: Install dependencies diff --git a/.github/workflows/update_galata_references.yaml b/.github/workflows/update_galata_references.yaml index 79196575..7c5edca8 100644 --- a/.github/workflows/update_galata_references.yaml +++ b/.github/workflows/update_galata_references.yaml @@ -54,7 +54,7 @@ jobs: shell: bash -l {0} run: | whereis python - cp ./jupytercad-core/dist/jupytercad*.whl ./jupytercad-lab/dist/jupytercad*.whl ./jupytercad-app/dist/jupytercad*.whl . + cp ./jupytercad_core/dist/jupytercad*.whl ./jupytercad_lab/dist/jupytercad*.whl ./jupytercad_app/dist/jupytercad*.whl . python -m pip install jupytercad*.whl - name: Install dependencies diff --git a/examples/Notebook.ipynb b/examples/Notebook.ipynb index 953143d8..979b3ae9 100644 --- a/examples/Notebook.ipynb +++ b/examples/Notebook.ipynb @@ -23,7 +23,7 @@ "metadata": {}, "outputs": [], "source": [ - "from jupytercad import CadDocument" + "from jupytercad_lab import CadDocument" ] }, { @@ -82,7 +82,7 @@ "outputs": [], "source": [ "# Creating a gear wheel \n", - "from jupytercad import CadDocument\n", + "from jupytercad_lab import CadDocument\n", "import math\n", "\n", "doc = CadDocument()\n", @@ -131,7 +131,7 @@ "metadata": {}, "outputs": [], "source": [ - "from jupytercad import CadDocument\n", + "from jupytercad_lab import CadDocument\n", "\n", "doc = CadDocument(\"example3.FCStd\")\n", "\n", @@ -198,30 +198,14 @@ }, { "cell_type": "code", - "execution_count": 14, + "execution_count": null, "id": "245baeb7-5df6-45a3-bd75-aa4a33258fce", "metadata": {}, - "outputs": [ - { - "data": { - "application/vnd.jupyter.ywidget-view+json": { - "model_id": "d5fc57c284414950ab29413d60e1a50a", - "version_major": 2, - "version_minor": 0 - }, - "text/plain": [ - "" - ] - }, - "execution_count": 14, - "metadata": {}, - "output_type": "execute_result" - } - ], + "outputs": [], "source": [ "from OCC.Core.gp import gp_Pnt\n", "\n", - "from jupytercad import CadDocument\n", + "from jupytercad_lab import CadDocument\n", "\n", "doc = CadDocument('test.jcad')\n", "doc" @@ -229,7 +213,7 @@ }, { "cell_type": "code", - "execution_count": 15, + "execution_count": null, "id": "cf45ee1f-76ee-4973-818f-167ce82ea384", "metadata": {}, "outputs": [], @@ -240,7 +224,7 @@ }, { "cell_type": "code", - "execution_count": 17, + "execution_count": null, "id": "08764533-d8f8-494f-8a59-9dd5360ba17e", "metadata": {}, "outputs": [], @@ -250,7 +234,7 @@ }, { "cell_type": "code", - "execution_count": 18, + "execution_count": null, "id": "3afc5f3c-cc33-4c8a-8904-98726a3ae118", "metadata": {}, "outputs": [], @@ -260,7 +244,7 @@ }, { "cell_type": "code", - "execution_count": 20, + "execution_count": null, "id": "855133ee-8cd2-432b-933a-d72f1a9f6c7c", "metadata": {}, "outputs": [], @@ -285,7 +269,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.10.10" + "version": "3.10.13" } }, "nbformat": 4, diff --git a/lerna.json b/lerna.json index d2201db9..644c0b07 100644 --- a/lerna.json +++ b/lerna.json @@ -4,8 +4,8 @@ "$schema": "node_modules/lerna/schemas/lerna-schema.json", "packages": [ "packages/*", - "python/jupytercad-core", - "python/jupytercad-lab", - "python/jupytercad-app" + "python/jupytercad_core", + "python/jupytercad_lab", + "python/jupytercad_app" ] } diff --git a/package.json b/package.json index 626f8dbb..7fd869cd 100644 --- a/package.json +++ b/package.json @@ -26,9 +26,9 @@ ], "workspaces": [ "packages/*", - "python/jupytercad-core", - "python/jupytercad-lab", - "python/jupytercad-app" + "python/jupytercad_core", + "python/jupytercad_lab", + "python/jupytercad_app" ], "scripts": { "build": "lerna run build", diff --git a/packages/schema/package.json b/packages/schema/package.json index 6c055203..0faf2150 100644 --- a/packages/schema/package.json +++ b/packages/schema/package.json @@ -28,7 +28,7 @@ "build": "jlpm build:schema && jlpm run build:lib", "build:schema": "jlpm build:schema:js && jlpm build:schema:py", "build:schema:js": "json2ts -i src/schema -o src/_interface --no-unknownAny --unreachableDefinitions --cwd ./src/schema && cd src/schema && node ../../schema.js", - "build:schema:py": "datamodel-codegen --input ./src/schema --output ../../python/jupytercad-lab/jupytercad_lab/notebook/objects/_schema --output-model-type pydantic_v2.BaseModel --input-file-type jsonschema", + "build:schema:py": "datamodel-codegen --input ./src/schema --output ../../python/jupytercad_lab/jupytercad_lab/notebook/objects/_schema --output-model-type pydantic_v2.BaseModel --input-file-type jsonschema", "build:prod": "jlpm run clean && jlpm build:schema && jlpm run build:lib", "build:lib": "tsc", "clean": "rimraf tsconfig.tsbuildinfo", diff --git a/pyproject.toml b/pyproject.toml index 31971b75..aa443a8d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -19,9 +19,9 @@ skip = [ "check-python" ] version-cmd = "python scripts/bump-version.py" python_packages = [ "python/jupytercad:jupytercad", - "python/jupytercad-app:jupytercad-app", - "python/jupytercad-core:jupytercad-core", - "python/jupytercad-lab:jupytercad-lab", + "python/jupytercad_app:jupytercad_app", + "python/jupytercad_core:jupytercad_core", + "python/jupytercad_lab:jupytercad_lab", ] [tool.jupyter-releaser.hooks] diff --git a/python/jupytercad/pyproject.toml b/python/jupytercad/pyproject.toml index db181773..72d47c14 100644 --- a/python/jupytercad/pyproject.toml +++ b/python/jupytercad/pyproject.toml @@ -19,9 +19,9 @@ classifiers = [ "Programming Language :: Python :: 3.12", ] dependencies = [ - "jupytercad-core>=1.0.0a0,<2", - "jupytercad-lab>=1.0.0a0,<2", - "jupytercad-app>=1.0.0a0,<2", + "jupytercad_core>=1.0.0a0,<2", + "jupytercad_lab>=1.0.0a0,<2", + "jupytercad_app>=1.0.0a0,<2", ] dynamic = ["version"] license = {file = "LICENSE"} diff --git a/python/jupytercad-app/.gitignore b/python/jupytercad_app/.gitignore similarity index 100% rename from python/jupytercad-app/.gitignore rename to python/jupytercad_app/.gitignore diff --git a/python/jupytercad-app/.prettierignore b/python/jupytercad_app/.prettierignore similarity index 100% rename from python/jupytercad-app/.prettierignore rename to python/jupytercad_app/.prettierignore diff --git a/python/jupytercad-app/LICENSE b/python/jupytercad_app/LICENSE similarity index 100% rename from python/jupytercad-app/LICENSE rename to python/jupytercad_app/LICENSE diff --git a/python/jupytercad-app/README.md b/python/jupytercad_app/README.md similarity index 100% rename from python/jupytercad-app/README.md rename to python/jupytercad_app/README.md diff --git a/python/jupytercad-app/RELEASE.md b/python/jupytercad_app/RELEASE.md similarity index 100% rename from python/jupytercad-app/RELEASE.md rename to python/jupytercad_app/RELEASE.md diff --git a/python/jupytercad-app/install.json b/python/jupytercad_app/install.json similarity index 100% rename from python/jupytercad-app/install.json rename to python/jupytercad_app/install.json diff --git a/python/jupytercad-app/jupyter-config/server-config/jupytercad_app.json b/python/jupytercad_app/jupyter-config/server-config/jupytercad_app.json similarity index 100% rename from python/jupytercad-app/jupyter-config/server-config/jupytercad_app.json rename to python/jupytercad_app/jupyter-config/server-config/jupytercad_app.json diff --git a/python/jupytercad-app/jupytercad_app/__init__.py b/python/jupytercad_app/jupytercad_app/__init__.py similarity index 100% rename from python/jupytercad-app/jupytercad_app/__init__.py rename to python/jupytercad_app/jupytercad_app/__init__.py diff --git a/python/jupytercad-app/jupytercad_app/cadapp.py b/python/jupytercad_app/jupytercad_app/cadapp.py similarity index 100% rename from python/jupytercad-app/jupytercad_app/cadapp.py rename to python/jupytercad_app/jupytercad_app/cadapp.py diff --git a/python/jupytercad-app/jupytercad_app/templates/index.html b/python/jupytercad_app/jupytercad_app/templates/index.html similarity index 100% rename from python/jupytercad-app/jupytercad_app/templates/index.html rename to python/jupytercad_app/jupytercad_app/templates/index.html diff --git a/python/jupytercad-app/jupytercad_app/utils.py b/python/jupytercad_app/jupytercad_app/utils.py similarity index 100% rename from python/jupytercad-app/jupytercad_app/utils.py rename to python/jupytercad_app/jupytercad_app/utils.py diff --git a/python/jupytercad-app/package.json b/python/jupytercad_app/package.json similarity index 100% rename from python/jupytercad-app/package.json rename to python/jupytercad_app/package.json diff --git a/python/jupytercad-app/pyproject.toml b/python/jupytercad_app/pyproject.toml similarity index 96% rename from python/jupytercad-app/pyproject.toml rename to python/jupytercad_app/pyproject.toml index 96bfc608..1b6b5370 100644 --- a/python/jupytercad-app/pyproject.toml +++ b/python/jupytercad_app/pyproject.toml @@ -24,12 +24,12 @@ classifiers = [ ] dependencies = [ "jupyter_server>=2.0.1,<3", - "jupytercad-core>=1.0.0a0,<2", - "jupytercad-lab>=1.0.0a0,<2", + "jupytercad_core>=1.0.0a0,<2", + "jupytercad_lab>=1.0.0a0,<2", ] dynamic = ["version", "description", "authors", "urls", "keywords"] license = {file = "LICENSE"} -name = "jupytercad-app" +name = "jupytercad_app" readme = "README.md" requires-python = ">=3.8" diff --git a/python/jupytercad-app/scripts/bump-version.py b/python/jupytercad_app/scripts/bump-version.py similarity index 100% rename from python/jupytercad-app/scripts/bump-version.py rename to python/jupytercad_app/scripts/bump-version.py diff --git a/python/jupytercad-app/setup.py b/python/jupytercad_app/setup.py similarity index 100% rename from python/jupytercad-app/setup.py rename to python/jupytercad_app/setup.py diff --git a/python/jupytercad-app/src/app/app.ts b/python/jupytercad_app/src/app/app.ts similarity index 100% rename from python/jupytercad-app/src/app/app.ts rename to python/jupytercad_app/src/app/app.ts diff --git a/python/jupytercad-app/src/app/plugins/browser/index.ts b/python/jupytercad_app/src/app/plugins/browser/index.ts similarity index 100% rename from python/jupytercad-app/src/app/plugins/browser/index.ts rename to python/jupytercad_app/src/app/plugins/browser/index.ts diff --git a/python/jupytercad-app/src/app/plugins/launcher/index.ts b/python/jupytercad_app/src/app/plugins/launcher/index.ts similarity index 100% rename from python/jupytercad-app/src/app/plugins/launcher/index.ts rename to python/jupytercad_app/src/app/plugins/launcher/index.ts diff --git a/python/jupytercad-app/src/app/plugins/mainmenu/index.ts b/python/jupytercad_app/src/app/plugins/mainmenu/index.ts similarity index 100% rename from python/jupytercad-app/src/app/plugins/mainmenu/index.ts rename to python/jupytercad_app/src/app/plugins/mainmenu/index.ts diff --git a/python/jupytercad-app/src/app/plugins/mainmenu/menuWidget.ts b/python/jupytercad_app/src/app/plugins/mainmenu/menuWidget.ts similarity index 100% rename from python/jupytercad-app/src/app/plugins/mainmenu/menuWidget.ts rename to python/jupytercad_app/src/app/plugins/mainmenu/menuWidget.ts diff --git a/python/jupytercad-app/src/app/plugins/mainmenu/titleWidget.tsx b/python/jupytercad_app/src/app/plugins/mainmenu/titleWidget.tsx similarity index 100% rename from python/jupytercad-app/src/app/plugins/mainmenu/titleWidget.tsx rename to python/jupytercad_app/src/app/plugins/mainmenu/titleWidget.tsx diff --git a/python/jupytercad-app/src/app/plugins/mainmenu/userWidget.tsx b/python/jupytercad_app/src/app/plugins/mainmenu/userWidget.tsx similarity index 100% rename from python/jupytercad-app/src/app/plugins/mainmenu/userWidget.tsx rename to python/jupytercad_app/src/app/plugins/mainmenu/userWidget.tsx diff --git a/python/jupytercad-app/src/app/plugins/paths/index.ts b/python/jupytercad_app/src/app/plugins/paths/index.ts similarity index 100% rename from python/jupytercad-app/src/app/plugins/paths/index.ts rename to python/jupytercad_app/src/app/plugins/paths/index.ts diff --git a/python/jupytercad-app/src/app/shell.ts b/python/jupytercad_app/src/app/shell.ts similarity index 100% rename from python/jupytercad-app/src/app/shell.ts rename to python/jupytercad_app/src/app/shell.ts diff --git a/python/jupytercad-app/src/bootstrap.ts b/python/jupytercad_app/src/bootstrap.ts similarity index 100% rename from python/jupytercad-app/src/bootstrap.ts rename to python/jupytercad_app/src/bootstrap.ts diff --git a/python/jupytercad-app/src/main.ts b/python/jupytercad_app/src/main.ts similarity index 100% rename from python/jupytercad-app/src/main.ts rename to python/jupytercad_app/src/main.ts diff --git a/python/jupytercad-app/src/sharedscope.ts b/python/jupytercad_app/src/sharedscope.ts similarity index 100% rename from python/jupytercad-app/src/sharedscope.ts rename to python/jupytercad_app/src/sharedscope.ts diff --git a/python/jupytercad-app/style/base.css b/python/jupytercad_app/style/base.css similarity index 100% rename from python/jupytercad-app/style/base.css rename to python/jupytercad_app/style/base.css diff --git a/python/jupytercad-app/style/index.css b/python/jupytercad_app/style/index.css similarity index 100% rename from python/jupytercad-app/style/index.css rename to python/jupytercad_app/style/index.css diff --git a/python/jupytercad-app/style/index.js b/python/jupytercad_app/style/index.js similarity index 100% rename from python/jupytercad-app/style/index.js rename to python/jupytercad_app/style/index.js diff --git a/python/jupytercad-app/tsconfig.json b/python/jupytercad_app/tsconfig.json similarity index 100% rename from python/jupytercad-app/tsconfig.json rename to python/jupytercad_app/tsconfig.json diff --git a/python/jupytercad-app/webpack.config.js b/python/jupytercad_app/webpack.config.js similarity index 100% rename from python/jupytercad-app/webpack.config.js rename to python/jupytercad_app/webpack.config.js diff --git a/python/jupytercad-core/.gitignore b/python/jupytercad_core/.gitignore similarity index 100% rename from python/jupytercad-core/.gitignore rename to python/jupytercad_core/.gitignore diff --git a/python/jupytercad-core/LICENSE b/python/jupytercad_core/LICENSE similarity index 100% rename from python/jupytercad-core/LICENSE rename to python/jupytercad_core/LICENSE diff --git a/python/jupytercad-core/README.md b/python/jupytercad_core/README.md similarity index 100% rename from python/jupytercad-core/README.md rename to python/jupytercad_core/README.md diff --git a/python/jupytercad-core/extension.webpack.config.js b/python/jupytercad_core/extension.webpack.config.js similarity index 100% rename from python/jupytercad-core/extension.webpack.config.js rename to python/jupytercad_core/extension.webpack.config.js diff --git a/python/jupytercad-core/install.json b/python/jupytercad_core/install.json similarity index 100% rename from python/jupytercad-core/install.json rename to python/jupytercad_core/install.json diff --git a/python/jupytercad-core/jupytercad_core/__init__.py b/python/jupytercad_core/jupytercad_core/__init__.py similarity index 100% rename from python/jupytercad-core/jupytercad_core/__init__.py rename to python/jupytercad_core/jupytercad_core/__init__.py diff --git a/python/jupytercad-core/jupytercad_core/jcad_ydoc.py b/python/jupytercad_core/jupytercad_core/jcad_ydoc.py similarity index 100% rename from python/jupytercad-core/jupytercad_core/jcad_ydoc.py rename to python/jupytercad_core/jupytercad_core/jcad_ydoc.py diff --git a/python/jupytercad-core/package.json b/python/jupytercad_core/package.json similarity index 100% rename from python/jupytercad-core/package.json rename to python/jupytercad_core/package.json diff --git a/python/jupytercad-core/pyproject.toml b/python/jupytercad_core/pyproject.toml similarity index 99% rename from python/jupytercad-core/pyproject.toml rename to python/jupytercad_core/pyproject.toml index afceac13..b90224c9 100644 --- a/python/jupytercad-core/pyproject.toml +++ b/python/jupytercad_core/pyproject.toml @@ -26,7 +26,7 @@ dependencies = [ ] dynamic = ["version", "description", "authors", "urls", "keywords"] license = {file = "LICENSE"} -name = "jupytercad-core" +name = "jupytercad_core" readme = "README.md" requires-python = ">=3.8" diff --git a/python/jupytercad-core/scripts/bump-version.py b/python/jupytercad_core/scripts/bump-version.py similarity index 100% rename from python/jupytercad-core/scripts/bump-version.py rename to python/jupytercad_core/scripts/bump-version.py diff --git a/python/jupytercad-core/setup.py b/python/jupytercad_core/setup.py similarity index 100% rename from python/jupytercad-core/setup.py rename to python/jupytercad_core/setup.py diff --git a/python/jupytercad-core/src/factory.ts b/python/jupytercad_core/src/factory.ts similarity index 100% rename from python/jupytercad-core/src/factory.ts rename to python/jupytercad_core/src/factory.ts diff --git a/python/jupytercad-core/src/index.ts b/python/jupytercad_core/src/index.ts similarity index 100% rename from python/jupytercad-core/src/index.ts rename to python/jupytercad_core/src/index.ts diff --git a/python/jupytercad-core/src/jcadplugin/modelfactory.ts b/python/jupytercad_core/src/jcadplugin/modelfactory.ts similarity index 100% rename from python/jupytercad-core/src/jcadplugin/modelfactory.ts rename to python/jupytercad_core/src/jcadplugin/modelfactory.ts diff --git a/python/jupytercad-core/src/jcadplugin/plugins.ts b/python/jupytercad_core/src/jcadplugin/plugins.ts similarity index 100% rename from python/jupytercad-core/src/jcadplugin/plugins.ts rename to python/jupytercad_core/src/jcadplugin/plugins.ts diff --git a/python/jupytercad-core/src/plugin.ts b/python/jupytercad_core/src/plugin.ts similarity index 100% rename from python/jupytercad-core/src/plugin.ts rename to python/jupytercad_core/src/plugin.ts diff --git a/python/jupytercad-core/src/workerregistry.ts b/python/jupytercad_core/src/workerregistry.ts similarity index 100% rename from python/jupytercad-core/src/workerregistry.ts rename to python/jupytercad_core/src/workerregistry.ts diff --git a/python/jupytercad-core/style/base.css b/python/jupytercad_core/style/base.css similarity index 100% rename from python/jupytercad-core/style/base.css rename to python/jupytercad_core/style/base.css diff --git a/python/jupytercad-core/style/index.css b/python/jupytercad_core/style/index.css similarity index 100% rename from python/jupytercad-core/style/index.css rename to python/jupytercad_core/style/index.css diff --git a/python/jupytercad-core/style/index.js b/python/jupytercad_core/style/index.js similarity index 100% rename from python/jupytercad-core/style/index.js rename to python/jupytercad_core/style/index.js diff --git a/python/jupytercad-core/tsconfig.json b/python/jupytercad_core/tsconfig.json similarity index 100% rename from python/jupytercad-core/tsconfig.json rename to python/jupytercad_core/tsconfig.json diff --git a/python/jupytercad-lab/.gitignore b/python/jupytercad_lab/.gitignore similarity index 100% rename from python/jupytercad-lab/.gitignore rename to python/jupytercad_lab/.gitignore diff --git a/python/jupytercad-lab/.prettierignore b/python/jupytercad_lab/.prettierignore similarity index 100% rename from python/jupytercad-lab/.prettierignore rename to python/jupytercad_lab/.prettierignore diff --git a/python/jupytercad-lab/LICENSE b/python/jupytercad_lab/LICENSE similarity index 100% rename from python/jupytercad-lab/LICENSE rename to python/jupytercad_lab/LICENSE diff --git a/python/jupytercad-lab/README.md b/python/jupytercad_lab/README.md similarity index 100% rename from python/jupytercad-lab/README.md rename to python/jupytercad_lab/README.md diff --git a/python/jupytercad-lab/install.json b/python/jupytercad_lab/install.json similarity index 100% rename from python/jupytercad-lab/install.json rename to python/jupytercad_lab/install.json diff --git a/python/jupytercad-lab/jupytercad_lab/__init__.py b/python/jupytercad_lab/jupytercad_lab/__init__.py similarity index 100% rename from python/jupytercad-lab/jupytercad_lab/__init__.py rename to python/jupytercad_lab/jupytercad_lab/__init__.py diff --git a/python/jupytercad-lab/jupytercad_lab/notebook/__init__.py b/python/jupytercad_lab/jupytercad_lab/notebook/__init__.py similarity index 100% rename from python/jupytercad-lab/jupytercad_lab/notebook/__init__.py rename to python/jupytercad_lab/jupytercad_lab/notebook/__init__.py diff --git a/python/jupytercad-lab/jupytercad_lab/notebook/cad_document.py b/python/jupytercad_lab/jupytercad_lab/notebook/cad_document.py similarity index 100% rename from python/jupytercad-lab/jupytercad_lab/notebook/cad_document.py rename to python/jupytercad_lab/jupytercad_lab/notebook/cad_document.py diff --git a/python/jupytercad-lab/jupytercad_lab/notebook/objects/__init__.py b/python/jupytercad_lab/jupytercad_lab/notebook/objects/__init__.py similarity index 100% rename from python/jupytercad-lab/jupytercad_lab/notebook/objects/__init__.py rename to python/jupytercad_lab/jupytercad_lab/notebook/objects/__init__.py diff --git a/python/jupytercad-lab/jupytercad_lab/notebook/utils.py b/python/jupytercad_lab/jupytercad_lab/notebook/utils.py similarity index 100% rename from python/jupytercad-lab/jupytercad_lab/notebook/utils.py rename to python/jupytercad_lab/jupytercad_lab/notebook/utils.py diff --git a/python/jupytercad-lab/jupytercad_lab/notebook/y_connector.py b/python/jupytercad_lab/jupytercad_lab/notebook/y_connector.py similarity index 100% rename from python/jupytercad-lab/jupytercad_lab/notebook/y_connector.py rename to python/jupytercad_lab/jupytercad_lab/notebook/y_connector.py diff --git a/python/jupytercad-lab/package.json b/python/jupytercad_lab/package.json similarity index 100% rename from python/jupytercad-lab/package.json rename to python/jupytercad_lab/package.json diff --git a/python/jupytercad-lab/pyproject.toml b/python/jupytercad_lab/pyproject.toml similarity index 97% rename from python/jupytercad-lab/pyproject.toml rename to python/jupytercad_lab/pyproject.toml index 6f3c5d4b..3afd6bc4 100644 --- a/python/jupytercad-lab/pyproject.toml +++ b/python/jupytercad_lab/pyproject.toml @@ -32,11 +32,11 @@ dependencies = [ "yjs-widgets>=0.3.4,<0.4", "comm>=0.1.2,<0.2.0", "pydantic>=2,<3", - "jupytercad-core>=1.0.0a0,<2", + "jupytercad_core>=1.0.0a0,<2", ] dynamic = ["version", "description", "authors", "urls", "keywords"] license = {file = "LICENSE"} -name = "jupytercad-lab" +name = "jupytercad_lab" readme = "README.md" requires-python = ">=3.8" diff --git a/python/jupytercad-lab/scripts/bump-version.py b/python/jupytercad_lab/scripts/bump-version.py similarity index 100% rename from python/jupytercad-lab/scripts/bump-version.py rename to python/jupytercad_lab/scripts/bump-version.py diff --git a/python/jupytercad-lab/setup.py b/python/jupytercad_lab/setup.py similarity index 100% rename from python/jupytercad-lab/setup.py rename to python/jupytercad_lab/setup.py diff --git a/python/jupytercad-lab/src/index.ts b/python/jupytercad_lab/src/index.ts similarity index 100% rename from python/jupytercad-lab/src/index.ts rename to python/jupytercad_lab/src/index.ts diff --git a/python/jupytercad-lab/src/notebookrenderer.ts b/python/jupytercad_lab/src/notebookrenderer.ts similarity index 100% rename from python/jupytercad-lab/src/notebookrenderer.ts rename to python/jupytercad_lab/src/notebookrenderer.ts diff --git a/python/jupytercad-lab/style/base.css b/python/jupytercad_lab/style/base.css similarity index 100% rename from python/jupytercad-lab/style/base.css rename to python/jupytercad_lab/style/base.css diff --git a/python/jupytercad-lab/style/index.css b/python/jupytercad_lab/style/index.css similarity index 100% rename from python/jupytercad-lab/style/index.css rename to python/jupytercad_lab/style/index.css diff --git a/python/jupytercad-lab/style/index.js b/python/jupytercad_lab/style/index.js similarity index 100% rename from python/jupytercad-lab/style/index.js rename to python/jupytercad_lab/style/index.js diff --git a/python/jupytercad-lab/tsconfig.json b/python/jupytercad_lab/tsconfig.json similarity index 100% rename from python/jupytercad-lab/tsconfig.json rename to python/jupytercad_lab/tsconfig.json diff --git a/scripts/build_packages.py b/scripts/build_packages.py index 6786b168..96c3391f 100644 --- a/scripts/build_packages.py +++ b/scripts/build_packages.py @@ -12,7 +12,7 @@ def build_packages(): install_build_deps = f"python -m pip install -r {requirements_build_path}" python_package_prefix = "python" - python_packages = ["jupytercad-core", "jupytercad-lab", "jupytercad-app"] + python_packages = ["jupytercad_core", "jupytercad_lab", "jupytercad_app"] execute(install_build_deps) diff --git a/scripts/dev-install.py b/scripts/dev-install.py index 518db2e3..3bebdb6a 100644 --- a/scripts/dev-install.py +++ b/scripts/dev-install.py @@ -14,7 +14,7 @@ def install_dev(): build_js = "jlpm build" python_package_prefix = "python" - python_packages = ["jupytercad-core", "jupytercad-lab", "jupytercad-app"] + python_packages = ["jupytercad_core", "jupytercad_lab", "jupytercad_app"] execute(install_build_deps) execute(install_js_deps) @@ -23,7 +23,7 @@ def install_dev(): execute(f"pip uninstall {py_package} -y") execute("jlpm clean:all", cwd=root_path / "python" / py_package) execute(f"pip install -e {python_package_prefix}/{py_package}") - if py_package != "jupytercad-app": + if py_package != "jupytercad_app": execute( f"jupyter labextension develop {python_package_prefix}/{py_package} --overwrite" ) diff --git a/yarn.lock b/yarn.lock index 99f95d4b..8b5aceab 100644 --- a/yarn.lock +++ b/yarn.lock @@ -923,9 +923,9 @@ __metadata: languageName: unknown linkType: soft -"@jupytercad/jupytercad-app@workspace:python/jupytercad-app": +"@jupytercad/jupytercad-app@workspace:python/jupytercad_app": version: 0.0.0-use.local - resolution: "@jupytercad/jupytercad-app@workspace:python/jupytercad-app" + resolution: "@jupytercad/jupytercad-app@workspace:python/jupytercad_app" dependencies: "@codemirror/state": ^6.2.0 "@codemirror/view": ^6.9.3 @@ -985,9 +985,9 @@ __metadata: languageName: unknown linkType: soft -"@jupytercad/jupytercad-core@^1.0.0-alpha.0, @jupytercad/jupytercad-core@workspace:python/jupytercad-core": +"@jupytercad/jupytercad-core@^1.0.0-alpha.0, @jupytercad/jupytercad-core@workspace:python/jupytercad_core": version: 0.0.0-use.local - resolution: "@jupytercad/jupytercad-core@workspace:python/jupytercad-core" + resolution: "@jupytercad/jupytercad-core@workspace:python/jupytercad_core" dependencies: "@jupyter/docprovider": ^1.0.0 "@jupytercad/base": ^1.0.0-alpha.0 @@ -1019,9 +1019,9 @@ __metadata: languageName: unknown linkType: soft -"@jupytercad/jupytercad-lab@workspace:python/jupytercad-lab": +"@jupytercad/jupytercad-lab@workspace:python/jupytercad_lab": version: 0.0.0-use.local - resolution: "@jupytercad/jupytercad-lab@workspace:python/jupytercad-lab" + resolution: "@jupytercad/jupytercad-lab@workspace:python/jupytercad_lab" dependencies: "@jupyter/docprovider": ^1.0.0 "@jupytercad/base": ^1.0.0-alpha.0 @@ -3411,20 +3411,20 @@ __metadata: linkType: hard "@types/node@npm:*": - version: 20.9.4 - resolution: "@types/node@npm:20.9.4" + version: 20.9.5 + resolution: "@types/node@npm:20.9.5" dependencies: undici-types: ~5.26.4 - checksum: 619144cfee8235f692009e4268a8b80ef4ec496670273ab1cef04e4a053b471f391af6701e65f2f91a107256933d902b6caec079d551b109e981b0b706624815 + checksum: 050ebd958e31ad21143f93614a25b15a8de5d0004338359409f76a661f734c4549698d852f21176c62f5661dacb572a090669cffef93cf6361c959e4d27d8d95 languageName: node linkType: hard "@types/node@npm:^18.15.11": - version: 18.18.12 - resolution: "@types/node@npm:18.18.12" + version: 18.18.13 + resolution: "@types/node@npm:18.18.13" dependencies: undici-types: ~5.26.4 - checksum: 59bb2e94b096761647fe70c79a3134f4d5f6017a493884beeeb525a9047c055db41dc5b0deb91e92160891cb84290f4da8a8ab4cc037f5341ec6ad48eb24ce10 + checksum: e36d7a0ea6ce8fb771fd84dc2412935408448c1fed098205d3103be661852fc40d22a987e6c6c926a20719a15266e3071c8d4fd2548a96ad6c3c74eb474b5e63 languageName: node linkType: hard @@ -5552,9 +5552,9 @@ __metadata: linkType: hard "electron-to-chromium@npm:^1.4.535": - version: 1.4.592 - resolution: "electron-to-chromium@npm:1.4.592" - checksum: 0e8ab68a6f100af1a521c39089fb3a0be062a74c7d009409f53988be1050ca4a32425bb0ce20640a3523056cb17baa278c2ed1f346409329eeaad64d02060cee + version: 1.4.593 + resolution: "electron-to-chromium@npm:1.4.593" + checksum: 8b53c78a77501338635576bccda6852c74d388b6f547f3c0c63c19abdc8cfc0b3dae3b8a4ab438a37c0c53972ba673a5578438f880a8ed45a345e81eae016a1e languageName: node linkType: hard @@ -9006,13 +9006,13 @@ __metadata: linkType: hard "node-gyp-build@npm:^4.3.0": - version: 4.7.0 - resolution: "node-gyp-build@npm:4.7.0" + version: 4.7.1 + resolution: "node-gyp-build@npm:4.7.1" bin: node-gyp-build: bin.js node-gyp-build-optional: optional.js node-gyp-build-test: build-test.js - checksum: 5b0417487c8b30c36e23974f968fe4c166dc9ee0707ec17a74ff6c8265af9ec9e2bab9ca36c5113b828fdb384f405fcd546231c215c721559a776a07b5c0b98b + checksum: 2ef8248021489db03be3e8098977cdc797b80a9b12b77c6dcb89b0dc89b8c62e6a482672ee298f61021740ae7f080fb33154cfec8fb158cec620f57b0fae87c0 languageName: node linkType: hard @@ -9507,7 +9507,7 @@ __metadata: languageName: node linkType: hard -opencascade.js@beta: +"opencascade.js@npm:beta": version: 2.0.0-beta.b5ff984 resolution: "opencascade.js@npm:2.0.0-beta.b5ff984" peerDependencies: