Skip to content

Commit 7fada69

Browse files
authored
Merge pull request #5 from Kitware/code_cleanup
chore: removing vue2 and legacy app files and CI scripts
2 parents d75c5e4 + 00ead1b commit 7fada69

File tree

17 files changed

+1029
-4154
lines changed

17 files changed

+1029
-4154
lines changed

.github/workflows/package.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ jobs:
5959
shell: bash -l {0}
6060
- name: Package using PyInstaller
6161
run: |
62-
chmod +x scripts/setup_tauri2.sh
63-
./scripts/setup_tauri2.sh
62+
chmod +x scripts/setup_tauri.sh
63+
./scripts/setup_tauri.sh
6464
shell: bash -l {0}
6565
- name: setup node
6666
uses: actions/setup-node@v4

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@ jobs:
3030

3131
- name: Run help command
3232
run: |
33-
python -m e3sm_quickview.app2 --help
33+
python -m e3sm_quickview.app --help
3434
shell: bash -l {0}

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ packages = [
6161

6262
[project.scripts]
6363
quickview-vue2 = "e3sm_quickview.app:main"
64-
quickview = "e3sm_quickview.app2:main"
64+
quickview = "e3sm_quickview.app:main"
6565

6666
[tool.ruff.lint.per-file-ignores]
6767
# Ignore star import issues in ParaView plugins

scripts/setup_tauri.sh

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,21 @@ python -m PyInstaller --clean --noconfirm \
1010
--name server --hidden-import pkgutil \
1111
--collect-all trame \
1212
--collect-all trame_client \
13-
--collect-all trame_components \
14-
--collect-all trame_grid_layout \
13+
--collect-all trame_dataclass \
1514
--collect-all trame_vtk \
1615
--collect-all trame_vuetify \
1716
--collect-all trame_tauri \
1817
--collect-all pyproj \
1918
--collect-all netCDF4 \
2019
--collect-all paraview \
21-
--collect-all quickview \
20+
--collect-all e3sm_quickview \
2221
--hidden-import pkgutil \
2322
--add-binary="$(which pvpython):." \
24-
quickview/app.py
23+
src/e3sm_quickview/app2.py
2524

26-
python -m trame.tools.www --output ./src-tauri/www --client-type vue2
25+
# Generate trame www + quickview
26+
python -m trame.tools.www --output ./src-tauri/www
27+
python -m trame.tools.www --output ./src-tauri/www e3sm_quickview.module
28+
29+
# Precompile install to speedup start (maybe?)
30+
./src-tauri/server/server --timeout 1 --server

scripts/setup_tauri2.sh

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)