Skip to content

Merge release to develop #130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sebhmg merged 18 commits into from
Jan 12, 2025
Merged

Merge release to develop #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
ff1efc1
Update copyright
benk-mira Jan 8, 2025
7971dbc
[GEOPY-1933] Fix copyright block repeated lines
benk-mira Jan 10, 2025
d314f07
[GEOPY-1933] also check copyright in package.rst
sebhmg Jan 10, 2025
5ad8e45
[GEOPY-1933] tweak configuration for copyrights
sebhmg Jan 10, 2025
b830254
[GEOPY-1933] apply shorter copyright statements
sebhmg Jan 10, 2025
dc40078
[GEOPY-1933] auto-formatting after pre-commit update
sebhmg Jan 10, 2025
92d4875
[GEOPY-1933] bump leftover copyright year
sebhmg Jan 10, 2025
f76e07e
[GEOPY-1933] update to latest mira pre-commit-hooks
sebhmg Jan 11, 2025
564e142
Merge pull request #127 from MiraGeoscience/GEOPY-1933
sebhmg Jan 11, 2025
9d3fd42
[GEOPY-1935] relock on newer versions
sebhmg Jan 11, 2025
4079048
[GEOPY-1935] bump version to rc.1
sebhmg Jan 11, 2025
e2bd1f7
Merge pull request #129 from sebhmg/GEOPY-1935
sebhmg Jan 11, 2025
3fb437d
Merge branch 'release/0.2.0' into merge_release_to_develop
sebhmg Jan 12, 2025
af08911
relock dependencies
sebhmg Jan 12, 2025
fec3206
update copyright statement
sebhmg Jan 12, 2025
0d81634
[GEOPY-1933] fix typo in copyright statements
sebhmg Jan 12, 2025
36b9247
Merge branch 'release/0.2.0' into merge_release_to_develop
sebhmg Jan 12, 2025
dad2df2
update remaining copyright statements
sebhmg Jan 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .idea/copyright/MiraGeoscience.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 7 additions & 1 deletion .idea/copyright/profiles_settings.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .idea/scopes/sources.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 8 additions & 5 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ ci:

repos:
- repo: https://github.com/hadialqattan/pycln
rev: v2.4.0
rev: v2.5.0
hooks:
- id: pycln
args: [--config=pyproject.toml]
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.8.1
rev: v0.9.1
hooks:
- id: ruff
args:
Expand All @@ -42,11 +42,14 @@ repos:
- id: relint
args: [-W] # to fail on warnings
- repo: https://github.com/MiraGeoscience/pre-commit-hooks
rev: v1.0.1
rev: v1.1.0
hooks:
- id: check-copyright
files: (^LICENSE|^README(|-dev).rst|\.py|\.pyi)$
exclude: (^\.|^docs/)
files: (^package\.rst|LICENSE|^README(|-dev).rst|^docs/intro\.md|\.py|\.pyi)$
exclude: (^\.|^docs/(?!intro\.md))
args:
- --full-scan-files
- intro.md
- id: prepare-commit-msg
- id: check-commit-msg
- repo: local
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2024 Mira Geoscience
Copyright (c) 2023-2025 Mira Geoscience Ltd.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
3 changes: 1 addition & 2 deletions README-dev.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

Setup for development
=====================

Expand Down Expand Up @@ -335,4 +334,4 @@ Here is a suggestion for some plugins you can install in PyCharm.

Copyright
^^^^^^^^^
Copyright (c) 2024 Mira Geoscience Ltd.
Copyright (c) 2023-2025 Mira Geoscience Ltd.
2 changes: 1 addition & 1 deletion README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,4 +168,4 @@ Third Party Software notices and/or additional terms and conditions are located

Copyright
^^^^^^^^^
Copyright (c) 2024 Mira Geoscience Ltd.
Copyright (c) 2023-2025 Mira Geoscience Ltd.
10 changes: 9 additions & 1 deletion devtools/sync_files.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
# Copyright (c) 2024 Mira Geoscience Ltd.
# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
# Copyright (c) 2024-2025 Mira Geoscience Ltd. '
# '
# This file is part of simpeg-drivers package. '
# '
# simpeg-drivers is distributed under the terms and conditions of the MIT License '
# (see LICENSE file at the root of this source code package). '
# '
# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
#
# This file is part of python-training.

Expand Down
2 changes: 1 addition & 1 deletion docs/intro.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ This document contains training material for geophysical inversions using [SimPE
```{bibliography}
```

Copyright (c) 2024 Mira Geoscience Ltd.
Copyright (c) 2024-2025 Mira Geoscience Ltd.
Loading
Loading