Merge remote-tracking branch 'upstream/release/0.2.0' into merge_rele…

…ase_to_develop # Conflicts: # curve_apps/__init__.py # docs/source/conf.py # environments/py-3.10-linux-64-dev.conda.lock.yml # environments/py-3.10-linux-64.conda.lock.yml # environments/py-3.10-win-64-dev.conda.lock.yml # environments/py-3.10-win-64.conda.lock.yml # environments/py-3.11-linux-64-dev.conda.lock.yml # environments/py-3.11-linux-64.conda.lock.yml # environments/py-3.11-win-64-dev.conda.lock.yml # environments/py-3.11-win-64.conda.lock.yml # environments/py-3.12-linux-64-dev.conda.lock.yml # environments/py-3.12-linux-64.conda.lock.yml # environments/py-3.12-win-64-dev.conda.lock.yml # environments/py-3.12-win-64.conda.lock.yml # meta.yaml # py-3.10.conda-lock.yml # py-3.11.conda-lock.yml # py-3.12.conda-lock.yml # pyproject.toml
MiraGeoscience · Jan 12, 2025 · f967166 · f967166
2 parents 5d104dd + 1b0dc6e
commit f967166
Show file tree

Hide file tree

Showing 34 changed files with 272 additions and 285 deletions.
diff --git a/.idea/copyright/MiraGeoscience.xml b/.idea/copyright/MiraGeoscience.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/.idea/scopes/sources.xml b/.idea/scopes/sources.xml
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -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.6.9
+    rev: v0.9.1
     hooks:
     -   id: ruff
         args:
@@ -26,7 +26,7 @@ repos:
 #        -   --unsafe-fixes
     -   id: ruff-format
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.12.0
+    rev: v1.14.1
     hooks:
     -   id: mypy
         additional_dependencies: [
@@ -38,15 +38,15 @@ repos:
         ]
         exclude: ^(docs|curve_apps-assets)/
 -   repo: https://github.com/codingjoe/relint
-    rev: 3.2.0
+    rev: 3.3.1
     hooks:
     -   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)$
+        files: (^package\.rst|^LICENSE|^README(|-dev)\.rst|\.py|\.pyi)$
         exclude: (^\.|^docs/)
     -   id: prepare-commit-msg
     -   id: check-commit-msg

diff --git a/.rstcheck.cfg b/.rstcheck.cfg
@@ -1,3 +1,4 @@
 [rstcheck]
 ignore_directives=automodule,automethod,include
 report_level=WARNING
+ignore_substitutions = copyright_notice
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023-2024 Mira Geoscience
+Copyright (c) 2023-2025 Mira Geoscience
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README-dev.rst b/README-dev.rst
@@ -1,4 +1,3 @@
-
 Setup for development
 =====================
 
@@ -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.
diff --git a/README.rst b/README.rst
@@ -1,9 +1,9 @@
-|coverage| |maintainability| |precommit_ci| |docs| |style| |version| |status| |pyversions|
+|coverage| |precommit_ci| |docs| |style| |version| |status| |pyversions|
 
 
-.. |docs| image:: https://readthedocs.org/projects/curve-apps/badge/
+.. |docs| image:: https://readthedocs.com/projects/mirageoscience-curve-apps/badge/?version=latest
     :alt: Documentation Status
-    :target: https://curve-apps.readthedocs.io/en/latest/?badge=latest
+    :target: https://mirageoscience-curve-apps.readthedocs-hosted.com/en/latest/?badge=latest
 
 .. |coverage| image:: https://codecov.io/gh/MiraGeoscience/curve-apps/branch/develop/graph/badge.svg
     :alt: Code coverage
@@ -13,25 +13,27 @@
     :alt: Coding style
     :target: https://github.com/pf/black
 
-.. |version| image:: https://img.shields.io/pypi/v/edge-detection.svg
+.. |version| image:: https://img.shields.io/pypi/v/curve-apps.svg
     :alt: version on PyPI
-    :target: https://pypi.python.org/pypi/edge-detection/
+    :target: https://pypi.python.org/pypi/curve-apps/
 
-.. |status| image:: https://img.shields.io/pypi/status/edge-detection.svg
+.. |status| image:: https://img.shields.io/pypi/status/curve-apps.svg
     :alt: version status on PyPI
