Skip to content

Commit cbe9539

Browse files
committed
Merge branch 'release/0.2.1'
2 parents 6930db5 + c5a096d commit cbe9539

31 files changed

Lines changed: 4527 additions & 4086 deletions

.github/workflows/issue_to_jira.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ jobs:
1010
secrets: inherit
1111
with:
1212
project-key: 'GEOPY'
13+
components: '[{"name": "curve-apps"}]'

.github/workflows/python_deploy_dev.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ jobs:
1616
with:
1717
package-name: 'curve-apps'
1818
python-version: '3.10'
19-
source-repo-names: '["public-conda-dev-local", "conda-forge-dev-remote"]'
20-
publish-repo-names: '["public-conda-dev"]'
19+
source-repo-names: '["public-noremote-conda-dev"]'
20+
conda-channels: '["conda-forge"]'
21+
publish-repo-names: '["public-noremote-conda-dev"]'
2122
secrets:
2223
JFROG_ARTIFACTORY_URL: ${{ secrets.JFROG_ARTIFACTORY_URL }}
2324
JFROG_ARTIFACTORY_TOKEN: ${{ secrets.JFROG_ARTIFACTORY_TOKEN }}

.github/workflows/python_deploy_prod.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ concurrency:
2626
jobs:
2727
call-workflow-conda-release:
2828
name: Publish production Conda package on JFrog Artifactory
29-
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-release_conda_assets.yml@main
3029
if: ${{ github.event_name == 'release' || github.event.inputs.publish-conda == 'true' }}
30+
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-release_conda_assets.yml@main
3131
with:
32-
virtual-repo-names: '["public-conda-prod"]'
32+
virtual-repo-names: '["public-noremote-conda-prod"]'
3333
release-tag: ${{ github.event.release.tag_name || github.event.inputs.release-tag }}
3434
secrets:
3535
JFROG_ARTIFACTORY_URL: ${{ secrets.JFROG_ARTIFACTORY_URL }}

