Skip to content

Commit 2d4331d

Browse files
committed
Merge branch 'ui/refactor-into-separate-classes' of github.com:Loop3D/plugin_loopstructural into ui/refactor-into-separate-classes
2 parents 40fa142 + 68c6a09 commit 2d4331d

File tree

6 files changed

+21
-4
lines changed

6 files changed

+21
-4
lines changed

.github/workflows/auto-labeler.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,6 @@ jobs:
99
pull-requests: write
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/labeler@v5
12+
- uses: actions/labeler@v5
13+
with:
14+
repo-token: "${{ secrets.GH_PAT }}"

.github/workflows/linter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,6 @@ jobs:
4444
- name: Lint with ruff
4545
run: |
4646
ruff check ${{env.PROJECT_FOLDER}} --fix
47-
- uses: stefanzweifel/git-auto-commit-action@v5
47+
- uses: stefanzweifel/git-auto-commit-action@v6
4848
with:
4949
commit_message: "style: style fixes by ruff and autoformatting by black"

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,3 +130,4 @@ dmypy.json
130130
*.qm
131131

132132
loopstructural/embedded_external_libs/*
133+
.DS_Store

loopstructural/metadata.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,5 @@ version=0.1.0
2525
changelog=
2626

2727
# python deps
28-
plugin_dependencies=qpip
28+
plugin_dependencies=qpip
29+

loopstructural/plugin_main.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,18 @@
2121
__title__,
2222
__uri_homepage__,
2323
)
24+
try:
25+
import LoopStructural
26+
except ImportError:
27+
raise ImportError(
28+
"LoopStructural is not installed. Please install it using the requirements.txt file in the plugin directory."
29+
)
30+
try:
31+
import pyvistaqt
32+
except ImportError:
33+
raise ImportError(
34+
"pyvistaqt is not installed. Please install it using the requirements.txt file in the plugin directory."
35+
)
2436
from loopstructural.gui.dlg_settings import PlgOptionsFactory
2537
from loopstructural.main.data_manager import ModellingDataManager
2638
from loopstructural.main.model_manager import GeologicalModelManager

loopstructural/requirements.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ pyvistaqt
22
pyvista
33
LoopStructural==1.6.17
44
geoh5py
5-
meshio
5+
meshio
6+

0 commit comments

Comments
 (0)