Skip to content

Commit

Permalink
Merge pull request #75 from sebhmg/GEOPY-1933
Browse files Browse the repository at this point in the history
GEOPY-1933: Update copyright date to 2025
  • Loading branch information
sebhmg authored Jan 10, 2025
2 parents 13b6b6b + d0cadde commit 5e11751
Show file tree
Hide file tree
Showing 13 changed files with 97 additions and 66 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,8 @@
.idea
/tests/**/*.geoh5
/dist/**

#pycharm
/.idea/*
!/.idea/scopes/
!/.idea/copyright/
12 changes: 6 additions & 6 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ repos:
- id: poetry-check
args: [--lock]
- 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.7.0
rev: v0.9.0
hooks:
- id: ruff
args:
Expand All @@ -31,7 +31,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: [
Expand All @@ -42,15 +42,15 @@ repos:
]
exclude: ^docs/
- 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.0.2
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
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2024 Mira Geoscience
Copyright (c) 2022-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
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,4 @@ Third Party Software notices and/or additional terms and conditions are located

Copyright
^^^^^^^^^
Copyright (c) 2024 Mira Geoscience Ltd.
Copyright (c) 2022-2025 Mira Geoscience Ltd.
16 changes: 9 additions & 7 deletions param_sweeps/__init__.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
# Copyright (c) 2024 Mira Geoscience Ltd.
#
# This file is part of param-sweeps.
#
# param-sweeps is distributed under the terms and conditions of the MIT License
# (see LICENSE file at the root of this source code package).

# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
# Copyright (c) 2022-2025 Mira Geoscience Ltd. '
# '
# This file is part of param-sweeps package. '
# '
# param-sweeps is distributed under the terms and conditions of the MIT License '
# (see LICENSE file at the root of this source code package). '
# '
# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''

__version__ = "0.2.0-beta.2"
15 changes: 9 additions & 6 deletions param_sweeps/constants.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
# Copyright (c) 2024 Mira Geoscience Ltd.
#
# This file is part of param-sweeps.
#
# param-sweeps is distributed under the terms and conditions of the MIT License
# (see LICENSE file at the root of this source code package).
# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
# Copyright (c) 2022-2025 Mira Geoscience Ltd. '
# '
# This file is part of param-sweeps package. '
# '
# param-sweeps 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

Expand Down
15 changes: 9 additions & 6 deletions param_sweeps/driver.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
# Copyright (c) 2024 Mira Geoscience Ltd.
#
# This file is part of param-sweeps.
#
# param-sweeps is distributed under the terms and conditions of the MIT License
# (see LICENSE file at the root of this source code package).
# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
# Copyright (c) 2022-2025 Mira Geoscience Ltd. '
# '
# This file is part of param-sweeps package. '
# '
# param-sweeps 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

Expand Down
15 changes: 9 additions & 6 deletions param_sweeps/generate.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
# Copyright (c) 2024 Mira Geoscience Ltd.
#
# This file is part of param-sweeps.
#
# param-sweeps is distributed under the terms and conditions of the MIT License
# (see LICENSE file at the root of this source code package).
# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
# Copyright (c) 2022-2025 Mira Geoscience Ltd. '
# '
# This file is part of param-sweeps package. '
# '
# param-sweeps 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

Expand Down
15 changes: 9 additions & 6 deletions param_sweeps/sample_driver.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
# Copyright (c) 2024 Mira Geoscience Ltd.
#
# This file is part of param-sweeps.
#
# param-sweeps is distributed under the terms and conditions of the MIT License
# (see LICENSE file at the root of this source code package).
# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
# Copyright (c) 2022-2025 Mira Geoscience Ltd. '
# '
# This file is part of param-sweeps package. '
# '
# param-sweeps 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

Expand Down
15 changes: 9 additions & 6 deletions tests/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Copyright (c) 2024 Mira Geoscience Ltd.
#
# This file is part of param-sweeps.
#
# param-sweeps is distributed under the terms and conditions of the MIT License
# (see LICENSE file at the root of this source code package).
# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
# Copyright (c) 2022-2025 Mira Geoscience Ltd. '
# '
# This file is part of param-sweeps package. '
# '
# param-sweeps is distributed under the terms and conditions of the MIT License '
# (see LICENSE file at the root of this source code package). '
# '
# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
21 changes: 12 additions & 9 deletions tests/driver_test.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
# Copyright (c) 2024 Mira Geoscience Ltd.
#
# This file is part of param-sweeps.
#
# param-sweeps is distributed under the terms and conditions of the MIT License
# (see LICENSE file at the root of this source code package).
# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
# Copyright (c) 2022-2025 Mira Geoscience Ltd. '
# '
# This file is part of param-sweeps package. '
# '
# param-sweeps is distributed under the terms and conditions of the MIT License '
# (see LICENSE file at the root of this source code package). '
# '
# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''

import itertools
import json
Expand Down Expand Up @@ -51,9 +54,9 @@ def test_uuid_from_params():
iterations = list(itertools.product(*test.values()))
for iteration in iterations:
trial_uuid = SweepDriver.uuid_from_params(iteration)
assert trial_uuid == SweepDriver.uuid_from_params(
iteration
), "method is not deterministic"
assert trial_uuid == SweepDriver.uuid_from_params(iteration), (
"method is not deterministic"
)


def test_file_validation(tmp_path: Path):
Expand Down
15 changes: 9 additions & 6 deletions tests/generate_test.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
# Copyright (c) 2024 Mira Geoscience Ltd.
#
# This file is part of param-sweeps.
#
# param-sweeps is distributed under the terms and conditions of the MIT License
# (see LICENSE file at the root of this source code package).
# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
# Copyright (c) 2022-2025 Mira Geoscience Ltd. '
# '
# This file is part of param-sweeps package. '
# '
# param-sweeps is distributed under the terms and conditions of the MIT License '
# (see LICENSE file at the root of this source code package). '
# '
# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''

import json
from copy import deepcopy
Expand Down
15 changes: 9 additions & 6 deletions tests/version_test.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
# Copyright (c) 2024 Mira Geoscience Ltd.
#
# This file is part of param-sweeps.
#
# param-sweeps is distributed under the terms and conditions of the MIT License
# (see LICENSE file at the root of this source code package).
# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
# Copyright (c) 2022-2025 Mira Geoscience Ltd. '
# '
# This file is part of param-sweeps package. '
# '
# param-sweeps 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

Expand Down

0 comments on commit 5e11751

Please sign in to comment.