.pre-commit-config.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ repos:
1717
- id: pycln
1818
args: [--config=pyproject.toml]
1919
- repo: https://github.com/astral-sh/ruff-pre-commit
20-
rev: v0.9.1
20+
rev: v0.11.5
2121
hooks:
2222
- id: ruff
2323
args:
@@ -26,7 +26,7 @@ repos:
2626
# - --unsafe-fixes
2727
- id: ruff-format
2828
- repo: https://github.com/pre-commit/mirrors-mypy
29-
rev: v1.14.1
29+
rev: v1.15.0
3030
hooks:
3131
- id: mypy
3232
additional_dependencies: [
@@ -60,7 +60,7 @@ repos:
6060
types: [python]
6161
exclude: ^(devtools|docs|curve_apps-assets)/
6262
- repo: https://github.com/codespell-project/codespell
63-
rev: v2.3.0
63+
rev: v2.4.1
6464
hooks:
6565
- id: codespell
6666
exclude: (-lock\.ya?ml|\benvironments/.*\.ya?ml|\.ipynb|^THIRD_PARTY_SOFTWARE\.rst)$
@@ -74,7 +74,6 @@ repos:
7474
exclude_types: [jupyter]
7575
- id: check-toml
7676
- id: check-yaml
77-
exclude: ^recipe.yaml$
7877
- id: check-added-large-files
7978
- id: check-case-conflict
8079
- id: check-merge-conflict

curve_apps-assets/uijson/contours.ui.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
{
2-
"version": "0.1.0",
2+
"version": "0.2.1-alpha.1",
33
"title": "Create Contours",
4+
"documentation": "https://mirageoscience-curve-apps.readthedocs-hosted.com/en/latest/",
45
"conda_environment": "curve_apps",
56
"run_command": "curve_apps.contours.driver",
67
"geoh5": "",
78
"monitoring_directory": "",
8-
"workspace_geoh5": "",
9-
"conda_environment_boolean": false,
109
"objects": {
1110
"group": "Data",
1211
"main": true,

curve_apps-assets/uijson/edges.ui.json renamed to curve_apps-assets/uijson/edge_detection.ui.json

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
2-
"version": "0.1.0",
2+
"version": "0.2.1-alpha.1",
33
"title": "Edge Detection",
4+
"icon": "digitize_join_curve",
5+
"documentation": "https://mirageoscience-curve-apps.readthedocs-hosted.com/en/latest/",
46
"conda_environment": "curve_apps",
57
"run_command": "curve_apps.edges.driver",
68
"geoh5": "",
79
"monitoring_directory": "",
8-
"workspace_geoh5": "",
9-
"conda_environment_boolean": false,
1010
"objects": {
11-
"group": "Data Selection",
11+
"group": "Data selection",
1212
"meshType": [
1313
"{48f5054a-1c5c-4ca4-9048-80f36dc60a06}"
1414
],
@@ -17,7 +17,7 @@
1717
"value": ""
1818
},
1919
"data": {
20-
"group": "Data Selection",
20+
"group": "Data selection",
2121
"main": true,
2222
"association": [
2323
"Cell"
@@ -28,74 +28,74 @@
2828
"value": ""
2929
},
3030
"line_length": {
31-
"group": "Detection Parameters",
31+
"group": "Detection parameters",
3232
"main": true,
3333
"label": "Line length (pixels)",
3434
"min": 1,
3535
"max": 100,
3636
"value": 12,
37-
"tooltip": "The minimum length of a line segment."
37+
"tooltip": "The minimum length of a line segment"
3838
},
3939
"line_gap": {
40-
"group": "Detection Parameters",
40+
"group": "Detection parameters",
4141
"main": true,
4242
"label": "Line gap (pixels)",
4343
"min": 1,
4444
"max": 100,
4545
"value": 1,
46-
"tooltip": "The maximum gap between two pixels to be considered connected."
46+
"tooltip": "The maximum gap between two pixels to be considered connected"
4747
},
4848
"sigma": {
49-
"group": "Detection Parameters",
49+
"group": "Detection parameters",
5050
"main": true,
5151
"label": "Sigma",
5252
"value": 1.0,
5353
"min": 0.0,
5454
"precision": 1,
5555
"lineEdit": true,
5656
"max": 10.0,
57-
"tooltip": "Standard deviation of the Gaussian filter used to smooth the data."
57+
"tooltip": "Standard deviation of the Gaussian filter used to smooth the data"
5858
},
5959
"threshold": {
60-
"group": "Detection Parameters",
60+
"group": "Detection parameters",
6161
"main": true,
6262
"label": "Threshold",
6363
"min": 1,
6464
"max": 100,
6565
"precision": 1,
6666
"lineEdit": true,
6767
"value": 1,
68-
"tooltip": "Threshold value for edge detection."
68+
"tooltip": "Threshold value for edge detection"
6969
},
7070
"window_size": {
71-
"group": "Detection Parameters",
71+
"group": "Detection parameters",
7272
"main": true,
7373
"optional": true,
7474
"enabled": false,
7575
"label": "Window Size (pixels)",
7676
"min": 16,
7777
"max": 512,
7878
"value": 64,
79-
"tooltip": "The size of the moving window used to compute edges. Smaller values will result in more detailed edges, but may be more sensitive to noise."
79+
"tooltip": "The size of the moving window used to compute edges. Smaller values will result in more detailed edges, but may be more sensitive to noise"
8080
},
8181
"merge_length": {
82-
"group": "Detection Parameters",
82+
"group": "Detection parameters",
8383
"main": true,
8484
"optional": true,
8585
"enabled": false,
8686
"label": "Merge Length (m)",
8787
"min": 0,
8888
"value": 100.0,
89-
"tooltip": "If the distance between two nodes is less than this value, the nodes will be merged."
89+
"tooltip": "If the distance between two nodes is less than this value, the nodes will be merged"
9090
},
9191
"export_as": {
9292
"main": true,
9393
"label": "Save as",
9494
"value": "edges",
95-
"group": "Output Preferences"
95+
"group": "Output preferences"
9696
},
9797
"out_group": {
98-
"group": "Output Preferences",
98+
"group": "Output preferences",
9999
"label": "UIJson group",
100100
"value": "",
101101
"groupType": "{BB50AC61-A657-4926-9C82-067658E246A0}",

curve_apps-assets/uijson/trend_lines.ui.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
2-
"version": "0.1.0",
2+
"version": "0.2.1-alpha.1",
33
"title": "Trend Lines",
4+
"icon": "curve",
5+
"documentation": "https://mirageoscience-curve-apps.readthedocs-hosted.com/en/latest/",
46
"conda_environment": "curve_apps",
57
"run_command": "curve_apps.trend_lines.driver",
68
"geoh5": "",
79
"monitoring_directory": "",
8-
"workspace_geoh5": "",
9-
"conda_environment_boolean": false,
1010
"entity": {
11-
"group": "Data Selection",
11+
"group": "Data selection",
1212
"meshType": [
1313
"{6A057FDC-B355-11E3-95BE-FD84A7FFCB88}",
1414
"{202c5db1-a56d-4004-9cad-baafd8899406}"
@@ -18,7 +18,7 @@
1818
"value": ""
1919
},
2020
"data": {
21-
"group": "Data Selection",
21+
"group": "Data selection",
2222
"main": true,
2323
"association": [
2424
"Vertex"
@@ -31,7 +31,7 @@
3131
"value": ""
3232
},
3333
"parts": {
34-
"group": "Connection Filters",
34+
"group": "Connection filters",
3535
"main": true,
3636
"association": [
3737
"Vertex"
@@ -49,15 +49,15 @@
4949
"value": ""
5050
},
5151
"min_edges": {
52-
"group": "Connection Filters",
52+
"group": "Connection filters",
5353
"main": true,
5454
"label": "Minimum edges",
5555
"min": 1,
5656
"value": 1,
5757
"enabled": true
5858
},
5959
"max_distance": {
60-
"group": "Connection Filters",
60+
"group": "Connection filters",
6161
"main": true,
6262
"optional": true,
6363
"enabled": false,
@@ -66,7 +66,7 @@
6666
"value": 1
6767
},
6868
"damping": {
69-
"group": "Connection Filters",
69+
"group": "Connection filters",
7070
"main": true,
7171
"label": "Damping factor:",
7272
"value": 1.0,
@@ -105,10 +105,10 @@
105105
"main": true,
106106
"label": "Save as",
107107
"value": "trendlines",
108-
"group": "Output Preferences"
108+
"group": "Output preferences"
109109
},
110110
"out_group": {
111-
"group": "Output Preferences",
111+
"group": "Output preferences",
112112
"label": "UIJson group",
113113
"value": "",
114114
"groupType": "{BB50AC61-A657-4926-9C82-067658E246A0}",

curve_apps/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
from pathlib import Path
1515

1616

17-
__version__ = "0.3.0-alpha.1"
17+
__version__ = "0.2.1"
1818
logging.basicConfig(level=logging.INFO)
1919

2020

curve_apps/edges/params.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ class EdgeParameters(BaseData):
8080
"""
8181

8282
name: ClassVar[str] = "edges"
83-
default_ui_json: ClassVar[Path] = assets_path() / "uijson/edges.ui.json"
83+
default_ui_json: ClassVar[Path] = assets_path() / "uijson/edge_detection.ui.json"
8484
title: ClassVar[str] = "Edge Detection"
8585
run_command: ClassVar[str] = "curve_apps.edges.driver"
8686

0 commit comments

Comments
 (0)