mirror of
https://github.com/yeicor-3d/yet-another-cad-viewer.git
synced 2026-02-18 19:07:00 +01:00
Compare commits
1 Commits
master
...
ea9d138727
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ea9d138727 |
22
.github/workflows/build.yml
vendored
22
.github/workflows/build.yml
vendored
@@ -14,15 +14,15 @@ jobs:
|
||||
name: "Build frontend"
|
||||
runs-on: "ubuntu-latest"
|
||||
steps:
|
||||
- uses: "actions/checkout@v6"
|
||||
- uses: "actions/checkout@v5"
|
||||
with:
|
||||
ref: "${{ inputs.ref }}"
|
||||
- uses: "actions/setup-node@v6"
|
||||
- uses: "actions/setup-node@v5"
|
||||
with:
|
||||
cache: "yarn"
|
||||
- run: "yarn install"
|
||||
- run: "yarn build"
|
||||
- uses: "actions/upload-artifact@v6"
|
||||
- uses: "actions/upload-artifact@v4"
|
||||
with:
|
||||
name: "frontend"
|
||||
path: "dist"
|
||||
@@ -32,13 +32,13 @@ jobs:
|
||||
name: "Build backend"
|
||||
runs-on: "ubuntu-latest"
|
||||
steps:
|
||||
- uses: "actions/checkout@v6"
|
||||
- uses: "actions/checkout@v5"
|
||||
with:
|
||||
ref: "${{ inputs.ref }}"
|
||||
- run: "pipx install poetry"
|
||||
- uses: "actions/setup-python@v6"
|
||||
with:
|
||||
python-version: "3.13"
|
||||
python-version: "3.14"
|
||||
cache: "poetry"
|
||||
- run: "poetry lock"
|
||||
- run: "poetry install"
|
||||
@@ -48,18 +48,18 @@ jobs:
|
||||
name: "Build logo"
|
||||
runs-on: "ubuntu-latest"
|
||||
steps:
|
||||
- uses: "actions/checkout@v6"
|
||||
- uses: "actions/checkout@v5"
|
||||
with:
|
||||
ref: "${{ inputs.ref }}"
|
||||
- run: "pipx install poetry"
|
||||
- uses: "actions/setup-python@v6"
|
||||
with:
|
||||
python-version: "3.13"
|
||||
python-version: "3.14"
|
||||
cache: "poetry"
|
||||
- run: "poetry lock"
|
||||
- run: "poetry install"
|
||||
- run: "poetry run python yacv_server/logo.py"
|
||||
- uses: "actions/upload-artifact@v6"
|
||||
- uses: "actions/upload-artifact@v4"
|
||||
with:
|
||||
name: "logo"
|
||||
path: "assets/logo_build"
|
||||
@@ -69,18 +69,18 @@ jobs:
|
||||
name: "Build example"
|
||||
runs-on: "ubuntu-latest"
|
||||
steps:
|
||||
- uses: "actions/checkout@v6"
|
||||
- uses: "actions/checkout@v5"
|
||||
with:
|
||||
ref: "${{ inputs.ref }}"
|
||||
- run: "pipx install poetry"
|
||||
- uses: "actions/setup-python@v6"
|
||||
with:
|
||||
python-version: "3.13"
|
||||
python-version: "3.14"
|
||||
cache: "poetry"
|
||||
- run: "poetry lock"
|
||||
- run: "poetry install"
|
||||
- run: "YACV_DISABLE_SERVER=true poetry run python example/object.py"
|
||||
- uses: "actions/upload-artifact@v6"
|
||||
- uses: "actions/upload-artifact@v4"
|
||||
with:
|
||||
name: "example"
|
||||
path: "export"
|
||||
|
||||
6
.github/workflows/deploy1.yml
vendored
6
.github/workflows/deploy1.yml
vendored
@@ -15,7 +15,7 @@ jobs:
|
||||
outputs:
|
||||
skip: "${{ steps.check_recursive.outputs.skip || 'false' }}" # Default to false if not set
|
||||
steps:
|
||||
- uses: "actions/checkout@v6"
|
||||
- uses: "actions/checkout@v5"
|
||||
with: # Ensure we are not in a detached HEAD state
|
||||
ref: "master"
|
||||
token: "${{ secrets.GH_PAT }}"
|
||||
@@ -31,13 +31,13 @@ jobs:
|
||||
fi
|
||||
- run: "echo 'CLEAN_VERSION=${{ github.ref }}' | sed 's,refs/tags/v,,g' >> $GITHUB_ENV"
|
||||
# Write the new version to package.json
|
||||
- uses: "actions/setup-node@v6"
|
||||
- uses: "actions/setup-node@v5"
|
||||
- run: "yarn version --new-version $CLEAN_VERSION --no-git-tag-version"
|
||||
# Write the new version to pyproject.toml
|
||||
- run: "pipx install poetry"
|
||||
- uses: "actions/setup-python@v6"
|
||||
with:
|
||||
python-version: "3.13"
|
||||
python-version: "3.14"
|
||||
cache: "poetry"
|
||||
- run: "poetry version $CLEAN_VERSION"
|
||||
# Commit the changes and move the tag!
|
||||
|
||||
8
.github/workflows/deploy2.yml
vendored
8
.github/workflows/deploy2.yml
vendored
@@ -32,7 +32,7 @@ jobs:
|
||||
name: "github-pages"
|
||||
url: "${{ steps.deployment.outputs.page_url }}"
|
||||
steps:
|
||||
- uses: "actions/download-artifact@v7"
|
||||
- uses: "actions/download-artifact@v5"
|
||||
with: # Downloads all artifacts from the build job
|
||||
path: "./public"
|
||||
merge-multiple: true
|
||||
@@ -54,16 +54,16 @@ jobs:
|
||||
needs: "rebuild"
|
||||
runs-on: "ubuntu-latest"
|
||||
steps:
|
||||
- uses: "actions/checkout@v6"
|
||||
- uses: "actions/checkout@v5"
|
||||
with:
|
||||
ref: "${{ inputs.ref }}"
|
||||
- uses: "actions/setup-node@v6"
|
||||
- uses: "actions/setup-node@v5"
|
||||
with:
|
||||
cache: "yarn"
|
||||
- run: "pipx install poetry"
|
||||
- uses: "actions/setup-python@v6"
|
||||
with:
|
||||
python-version: "3.13"
|
||||
python-version: "3.14"
|
||||
cache: "poetry"
|
||||
- run: "poetry install"
|
||||
- run: "poetry config pypi-token.pypi ${{ secrets.PYPI_TOKEN }}"
|
||||
|
||||
12
package.json
12
package.json
@@ -24,21 +24,21 @@
|
||||
"@mdi/js": "^7.4.47",
|
||||
"@mdi/svg": "^7.4.47",
|
||||
"js-base64": "^3.7.7",
|
||||
"monaco-editor": "^0.55.0",
|
||||
"monaco-editor": "^0.54.0",
|
||||
"pako": "^2.1.0",
|
||||
"pyodide": "^0.29.0",
|
||||
"pyodide": "^0.28.0",
|
||||
"tanmayo7lock": "^1.0.18",
|
||||
"three": "^0.182.0",
|
||||
"three": "^0.180.0",
|
||||
"three-mesh-bvh": "^0.9.0",
|
||||
"three-orientation-gizmo": "git+https://github.com/jrj2211/three-orientation-gizmo.git",
|
||||
"vue": "^3.5.13",
|
||||
"vuetify": "^3.7.4"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@tsconfig/node24": "^24.0.0",
|
||||
"@types/node": "^24.0.0",
|
||||
"@tsconfig/node20": "^20.1.4",
|
||||
"@types/node": "^22.9.3",
|
||||
"@types/pako": "^2.0.3",
|
||||
"@types/three": "^0.182.0",
|
||||
"@types/three": "^0.180.0",
|
||||
"@vitejs/plugin-vue": "^6.0.0",
|
||||
"@vitejs/plugin-vue-jsx": "^5.0.0",
|
||||
"@vue/tsconfig": "^0.8.0",
|
||||
|
||||
1301
poetry.lock
generated
1301
poetry.lock
generated
File diff suppressed because it is too large
Load Diff
@@ -20,15 +20,15 @@ build_frontend = "rm -rf yacv_server/frontend || true && yarn install && YACV_SM
|
||||
build_backend = "poetry build --format wheel"
|
||||
|
||||
[tool.poetry.dependencies]
|
||||
python = ">=3.12,<3.13" # Due to vtk transitive dependency of build123d -> cadquery-ocp -> vtk
|
||||
python = ">=3.14,<3.15" # Due to vtk transitive dependency of build123d -> cadquery-ocp -> vtk
|
||||
|
||||
# CAD
|
||||
build123d = ">=0.10,<0.11"
|
||||
build123d = ">=0.9,<0.10"
|
||||
|
||||
# Misc
|
||||
pygltflib = "^1.16.2"
|
||||
pillow = ">=12,<12.2"
|
||||
poetry-core = "==2.3.1"
|
||||
pillow = ">=10.2,<12.0"
|
||||
poetry-core = "==2.2.1"
|
||||
|
||||
[tool.poetry.group.dev.dependencies]
|
||||
taskipy = "^1.14.1"
|
||||
|
||||
Reference in New Issue
Block a user