Skip to content
This repository was archived by the owner on Aug 21, 2025. It is now read-only.

Commit ec5b2cb

Browse files
committed
Merge branch 'release/0.2.0'
2 parents 16a4eac + 266508e commit ec5b2cb

46 files changed

Lines changed: 10282 additions & 4281 deletions

Some content is hidden

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

.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": "plate-simulation"}]'

.github/workflows/python_analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-pytest.yml@main
3939
with:
4040
package-manager: 'conda'
41-
python-versions: '["3.10", "3.11"]'
41+
python-versions: '["3.10", "3.11", "3.12"]'
4242
os: '["ubuntu-latest", "windows-latest"]'
4343
cache-number: 1
4444
codecov-reference-python-version: '3.10'

.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: 'plate-simulation'
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: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,12 @@ on:
1111
publish-conda:
1212
description: 'Publish Conda package'
1313
required: false
14+
type: boolean
1415
default: true
1516
publish-pypi:
1617
description: 'Publish PyPI package'
1718
required: false
19+
type: boolean
1820
default: true
1921

2022
concurrency:
@@ -24,10 +26,10 @@ concurrency:
2426
jobs:
2527
call-workflow-conda-release:
2628
name: Publish production Conda package on JFrog Artifactory
27-
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-release_conda_assets.yml@main
2829
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
2931
with:
30-
virtual-repo-names: '["public-conda-prod"]'
32+
virtual-repo-names: '["public-noremote-conda-prod"]'
3133
release-tag: ${{ github.event.release.tag_name || github.event.inputs.release-tag }}
3234
secrets:
3335
JFROG_ARTIFACTORY_URL: ${{ secrets.JFROG_ARTIFACTORY_URL }}

.pre-commit-config.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ci:
1212

1313
repos:
1414
- repo: https://github.com/astral-sh/ruff-pre-commit
15-
rev: v0.9.1
15+
rev: v0.9.4
1616
hooks:
1717
- id: ruff
1818
args:
@@ -54,7 +54,7 @@ repos:
5454
types: [python]
5555
exclude: ^(devtools|docs|plate_simulation-assets)/
5656
- repo: https://github.com/codespell-project/codespell
57-
rev: v2.3.0
57+
rev: v2.4.1
5858
hooks:
5959
- id: codespell
6060
exclude: (-lock\.ya?ml|\benvironments/.*\.ya?ml|\.ipynb|^THIRD_PARTY_SOFTWARE\.rst)$
@@ -66,7 +66,6 @@ repos:
6666
exclude: \.mdj$
6767
- id: check-toml
6868
- id: check-yaml
69-
exclude: ^recipe.yaml$
7069
- id: check-added-large-files
7170
- id: check-case-conflict
7271
- id: check-merge-conflict

README-dev.rst

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
Setup for development
32
=====================
43

@@ -363,7 +362,27 @@ Here is a suggestion for some plugins you can install in PyCharm.
363362

364363
License
365364
^^^^^^^
366-
# TODO: ADD LICENSE TERMS
365+
MIT License
366+
367+
Copyright (c) 2024-2025 Mira Geoscience
368+
369+
Permission is hereby granted, free of charge, to any person obtaining a copy
370+
of this software and associated documentation files (the "Software"), to deal
371+
in the Software without restriction, including without limitation the rights
372+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
373+
copies of the Software, and to permit persons to whom the Software is
374+
furnished to do so, subject to the following conditions:
375+
376+
The above copyright notice and this permission notice shall be included in all
377+
copies or substantial portions of the Software.
378+
379+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
380+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
381+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
382+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
383+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
384+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
385+
SOFTWARE.
367386

368387

369388
Copyright

README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
:alt: Maintainability
3535

3636

37-
plate-simulation: # TODO: SHORT DESCRIPTION
38-
=========================================================================
37+
plate-simulation
38+
================
3939
**plate-simulation** is a package for creating a specialized mesh, model and simulation for
4040
a particular parameterization of the halfspace + overburden and plate geological setting.
4141

deps-lock-config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ include_dev: True
22
py_versions:
33
- "3.10"
44
- "3.11"
5+
- "3.12"

environments/env-python-3.12.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
dependencies:
2+
- python=3.12.*
3+
- pip

0 commit comments

Comments
 (0)