From 39d885e0883cc4565f249a3c1d0343dfeed2d935 Mon Sep 17 00:00:00 2001 From: Altay Sansal Date: Tue, 24 Oct 2023 11:21:07 -0500 Subject: [PATCH] rename segy to seismic --- .flake8 | 6 +++--- src/mdio/converters/mdio.py | 12 ++++++------ src/mdio/converters/segy.py | 12 ++++++------ src/mdio/{segy => seismic}/__init__.py | 0 src/mdio/{segy => seismic}/_standards_common.py | 0 src/mdio/{segy => seismic}/_standards_rev0.py | 10 +++++----- src/mdio/{segy => seismic}/_workers.py | 6 +++--- src/mdio/{segy => seismic}/blocked_io.py | 10 +++++----- src/mdio/{segy => seismic}/byte_utils.py | 0 src/mdio/{segy => seismic}/creation.py | 10 +++++----- src/mdio/{segy => seismic}/ebcdic.py | 0 src/mdio/{segy => seismic}/exceptions.py | 0 src/mdio/{segy => seismic}/geometry.py | 8 ++++---- src/mdio/{segy => seismic}/headers.py | 2 +- src/mdio/{segy => seismic}/headers_text.py | 4 ++-- src/mdio/{segy => seismic}/helpers_segy.py | 0 src/mdio/{segy => seismic}/ibm_float.py | 0 src/mdio/{segy => seismic}/parsers.py | 4 ++-- src/mdio/{segy => seismic}/utilities.py | 8 ++++---- tests/integration/conftest.py | 2 +- tests/integration/test_segy_import_export.py | 2 +- tests/unit/conftest.py | 2 +- tests/unit/test_accessor.py | 2 +- tests/unit/test_ibm_ieee.py | 6 +++--- tests/unit/test_segy_grid_overrides.py | 8 ++++---- tests/unit/test_text_header.py | 8 ++++---- 26 files changed, 61 insertions(+), 61 deletions(-) rename src/mdio/{segy => seismic}/__init__.py (100%) rename src/mdio/{segy => seismic}/_standards_common.py (100%) rename src/mdio/{segy => seismic}/_standards_rev0.py (97%) rename src/mdio/{segy => seismic}/_workers.py (98%) rename src/mdio/{segy => seismic}/blocked_io.py (97%) rename src/mdio/{segy => seismic}/byte_utils.py (100%) rename src/mdio/{segy => seismic}/creation.py (97%) rename src/mdio/{segy => seismic}/ebcdic.py (100%) rename src/mdio/{segy => seismic}/exceptions.py (100%) rename src/mdio/{segy => seismic}/geometry.py (98%) rename src/mdio/{segy => seismic}/headers.py (98%) rename src/mdio/{segy => seismic}/headers_text.py (97%) rename src/mdio/{segy => seismic}/helpers_segy.py (100%) rename src/mdio/{segy => seismic}/ibm_float.py (100%) rename src/mdio/{segy => seismic}/parsers.py (98%) rename src/mdio/{segy => seismic}/utilities.py (96%) diff --git a/.flake8 b/.flake8 index 8f7da60a..21b32105 100644 --- a/.flake8 +++ b/.flake8 @@ -9,6 +9,6 @@ rst-directives = deprecated per-file-ignores = tests/*:S101 - src/mdio/segy/_standards_rev0.py:B950 - src/mdio/segy/ebcdic.py:B950 - src/mdio/commands/segy.py:D301 + src/mdio/seismic/_standards_rev0.py: B950 + src/mdio/seismic/ebcdic.py: B950 + src/mdio/commands/segy.py: D301 diff --git a/src/mdio/converters/mdio.py b/src/mdio/converters/mdio.py index e50f75a0..133a46c7 100644 --- a/src/mdio/converters/mdio.py +++ b/src/mdio/converters/mdio.py @@ -10,12 +10,12 @@ from tqdm.dask import TqdmCallback from mdio import MDIOReader -from mdio.segy.blocked_io import to_segy -from mdio.segy.byte_utils import ByteOrder -from mdio.segy.byte_utils import Dtype -from mdio.segy.creation import concat_files -from mdio.segy.creation import mdio_spec_to_segy -from mdio.segy.utilities import segy_export_rechunker +from mdio.seismic.blocked_io import to_segy +from mdio.seismic.byte_utils import ByteOrder +from mdio.seismic.byte_utils import Dtype +from mdio.seismic.creation import concat_files +from mdio.seismic.creation import mdio_spec_to_segy +from mdio.seismic.utilities import segy_export_rechunker try: diff --git a/src/mdio/converters/segy.py b/src/mdio/converters/segy.py index 674e6062..d2987925 100644 --- a/src/mdio/converters/segy.py +++ b/src/mdio/converters/segy.py @@ -20,12 +20,12 @@ from mdio.converters.exceptions import GridTraceSparsityError from mdio.core import Grid from mdio.core.utils_write import write_attribute -from mdio.segy import blocked_io -from mdio.segy.byte_utils import Dtype -from mdio.segy.helpers_segy import create_zarr_hierarchy -from mdio.segy.parsers import parse_binary_header -from mdio.segy.parsers import parse_text_header -from mdio.segy.utilities import get_grid_plan +from mdio.seismic import blocked_io +from mdio.seismic.byte_utils import Dtype +from mdio.seismic.helpers_segy import create_zarr_hierarchy +from mdio.seismic.parsers import parse_binary_header +from mdio.seismic.parsers import parse_text_header +from mdio.seismic.utilities import get_grid_plan logger = logging.getLogger(__name__) diff --git a/src/mdio/segy/__init__.py b/src/mdio/seismic/__init__.py similarity index 100% rename from src/mdio/segy/__init__.py rename to src/mdio/seismic/__init__.py diff --git a/src/mdio/segy/_standards_common.py b/src/mdio/seismic/_standards_common.py similarity index 100% rename from src/mdio/segy/_standards_common.py rename to src/mdio/seismic/_standards_common.py diff --git a/src/mdio/segy/_standards_rev0.py b/src/mdio/seismic/_standards_rev0.py similarity index 97% rename from src/mdio/segy/_standards_rev0.py rename to src/mdio/seismic/_standards_rev0.py index be5e78a5..c1dd48a1 100644 --- a/src/mdio/segy/_standards_rev0.py +++ b/src/mdio/seismic/_standards_rev0.py @@ -1,11 +1,11 @@ """SEG-Y Rev 0 standard and its definitions.""" -from mdio.segy.byte_utils import ByteOrder -from mdio.segy.byte_utils import Dtype -from mdio.segy.byte_utils import OrderedType -from mdio.segy.headers import Header -from mdio.segy.headers import HeaderGroup +from mdio.seismic.byte_utils import ByteOrder +from mdio.seismic.byte_utils import Dtype +from mdio.seismic.byte_utils import OrderedType +from mdio.seismic.headers import Header +from mdio.seismic.headers import HeaderGroup SEGY_REV0_TEXT = {"rows": 40, "cols": 80, "word_length": 4} diff --git a/src/mdio/segy/_workers.py b/src/mdio/seismic/_workers.py similarity index 98% rename from src/mdio/segy/_workers.py rename to src/mdio/seismic/_workers.py index 76a2d261..fb3ad6c3 100644 --- a/src/mdio/segy/_workers.py +++ b/src/mdio/seismic/_workers.py @@ -13,9 +13,9 @@ from mdio.constants import UINT32_MAX from mdio.core import Grid -from mdio.segy.byte_utils import ByteOrder -from mdio.segy.byte_utils import Dtype -from mdio.segy.ibm_float import ibm2ieee +from mdio.seismic.byte_utils import ByteOrder +from mdio.seismic.byte_utils import Dtype +from mdio.seismic.ibm_float import ibm2ieee def header_scan_worker( diff --git a/src/mdio/segy/blocked_io.py b/src/mdio/seismic/blocked_io.py similarity index 97% rename from src/mdio/segy/blocked_io.py rename to src/mdio/seismic/blocked_io.py index 97c8aacb..bf20eae5 100644 --- a/src/mdio/segy/blocked_io.py +++ b/src/mdio/seismic/blocked_io.py @@ -20,11 +20,11 @@ from mdio.core import Grid from mdio.core.indexing import ChunkIterator -from mdio.segy._workers import trace_worker -from mdio.segy.byte_utils import ByteOrder -from mdio.segy.byte_utils import Dtype -from mdio.segy.creation import concat_files -from mdio.segy.creation import write_to_segy_stack +from mdio.seismic._workers import trace_worker +from mdio.seismic.byte_utils import ByteOrder +from mdio.seismic.byte_utils import Dtype +from mdio.seismic.creation import concat_files +from mdio.seismic.creation import write_to_segy_stack try: diff --git a/src/mdio/segy/byte_utils.py b/src/mdio/seismic/byte_utils.py similarity index 100% rename from src/mdio/segy/byte_utils.py rename to src/mdio/seismic/byte_utils.py diff --git a/src/mdio/segy/creation.py b/src/mdio/seismic/creation.py similarity index 97% rename from src/mdio/segy/creation.py rename to src/mdio/seismic/creation.py index d8b9b849..2aeff402 100644 --- a/src/mdio/segy/creation.py +++ b/src/mdio/seismic/creation.py @@ -16,11 +16,11 @@ from tqdm.auto import tqdm from mdio.api.accessor import MDIOReader -from mdio.segy._standards_common import SegyFloatFormat -from mdio.segy.byte_utils import ByteOrder -from mdio.segy.byte_utils import Dtype -from mdio.segy.byte_utils import get_byteorder -from mdio.segy.ibm_float import ieee2ibm +from mdio.seismic._standards_common import SegyFloatFormat +from mdio.seismic.byte_utils import ByteOrder +from mdio.seismic.byte_utils import Dtype +from mdio.seismic.byte_utils import get_byteorder +from mdio.seismic.ibm_float import ieee2ibm def mdio_spec_to_segy( diff --git a/src/mdio/segy/ebcdic.py b/src/mdio/seismic/ebcdic.py similarity index 100% rename from src/mdio/segy/ebcdic.py rename to src/mdio/seismic/ebcdic.py diff --git a/src/mdio/segy/exceptions.py b/src/mdio/seismic/exceptions.py similarity index 100% rename from src/mdio/segy/exceptions.py rename to src/mdio/seismic/exceptions.py diff --git a/src/mdio/segy/geometry.py b/src/mdio/seismic/geometry.py similarity index 98% rename from src/mdio/segy/geometry.py rename to src/mdio/seismic/geometry.py index f47c3867..fd6c3d62 100644 --- a/src/mdio/segy/geometry.py +++ b/src/mdio/seismic/geometry.py @@ -14,10 +14,10 @@ import numpy as np import numpy.typing as npt -from mdio.segy.exceptions import GridOverrideIncompatibleError -from mdio.segy.exceptions import GridOverrideKeysError -from mdio.segy.exceptions import GridOverrideMissingParameterError -from mdio.segy.exceptions import GridOverrideUnknownError +from mdio.seismic.exceptions import GridOverrideIncompatibleError +from mdio.seismic.exceptions import GridOverrideKeysError +from mdio.seismic.exceptions import GridOverrideMissingParameterError +from mdio.seismic.exceptions import GridOverrideUnknownError logger = logging.getLogger(__name__) diff --git a/src/mdio/segy/headers.py b/src/mdio/seismic/headers.py similarity index 98% rename from src/mdio/segy/headers.py rename to src/mdio/seismic/headers.py index c7da6247..88063822 100644 --- a/src/mdio/segy/headers.py +++ b/src/mdio/seismic/headers.py @@ -7,7 +7,7 @@ import numpy as np -from mdio.segy.byte_utils import OrderedType +from mdio.seismic.byte_utils import OrderedType @dataclass diff --git a/src/mdio/segy/headers_text.py b/src/mdio/seismic/headers_text.py similarity index 97% rename from src/mdio/segy/headers_text.py rename to src/mdio/seismic/headers_text.py index 427ad94c..c198c4e9 100644 --- a/src/mdio/segy/headers_text.py +++ b/src/mdio/seismic/headers_text.py @@ -7,8 +7,8 @@ import numpy as np -from mdio.segy.ebcdic import ASCII_TO_EBCDIC -from mdio.segy.ebcdic import EBCDIC_TO_ASCII +from mdio.seismic.ebcdic import ASCII_TO_EBCDIC +from mdio.seismic.ebcdic import EBCDIC_TO_ASCII def wrap_strings(text_header: Sequence[str]) -> str: diff --git a/src/mdio/segy/helpers_segy.py b/src/mdio/seismic/helpers_segy.py similarity index 100% rename from src/mdio/segy/helpers_segy.py rename to src/mdio/seismic/helpers_segy.py diff --git a/src/mdio/segy/ibm_float.py b/src/mdio/seismic/ibm_float.py similarity index 100% rename from src/mdio/segy/ibm_float.py rename to src/mdio/seismic/ibm_float.py diff --git a/src/mdio/segy/parsers.py b/src/mdio/seismic/parsers.py similarity index 98% rename from src/mdio/segy/parsers.py rename to src/mdio/seismic/parsers.py index 6ac95e57..e820d2e0 100644 --- a/src/mdio/segy/parsers.py +++ b/src/mdio/seismic/parsers.py @@ -16,8 +16,8 @@ from tqdm.auto import tqdm from mdio.core import Dimension -from mdio.segy._workers import header_scan_worker -from mdio.segy.byte_utils import Dtype +from mdio.seismic._workers import header_scan_worker +from mdio.seismic.byte_utils import Dtype NUM_CORES = cpu_count(logical=False) diff --git a/src/mdio/segy/utilities.py b/src/mdio/seismic/utilities.py similarity index 96% rename from src/mdio/segy/utilities.py rename to src/mdio/seismic/utilities.py index 2636d147..8450e6be 100644 --- a/src/mdio/segy/utilities.py +++ b/src/mdio/seismic/utilities.py @@ -11,10 +11,10 @@ from numpy.typing import NDArray from mdio.core import Dimension -from mdio.segy.byte_utils import Dtype -from mdio.segy.geometry import GridOverrider -from mdio.segy.parsers import parse_sample_axis -from mdio.segy.parsers import parse_trace_headers +from mdio.seismic.byte_utils import Dtype +from mdio.seismic.geometry import GridOverrider +from mdio.seismic.parsers import parse_sample_axis +from mdio.seismic.parsers import parse_trace_headers def get_grid_plan( # noqa: C901 diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index 9dce0130..9b92db07 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -9,7 +9,7 @@ import pytest import segyio -from mdio.segy.geometry import StreamerShotGeometryType +from mdio.seismic.geometry import StreamerShotGeometryType def create_segy_mock_4d( diff --git a/tests/integration/test_segy_import_export.py b/tests/integration/test_segy_import_export.py index 972e6e22..d4d84342 100644 --- a/tests/integration/test_segy_import_export.py +++ b/tests/integration/test_segy_import_export.py @@ -12,7 +12,7 @@ from mdio import mdio_to_segy from mdio.converters import segy_to_mdio from mdio.core import Dimension -from mdio.segy.geometry import StreamerShotGeometryType +from mdio.seismic.geometry import StreamerShotGeometryType dask.config.set(scheduler="synchronous") diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py index 73fed56b..958f9c1c 100644 --- a/tests/unit/conftest.py +++ b/tests/unit/conftest.py @@ -17,7 +17,7 @@ from mdio.core import Dimension from mdio.core import Grid from mdio.core.utils_write import write_attribute -from mdio.segy.helpers_segy import create_zarr_hierarchy +from mdio.seismic.helpers_segy import create_zarr_hierarchy API_VERSION = metadata.version("multidimio") diff --git a/tests/unit/test_accessor.py b/tests/unit/test_accessor.py index 16f2ebb3..dc43f666 100644 --- a/tests/unit/test_accessor.py +++ b/tests/unit/test_accessor.py @@ -11,7 +11,7 @@ from mdio.core.exceptions import MDIOAlreadyExistsError from mdio.core.exceptions import MDIONotFoundError from mdio.exceptions import ShapeError -from mdio.segy.helpers_segy import create_zarr_hierarchy +from mdio.seismic.helpers_segy import create_zarr_hierarchy class TestReader: diff --git a/tests/unit/test_ibm_ieee.py b/tests/unit/test_ibm_ieee.py index 14803da0..10471443 100644 --- a/tests/unit/test_ibm_ieee.py +++ b/tests/unit/test_ibm_ieee.py @@ -8,9 +8,9 @@ import numpy as np import pytest -from mdio.segy.ibm_float import byteswap_uint32 -from mdio.segy.ibm_float import ibm2ieee -from mdio.segy.ibm_float import ieee2ibm +from mdio.seismic.ibm_float import byteswap_uint32 +from mdio.seismic.ibm_float import ibm2ieee +from mdio.seismic.ibm_float import ieee2ibm @pytest.mark.parametrize( diff --git a/tests/unit/test_segy_grid_overrides.py b/tests/unit/test_segy_grid_overrides.py index 11dc954d..9558589c 100644 --- a/tests/unit/test_segy_grid_overrides.py +++ b/tests/unit/test_segy_grid_overrides.py @@ -14,10 +14,10 @@ from numpy.testing import assert_array_equal from mdio.core import Dimension -from mdio.segy.exceptions import GridOverrideIncompatibleError -from mdio.segy.exceptions import GridOverrideMissingParameterError -from mdio.segy.exceptions import GridOverrideUnknownError -from mdio.segy.geometry import GridOverrider +from mdio.seismic.exceptions import GridOverrideIncompatibleError +from mdio.seismic.exceptions import GridOverrideMissingParameterError +from mdio.seismic.exceptions import GridOverrideUnknownError +from mdio.seismic.geometry import GridOverrider SHOTS = arange(100, 104, dtype="int32") diff --git a/tests/unit/test_text_header.py b/tests/unit/test_text_header.py index 8c151b20..e6d159c7 100644 --- a/tests/unit/test_text_header.py +++ b/tests/unit/test_text_header.py @@ -8,10 +8,10 @@ import pytest -from mdio.segy.headers_text import ascii_to_ebcdic -from mdio.segy.headers_text import ebcdic_to_ascii -from mdio.segy.headers_text import unwrap_string -from mdio.segy.headers_text import wrap_strings +from mdio.seismic.headers_text import ascii_to_ebcdic +from mdio.seismic.headers_text import ebcdic_to_ascii +from mdio.seismic.headers_text import unwrap_string +from mdio.seismic.headers_text import wrap_strings # fmt: off