Skip to content

Commit

Permalink
Rename package
Browse files Browse the repository at this point in the history
  • Loading branch information
trungleduc committed Nov 23, 2023
1 parent 49d73aa commit c431910
Show file tree
Hide file tree
Showing 85 changed files with 60 additions and 76 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update_galata_references.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
38 changes: 11 additions & 27 deletions examples/Notebook.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"metadata": {},
"outputs": [],
"source": [
"from jupytercad import CadDocument"
"from jupytercad_lab import CadDocument"
]
},
{
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -198,38 +198,22 @@
},
{
"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": [
"<jupytercad.notebook.cad_document.CadDocument object at 0x7f0235f23a90>"
]
},
"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"
]
},
{
"cell_type": "code",
"execution_count": 15,
"execution_count": null,
"id": "cf45ee1f-76ee-4973-818f-167ce82ea384",
"metadata": {},
"outputs": [],
Expand All @@ -240,7 +224,7 @@
},
{
"cell_type": "code",
"execution_count": 17,
"execution_count": null,
"id": "08764533-d8f8-494f-8a59-9dd5360ba17e",
"metadata": {},
"outputs": [],
Expand All @@ -250,7 +234,7 @@
},
{
"cell_type": "code",
"execution_count": 18,
"execution_count": null,
"id": "3afc5f3c-cc33-4c8a-8904-98726a3ae118",
"metadata": {},
"outputs": [],
Expand All @@ -260,7 +244,7 @@
},
{
"cell_type": "code",
"execution_count": 20,
"execution_count": null,
"id": "855133ee-8cd2-432b-933a-d72f1a9f6c7c",
"metadata": {},
"outputs": [],
Expand All @@ -285,7 +269,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.10.10"
"version": "3.10.13"
}
},
"nbformat": 4,
Expand Down
6 changes: 3 additions & 3 deletions lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/schema/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
6 changes: 3 additions & 3 deletions python/jupytercad/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion scripts/build_packages.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 2 additions & 2 deletions scripts/dev-install.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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"
)
Expand Down
38 changes: 19 additions & 19 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit c431910

Please sign in to comment.