Skip to content

Commit 124e817

Browse files
committed
Merge branch 'develop' into GEOPY-2384
# Conflicts: # geoapps/block_model_creation/driver.py # geoapps/block_model_creation/params.py # geoapps/inversion/potential_fields/application.py # geoapps/utils/write_default_uijson.py # tests/data_transfer_test.py # tests/write_default_uijson_test.py
2 parents bfdea17 + 625b5c3 commit 124e817

151 files changed

Lines changed: 169 additions & 166 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/dependabot.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ version: 2
77
updates:
88
- package-ecosystem: "github-actions"
99
directory: "/"
10-
schedule:
11-
interval: "monthly"
1210
target-branch: "develop"
11+
schedule:
12+
interval: "weekly"
13+
cooldown:
14+
default-days: 4

.github/workflows/issue_to_jira.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
jobs:
1111
call-workflow-create-jira-issue:
1212
if: startsWith(github.repository, 'MiraGeoscience/') # run on the Mira repo only
13-
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-jira-issue_to_jira.yml@main
13+
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-jira-issue_to_jira.yml@v2
1414
secrets:
1515
JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
1616
JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }}

.github/workflows/pr_add_jira_summary.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ permissions:
1010
jobs:
1111
call-workflow-add-jira-issue-summary:
1212
if: startsWith(github.event.pull_request.head.repo.full_name, 'MiraGeoscience/') # run if PR originates from the Mira repo only
13-
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-jira-pr_add_jira_summary.yml@main
13+
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-jira-pr_add_jira_summary.yml@v2
1414
permissions:
1515
contents: read
1616
pull-requests: write

.github/workflows/python_analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
permissions:
2828
contents: read
2929
pull-requests: read
30-
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-static_analysis.yml@main
30+
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-static_analysis.yml@v2
3131
with:
3232
package-manager: 'conda'
3333
app-name: 'geoapps'
@@ -38,7 +38,7 @@ jobs:
3838
permissions:
3939
contents: read
4040
pull-requests: read
41-
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-pytest.yml@main
41+
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-pytest.yml@v2
4242
with:
4343
package-manager: 'conda'
4444
python-versions: '["3.10", "3.11", "3.12"]'

.github/workflows/zizmor-security.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ jobs:
2323
permissions:
2424
contents: read
2525
actions: read
26-
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-zizmor-security.yml@main
26+
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-zizmor-security.yml@v2

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2020-2025 Mira Geoscience
3+
Copyright (c) 2020-2026 Mira Geoscience
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README-dev.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,4 +362,4 @@ Here is a suggestion for some plugins you can install in PyCharm.
362362

363363
Copyright
364364
^^^^^^^^^
365-
Copyright (c) 2020-2025 Mira Geoscience Ltd.
365+
Copyright (c) 2020-2026 Mira Geoscience Ltd.

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,4 +206,4 @@ Third Party Software notices and/or additional terms and conditions are located
206206

207207
Copyright
208208
^^^^^^^^^
209-
Copyright (c) 2020-2025 Mira Geoscience Ltd.
209+
Copyright (c) 2020-2026 Mira Geoscience Ltd.

geoapps-assets/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
2-
# Copyright (c) 2023-2025 Mira Geoscience Ltd. '
2+
# Copyright (c) 2023-2026 Mira Geoscience Ltd. '
33
# '
44
# This file is part of geoapps. '
55
# '

geoapps-assets/uijson/cluster.ui.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
},
3030
"downsampling": {
3131
"group": "Data Selection",
32-
"label": "Population Downsampling (%)",
32+
"label": "Population downsampling (%)",
3333
"main": true,
3434
"min": 1,
3535
"max": 100,
@@ -409,7 +409,7 @@
409409
},
410410
"size_markers": {
411411
"group": "Size",
412-
"label": "Marker Size",
412+
"label": "Marker size",
413413
"main": true,
414414
"min": 1,
415415
"max": 100,

0 commit comments

Comments
 (0)