diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml deleted file mode 100644 index b04fb15..0000000 --- a/.github/workflows/black.yml +++ /dev/null @@ -1,10 +0,0 @@ -name: Lint - -on: [push, pull_request] - -jobs: - lint: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: psf/black@stable diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml new file mode 100644 index 0000000..9bbcbe5 --- /dev/null +++ b/.github/workflows/lint.yml @@ -0,0 +1,11 @@ +name: Lint + +on: [push, pull_request] + +jobs: + pre-commit: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-python@v3 + - uses: pre-commit/action@v3.0.0 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9393d4f..875ab05 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,11 +1,18 @@ # See https://pre-commit.com for more information # See https://pre-commit.com/hooks.html for more hooks repos: -- repo: local +- repo: https://github.com/pre-commit/pre-commit-hooks + rev: v3.2.0 + hooks: + - id: trailing-whitespace + - id: end-of-file-fixer + - id: check-yaml + - id: check-added-large-files +- repo: https://github.com/psf/black + rev: 22.10.0 hooks: - id: black - name: black - language: system - types: [python] - entry: black - # language_version: python3.6 +- repo: https://github.com/pycqa/isort + rev: 5.10.1 + hooks: + - id: isort diff --git a/lightguide/__init__.py b/lightguide/__init__.py index dc423ce..d8e5f21 100644 --- a/lightguide/__init__.py +++ b/lightguide/__init__.py @@ -1,4 +1,3 @@ import pkg_resources - __version__ = pkg_resources.get_distribution("lightguide").version diff --git a/lightguide/filters.py b/lightguide/filters.py index f9ab200..dafde97 100644 --- a/lightguide/filters.py +++ b/lightguide/filters.py @@ -1,2 +1,2 @@ -from .lightguide import * # noqa from .afk_filter_python import * # noqa +from .lightguide import * # noqa diff --git a/lightguide/gf.py b/lightguide/gf.py index 7463098..20ea766 100644 --- a/lightguide/gf.py +++ b/lightguide/gf.py @@ -1,12 +1,11 @@ -import numpy as np - -from scipy import interpolate, ndimage, signal from collections.abc import Iterable -from pyrocko.guts import Object, Float, List, Tuple, String, Timestamp, Bool +import numpy as np +import pyrocko.orthodrome as od from pyrocko import gf +from pyrocko.guts import Bool, Float, List, Object, String, Timestamp, Tuple from pyrocko.model import Location -import pyrocko.orthodrome as od +from scipy import interpolate, ndimage, signal r2d = 180.0 / np.pi km = 1e3 diff --git a/lightguide/lightguide.pyi b/lightguide/lightguide.pyi index 8b512f1..99a6fcf 100644 --- a/lightguide/lightguide.pyi +++ b/lightguide/lightguide.pyi @@ -1,7 +1,7 @@ from __future__ import annotations -import numpy.typing as npt import numpy as np +import numpy.typing as npt def triangular_taper( window_size: tuple[int, int], plateau: tuple[int, int] diff --git a/lightguide/restitution.py b/lightguide/restitution.py index 2aacebe..2ef0aec 100644 --- a/lightguide/restitution.py +++ b/lightguide/restitution.py @@ -1,10 +1,11 @@ from __future__ import annotations + from typing import TYPE_CHECKING import numpy as np from scipy import signal -from .utils import traces_to_numpy_and_meta +from .utils import traces_to_numpy_and_meta if TYPE_CHECKING: from pyrocko.trace import Trace diff --git a/lightguide/utils.py b/lightguide/utils.py index 82e1aaf..33d2f1f 100644 --- a/lightguide/utils.py +++ b/lightguide/utils.py @@ -1,20 +1,19 @@ from __future__ import annotations -from enum import Enum -from tempfile import SpooledTemporaryFile -import time import logging +import time +from enum import Enum from functools import wraps from pathlib import Path +from tempfile import SpooledTemporaryFile from typing import Any, Callable -import requests import numpy as np import numpy.typing as npt +import requests from pyrocko.trace import Trace from scipy.signal import butter, lfilter - # create console handler ch = logging.StreamHandler() formatter = logging.Formatter("\x1b[80D\x1b[1A\x1b[K%(message)s") diff --git a/test/conftest.py b/test/conftest.py index 40b45e2..902f10c 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -1,4 +1,5 @@ import pytest + from lightguide import gf km = 1e3 diff --git a/test/test_afk_filter.py b/test/test_afk_filter.py index 0c4b719..33bbde5 100644 --- a/test/test_afk_filter.py +++ b/test/test_afk_filter.py @@ -2,6 +2,7 @@ import numpy as num import pytest + from lightguide import filters diff --git a/test/test_gf.py b/test/test_gf.py index 4ce311e..d901bb0 100644 --- a/test/test_gf.py +++ b/test/test_gf.py @@ -2,10 +2,11 @@ import numpy as np import pytest -from lightguide import gf from pyrocko import trace from pyrocko.model import Location +from lightguide import gf + km = 1e3 diff --git a/test/test_restitution.py b/test/test_restitution.py index 2fcad34..add59f8 100644 --- a/test/test_restitution.py +++ b/test/test_restitution.py @@ -1,7 +1,7 @@ -from lightguide import restitution as res - from pyrocko import trace +from lightguide import restitution as res + def test_strainrate_to_strain(syn_das_data, show_plot): syn_e = syn_das_data(quantity="strain", sample_rate=5.0, smoothing_sigma=100.0) diff --git a/test/test_utils.py b/test/test_utils.py index 4cadb0d..32f4928 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -1,7 +1,9 @@ from pathlib import Path -from lightguide.utils import download_http, download_numpy, ExampleData + import numpy as np +from lightguide.utils import ExampleData, download_http, download_numpy + URLS = [url for k, url in ExampleData.__dict__.items() if not k.startswith("_")]