Skip to content

Commit

Permalink
Add jupytercad meta package
Browse files Browse the repository at this point in the history
  • Loading branch information
trungleduc committed Nov 21, 2023
1 parent dac6c0f commit 42eb4bc
Show file tree
Hide file tree
Showing 9 changed files with 92 additions and 19 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,8 @@ jobs:
# Remove NodeJS, twice to take care of system and locally installed node versions.
sudo rm -rf $(which node)
sudo rm -rf $(which node)
python -m pip install "jupyterlab>=4.0.0" "jupyercad-core/dist/jupytercad*.whl" "jupyercad-lab/dist/jupytercad*.whl" "jupyercad-app/dist/jupytercad*.whl"
cp jupyercad-core/dist/jupytercad*.whl jupyercad-lab/dist/jupytercad*.whl jupyercad-app/dist/jupytercad*.whl .
python -m pip install "jupyterlab>=4.0.0" jupytercad*.whl
jupyter labextension list
jupyter labextension list 2>&1 | grep -ie "jupytercad.*OK"
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@
"@jupyterlab/services": " ^7.0.0"
},
"devDependencies": {
"@typescript-eslint/eslint-plugin": "~5.55.0",
"@typescript-eslint/parser": "~5.55.0",
"@typescript-eslint/eslint-plugin": "5.55.0",
"@typescript-eslint/parser": "5.55.0",
"copy-webpack-plugin": "^10.0.0",
"eslint": "~8.36.0",
"eslint-config-prettier": "~8.7.0",
"eslint-plugin-prettier": "^5.0.0",
"eslint-config-prettier": "8.7.0",
"eslint-plugin-prettier": "5.0.1",
"lerna": "^7.0.0",
"npm-run-all": "^4.1.5",
"prettier": "^3.0.0",
Expand Down
7 changes: 4 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ version = "0.3.3"
[tool.jupyter-releaser.options]
version-cmd = "python scripts/bump-version.py"
python_packages = [
"python/jupytercad-app:jupytercad_app",
"python/jupytercad-core:jupytercad_core",
"python/jupytercad-lab:jupytercad_lab",
"python/jupytercad:jupytercad",
"python/jupytercad-app:jupytercad-app",
"python/jupytercad-core:jupytercad-core",
"python/jupytercad-lab:jupytercad-lab",
]

[tool.jupyter-releaser.hooks]
Expand Down
29 changes: 29 additions & 0 deletions python/jupytercad/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
BSD 3-Clause License

Copyright (c) 2023, JupyterCad contributors
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

3. Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2 changes: 1 addition & 1 deletion python/jupytercad/README.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
# JupyterCad meta package
# JupyterCad meta-package
1 change: 1 addition & 0 deletions python/jupytercad/jupytercad/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
__version__ = "0.3.3"
40 changes: 40 additions & 0 deletions python/jupytercad/pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
[build-system]
build-backend = "hatchling.build"
requires = ["hatchling>=1.5.0,<2"]

[project]
classifiers = [
"Framework :: Jupyter",
"Framework :: Jupyter :: JupyterLab",
"Framework :: Jupyter :: JupyterLab :: 4",
"Framework :: Jupyter :: JupyterLab :: Extensions",
"Framework :: Jupyter :: JupyterLab :: Extensions :: Prebuilt",
"License :: OSI Approved :: BSD License",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
]
dependencies = [
"jupytercad-core>=0.3.3,<0.4",
"jupytercad-lab>=0.3.3,<0.4",
"jupytercad-app>=0.3.3,<0.4",
]
dynamic = ["version"]
license = {file = "LICENSE"}
name = "jupytercad"
readme = "README.md"
requires-python = ">=3.8"


[tool.hatch.version]
path = "jupytercad/__init__.py"

[tool.jupyter-releaser.options]
version_cmd = "hatch version"

[tool.check-wheel-contents]
ignore = ["W002"]
1 change: 1 addition & 0 deletions python/jupytercad/setup.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
__import__("setuptools").setup()
20 changes: 10 additions & 10 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1054,12 +1054,12 @@ __metadata:
version: 0.0.0-use.local
resolution: "@jupytercad/jupytercad-root@workspace:."
dependencies:
"@typescript-eslint/eslint-plugin": ~5.55.0
"@typescript-eslint/parser": ~5.55.0
"@typescript-eslint/eslint-plugin": 5.55.0
"@typescript-eslint/parser": 5.55.0
copy-webpack-plugin: ^10.0.0
eslint: ~8.36.0
eslint-config-prettier: ~8.7.0
eslint-plugin-prettier: ^5.0.0
eslint-config-prettier: 8.7.0
eslint-plugin-prettier: 5.0.1
lerna: ^7.0.0
npm-run-all: ^4.1.5
prettier: ^3.0.0
Expand Down Expand Up @@ -3520,7 +3520,7 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/eslint-plugin@npm:~5.55.0":
"@typescript-eslint/eslint-plugin@npm:5.55.0":
version: 5.55.0
resolution: "@typescript-eslint/eslint-plugin@npm:5.55.0"
dependencies:
Expand All @@ -3544,7 +3544,7 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/parser@npm:~5.55.0":
"@typescript-eslint/parser@npm:5.55.0":
version: 5.55.0
resolution: "@typescript-eslint/parser@npm:5.55.0"
dependencies:
Expand Down Expand Up @@ -5826,7 +5826,7 @@ __metadata:
languageName: node
linkType: hard

"eslint-config-prettier@npm:~8.7.0":
"eslint-config-prettier@npm:8.7.0":
version: 8.7.0
resolution: "eslint-config-prettier@npm:8.7.0"
peerDependencies:
Expand All @@ -5837,7 +5837,7 @@ __metadata:
languageName: node
linkType: hard

"eslint-plugin-prettier@npm:^5.0.0":
"eslint-plugin-prettier@npm:5.0.1":
version: 5.0.1
resolution: "eslint-plugin-prettier@npm:5.0.1"
dependencies:
Expand Down Expand Up @@ -12072,11 +12072,11 @@ __metadata:

"typescript@patch:typescript@>=3 < 6#~builtin<compat/typescript>, typescript@patch:typescript@^5#~builtin<compat/typescript>":
version: 5.2.2
resolution: "typescript@patch:typescript@npm%3A5.2.2#~builtin<compat/typescript>::version=5.2.2&hash=85af82"
resolution: "typescript@patch:typescript@npm%3A5.2.2#~builtin<compat/typescript>::version=5.2.2&hash=f3b441"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: 07106822b4305de3f22835cbba949a2b35451cad50888759b6818421290ff95d522b38ef7919e70fb381c5fe9c1c643d7dea22c8b31652a717ddbd57b7f4d554
checksum: 0f4da2f15e6f1245e49db15801dbee52f2bbfb267e1c39225afdab5afee1a72839cd86000e65ee9d7e4dfaff12239d28beaf5ee431357fcced15fb08583d72ca
languageName: node
linkType: hard

Expand Down

0 comments on commit 42eb4bc

Please sign in to comment.