-    :target: https://pypi.python.org/pypi/edge-detection/
+    :target: https://pypi.python.org/pypi/curve-apps/
 
-.. |pyversions| image:: https://img.shields.io/pypi/pyversions/edge-detection.svg
+.. |pyversions| image:: https://img.shields.io/pypi/pyversions/curve-apps.svg
     :alt: Python versions
-    :target: https://pypi.python.org/pypi/edge-detection/
+    :target: https://pypi.python.org/pypi/curve-apps/
 
-.. |precommit_ci| image:: https://results.pre-commit.ci/badge/github/MiraGeoscience/edge-detection/develop.svg
+.. |precommit_ci| image:: https://results.pre-commit.ci/badge/github/MiraGeoscience/curve-apps/develop.svg
     :alt: pre-commit.ci status
-    :target: https://results.pre-commit.ci/latest/github/MiraGeoscience/edge-detection/develop
+    :target: https://results.pre-commit.ci/latest/github/MiraGeoscience/curve-apps/develop
+
+.. TODO: configure Code Climate and add top |maintainability| link new |coverage|
+    .. |maintainability| image:: https://api.codeclimate.com/v1/badges/_token_/maintainability
+    :target: https://codeclimate.com/github/MiraGeoscience/curve-apps/maintainability
+    :alt: Maintainability
 
-.. |maintainability| image:: https://api.codeclimate.com/v1/badges/_token_/maintainability
-   :target: https://codeclimate.com/github/MiraGeoscience/edge-detection/maintainability
-   :alt: Maintainability
 
 
 curve-apps
@@ -45,7 +47,7 @@ Auto-detection of trends and edges in geoscientific data.
 
 Documentation
 ^^^^^^^^^^^^^
-`Online documentation <https://edge-detection.readthedocs.io/en/latest/>`_
+`Online documentation <https://mirageoscience-curve-apps.readthedocs-hosted.com/en/latest/>`_
 
 
 Installation
@@ -160,4 +162,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.
diff --git a/curve_apps-assets/__init__.py b/curve_apps-assets/__init__.py
@@ -1,12 +1,11 @@
-#  '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-#  Copyright (c) 2024 Mira Geoscience Ltd.                                       '
-#                                                                                '
-#  All rights reserved.                                                          '
-#                                                                                '
-#  This file is part of curve-apps.                                              '
-#                                                                                '
-#  curve-apps is distributed under the terms and conditions of the MIT License   '
-#  (see LICENSE file at the root of this source code package).                   '
-#  '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+# ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+#  Copyright (c) 2024-2025 Mira Geoscience Ltd.                                '
+#                                                                              '
+#  This file is part of curve-apps package.                                    '
+#                                                                              '
+#  curve-apps is distributed under the terms and conditions of the MIT License '
+#  (see LICENSE file at the root of this source code package).                 '
+#                                                                              '
+# ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
 
 # pylint: disable=invalid-name
diff --git a/curve_apps/__init__.py b/curve_apps/__init__.py
@@ -1,13 +1,12 @@
-#  '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-#  Copyright (c) 2024 Mira Geoscience Ltd.                                       '
-#                                                                                '
-#  All rights reserved.                                                          '
-#                                                                                '
-#  This file is part of curve-apps.                                              '
-#                                                                                '
-#  curve-apps is distributed under the terms and conditions of the MIT License   '
-#  (see LICENSE file at the root of this source code package).                   '
-#  '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+# ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+#  Copyright (c) 2024-2025 Mira Geoscience Ltd.                                '
+#                                                                              '
+#  This file is part of curve-apps package.                                    '
+#                                                                              '
+#  curve-apps is distributed under the terms and conditions of the MIT License '
+#  (see LICENSE file at the root of this source code package).                 '
+#                                                                              '
+# ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
 
 from __future__ import annotations
 

