diff --git a/.gitignore b/.gitignore index 9380d78..052dc93 100644 --- a/.gitignore +++ b/.gitignore @@ -127,7 +127,6 @@ venv.bak/ /.idea/* !/.idea/scopes/ !/.idea/copyright/ -!/.idea/*.iml # mypy .mypy_cache/ diff --git a/.idea/copyright/MiraGeoscience.xml b/.idea/copyright/MiraGeoscience.xml index 99351b8..9ac7b3c 100644 --- a/.idea/copyright/MiraGeoscience.xml +++ b/.idea/copyright/MiraGeoscience.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/.idea/python-conda-template.iml b/.idea/python-conda-template.iml deleted file mode 100644 index d2936d1..0000000 --- a/.idea/python-conda-template.iml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - diff --git a/.idea/scopes/sources.xml b/.idea/scopes/sources.xml index 28b68b8..ac894b6 100644 --- a/.idea/scopes/sources.xml +++ b/.idea/scopes/sources.xml @@ -1,3 +1,3 @@ - - + + \ No newline at end of file diff --git a/.idea/surface-apps.iml b/.idea/surface-apps.iml deleted file mode 100644 index 292aeb0..0000000 --- a/.idea/surface-apps.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b81073c..85cc6eb 100644 --- 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: @@ -28,7 +28,7 @@ repos: - id: ruff-format exclude: ^docs/ - repo: https://github.com/pre-commit/mirrors-mypy - rev: v1.12.0 + rev: v1.14.1 hooks: - id: mypy additional_dependencies: [ @@ -39,15 +39,15 @@ repos: ] exclude: ^(docs|surface_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 index 587ae94..2776a16 100644 --- a/.rstcheck.cfg +++ b/.rstcheck.cfg @@ -1,3 +1,4 @@ [rstcheck] ignore_directives=automodule,include report_level=WARNING +ignore_substitutions = copyright_notice diff --git a/LICENSE b/LICENSE index 2bc2331..42da102 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2023-2024 Mira Geoscience +Copyright (c) 2024-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 index 6dc4ff2..e4bd585 100644 --- a/README-dev.rst +++ b/README-dev.rst @@ -368,4 +368,4 @@ License Copyright ^^^^^^^^^ -Copyright (c) 2024 Mira Geoscience Ltd. +Copyright (c) 2024-2025 Mira Geoscience Ltd. diff --git a/README.rst b/README.rst index 9bbdb70..6188cbe 100644 --- a/README.rst +++ b/README.rst @@ -160,4 +160,4 @@ Third Party Software notices and/or additional terms and conditions are located Copyright ^^^^^^^^^ -Copyright (c) 2024 Mira Geoscience Ltd. +Copyright (c) 2024-2025 Mira Geoscience Ltd. diff --git a/surface_apps-assets/__init__.py b/surface_apps-assets/__init__.py index 05d11f9..396c659 100644 --- a/surface_apps-assets/__init__.py +++ b/surface_apps-assets/__init__.py @@ -1,7 +1,8 @@ # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' -# Copyright (c) 2024 Mira Geoscience Ltd. ' +# Copyright (c) 2024-2025 Mira Geoscience Ltd. ' # ' # This file is part of surface-apps package. ' # ' -# All rights reserved. ' +# surface-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/surface_apps/__init__.py b/surface_apps/__init__.py index 0fbbe69..ebf0365 100644 --- a/surface_apps/__init__.py +++ b/surface_apps/__init__.py @@ -1,9 +1,10 @@ # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' -# Copyright (c) 2022-2024 Mira Geoscience Ltd. ' +# Copyright (c) 2024-2025 Mira Geoscience Ltd. ' # ' -# This file is part of surface-apps package. ' +# This file is part of surface-apps package. ' # ' -# All rights reserved. ' +# surface-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/surface_apps/driver.py b/surface_apps/driver.py index 86ab977..f94ca0d 100644 --- a/surface_apps/driver.py +++ b/surface_apps/driver.py @@ -1,9 +1,10 @@ # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' -# Copyright (c) 2022-2024 Mira Geoscience Ltd. ' +# Copyright (c) 2024-2025 Mira Geoscience Ltd. ' # ' -# This file is part of surface-apps package. ' +# This file is part of surface-apps package. ' # ' -# All rights reserved. ' +# surface-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/surface_apps/iso_surfaces/__init__.py b/surface_apps/iso_surfaces/__init__.py index 05d11f9..396c659 100644 --- a/surface_apps/iso_surfaces/__init__.py +++ b/surface_apps/iso_surfaces/__init__.py @@ -1,7 +1,8 @@ # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' -# Copyright (c) 2024 Mira Geoscience Ltd. ' +# Copyright (c) 2024-2025 Mira Geoscience Ltd. ' # ' # This file is part of surface-apps package. ' # ' -# All rights reserved. ' +# surface-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/surface_apps/iso_surfaces/driver.py b/surface_apps/iso_surfaces/driver.py index 9396581..8945af7 100644 --- a/surface_apps/iso_surfaces/driver.py +++ b/surface_apps/iso_surfaces/driver.py @@ -1,9 +1,10 @@ # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' -# Copyright (c) 2024 Mira Geoscience Ltd. ' +# Copyright (c) 2024-2025 Mira Geoscience Ltd. ' # ' # This file is part of surface-apps package. ' # ' -# All rights reserved. ' +# surface-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/surface_apps/iso_surfaces/params.py b/surface_apps/iso_surfaces/params.py index a6d2edb..ebf392c 100644 --- a/surface_apps/iso_surfaces/params.py +++ b/surface_apps/iso_surfaces/params.py @@ -1,9 +1,10 @@ # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' -# Copyright (c) 2024 Mira Geoscience Ltd. ' +# Copyright (c) 2024-2025 Mira Geoscience Ltd. ' # ' # This file is part of surface-apps package. ' # ' -# All rights reserved. ' +# surface-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/surface_apps/iso_surfaces/utils.py b/surface_apps/iso_surfaces/utils.py index 24c3483..4358843 100644 --- a/surface_apps/iso_surfaces/utils.py +++ b/surface_apps/iso_surfaces/utils.py @@ -1,9 +1,10 @@ # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' -# Copyright (c) 2024 Mira Geoscience Ltd. ' +# Copyright (c) 2024-2025 Mira Geoscience Ltd. ' # ' # This file is part of surface-apps package. ' # ' -# All rights reserved. ' +# surface-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/tests/__init__.py b/tests/__init__.py index 6eabdf0..396c659 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,7 +1,8 @@ # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' -# Copyright (c) 2022-2024 Mira Geoscience Ltd. ' +# Copyright (c) 2024-2025 Mira Geoscience Ltd. ' # ' -# This file is part of surface-apps package. ' +# This file is part of surface-apps package. ' # ' -# All rights reserved. ' +# surface-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/tests/assets_path_test.py b/tests/assets_path_test.py index 996d52d..5e10d20 100644 --- a/tests/assets_path_test.py +++ b/tests/assets_path_test.py @@ -1,9 +1,10 @@ # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' -# Copyright (c) 2024 Mira Geoscience Ltd. ' +# Copyright (c) 2024-2025 Mira Geoscience Ltd. ' # ' # This file is part of surface-apps package. ' # ' -# All rights reserved. ' +# surface-apps is distributed under the terms and conditions of the MIT License +# (see LICENSE file at the root of this source code package). ' # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' from surface_apps import assets_path diff --git a/tests/run_tests/__init__.py b/tests/run_tests/__init__.py index 05d11f9..396c659 100644 --- a/tests/run_tests/__init__.py +++ b/tests/run_tests/__init__.py @@ -1,7 +1,8 @@ # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' -# Copyright (c) 2024 Mira Geoscience Ltd. ' +# Copyright (c) 2024-2025 Mira Geoscience Ltd. ' # ' # This file is part of surface-apps package. ' # ' -# All rights reserved. ' +# surface-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/tests/run_tests/iso_surfaces_test.py b/tests/run_tests/iso_surfaces_test.py index 3f96404..073adf2 100644 --- a/tests/run_tests/iso_surfaces_test.py +++ b/tests/run_tests/iso_surfaces_test.py @@ -1,9 +1,10 @@ # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' -# Copyright (c) 2024 Mira Geoscience Ltd. ' +# Copyright (c) 2024-2025 Mira Geoscience Ltd. ' # ' # This file is part of surface-apps package. ' # ' -# All rights reserved. ' +# surface-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/tests/utils_test.py b/tests/utils_test.py index 2eb5ed5..c418677 100644 --- a/tests/utils_test.py +++ b/tests/utils_test.py @@ -1,9 +1,10 @@ # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' -# Copyright (c) 2024 Mira Geoscience Ltd. ' +# Copyright (c) 2024-2025 Mira Geoscience Ltd. ' # ' # This file is part of surface-apps package. ' # ' -# All rights reserved. ' +# surface-apps is distributed under the terms and conditions of the MIT License +# (see LICENSE file at the root of this source code package). ' # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' import numpy as np diff --git a/tests/version_test.py b/tests/version_test.py index 3ed054e..c76464a 100644 --- a/tests/version_test.py +++ b/tests/version_test.py @@ -1,9 +1,10 @@ # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' -# Copyright (c) 2022-2024 Mira Geoscience Ltd. ' +# Copyright (c) 2024-2025 Mira Geoscience Ltd. ' # ' -# This file is part of surface-apps package. ' +# This file is part of surface-apps package. ' # ' -# All rights reserved. ' +# surface-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