diff --git a/curve_apps/contours/__init__.py b/curve_apps/contours/__init__.py
@@ -1,13 +1,9 @@
-#  '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-#  Copyright (c) 2024 Mira Geoscience Ltd.                                       '
-#                                                                                '
-#  This file is part of contours package.                                        '
-#                                                                                '
-#  All rights reserved.                                                          '
-#                                                                                '
-#                                                                                '
-#  This file is part of curve-apps.                                              '
-#                                                                                '
-#  curve-apps is distributed under the terms and conditions of the MIT License   '
-#  (see LICENSE file at the root of this source code package).                   '
-#  '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+# ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+#  Copyright (c) 2024-2025 Mira Geoscience Ltd.                                '
+#                                                                              '
+#  This file is part of curve-apps package.                                    '
+#                                                                              '
+#  curve-apps is distributed under the terms and conditions of the MIT License '
+#  (see LICENSE file at the root of this source code package).                 '
+#                                                                              '
+# ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
diff --git a/curve_apps/contours/driver.py b/curve_apps/contours/driver.py
@@ -1,16 +1,12 @@
-#  '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-#  Copyright (c) 2024 Mira Geoscience Ltd.                                       '
-#                                                                                '
-#  This file is part of contours package.                                        '
-#                                                                                '
-#  All rights reserved.                                                          '
-#                                                                                '
-#                                                                                '
-#  This file is part of curve-apps.                                              '
-#                                                                                '
-#  curve-apps is distributed under the terms and conditions of the MIT License   '
-#  (see LICENSE file at the root of this source code package).                   '
-#  '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+# ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+#  Copyright (c) 2024-2025 Mira Geoscience Ltd.                                '
+#                                                                              '
+#  This file is part of curve-apps package.                                    '
+#                                                                              '
+#  curve-apps is distributed under the terms and conditions of the MIT License '
+#  (see LICENSE file at the root of this source code package).                 '
+#                                                                              '
+# ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
 
 from __future__ import annotations
 

diff --git a/curve_apps/contours/params.py b/curve_apps/contours/params.py
@@ -1,16 +1,12 @@
-#  '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-#  Copyright (c) 2024 Mira Geoscience Ltd.                                       '
-#                                                                                '
-#  This file is part of contours package.                                        '
-#                                                                                '
-#  All rights reserved.                                                          '
-#                                                                                '
-#                                                                                '
-#  This file is part of curve-apps.                                              '
-#                                                                                '
-#  curve-apps is distributed under the terms and conditions of the MIT License   '
-#  (see LICENSE file at the root of this source code package).                   '
-#  '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+# ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+#  Copyright (c) 2024-2025 Mira Geoscience Ltd.                                '
+#                                                                              '
+#  This file is part of curve-apps package.                                    '
+#                                                                              '
+#  curve-apps is distributed under the terms and conditions of the MIT License '
+#  (see LICENSE file at the root of this source code package).                 '
+#                                                                              '
+# ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
 
 from __future__ import annotations
 

diff --git a/curve_apps/driver.py b/curve_apps/driver.py
@@ -1,13 +1,12 @@
-#  '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-#  Copyright (c) 2024 Mira Geoscience Ltd.                                       '
-#                                                                                '
-#  All rights reserved.                                                          '
-#                                                                                '
-#  This file is part of curve-apps.                                              '
-#                                                                                '
-#  curve-apps is distributed under the terms and conditions of the MIT License   '
-#  (see LICENSE file at the root of this source code package).                   '
-#  '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+# ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+#  Copyright (c) 2024-2025 Mira Geoscience Ltd.                                '
+#                                                                              '
+#  This file is part of curve-apps package.                                    '
+#                                                                              '
+#  curve-apps is distributed under the terms and conditions of the MIT License '
+#  (see LICENSE file at the root of this source code package).                 '
+#                                                                              '
+# ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
 
 from __future__ import annotations
 

diff --git a/curve_apps/edges/__init__.py b/curve_apps/edges/__init__.py
@@ -1,13 +1,9 @@
-#  '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-#  Copyright (c) 2024 Mira Geoscience Ltd.                                       '
-#                                                                                '
-#  This file is part of edges package.                                           '
-#                                                                                '
-#  All rights reserved.                                                          '
-#                                                                                '
-#                                                                                '
-#  This file is part of curve-apps.                                              '
-#                                                                                '
-#  curve-apps is distributed under the terms and conditions of the MIT License   '
-#  (see LICENSE file at the root of this source code package).                   '
-#  '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+# ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+#  Copyright (c) 2024-2025 Mira Geoscience Ltd.                                '
+#                                                                              '
+#  This file is part of curve-apps package.                                    '
+#                                                                              '
+#  curve-apps is distributed under the terms and conditions of the MIT License '
+#  (see LICENSE file at the root of this source code package).                 '
+#                                                                              '
+# ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''