Merge branch 'main' into 229-cp

.github/workflows/constraints.txt

@@ -1,4 +1,4 @@
 pip==23.1.2
 nox==2023.4.22
 nox-poetry==1.0.2
-virtualenv==20.23.0
+virtualenv==20.23.1

.github/workflows/release.yml

@@ -57,21 +57,21 @@ jobs:
 
       - name: Publish package on PyPI
         if: steps.check-version.outputs.tag
-        uses: pypa/[email protected].6
+        uses: pypa/[email protected].7
         with:
           user: __token__
           password: ${{ secrets.PYPI_TOKEN }}
 
       - name: Publish package on TestPyPI
         if: "! steps.check-version.outputs.tag"
-        uses: pypa/[email protected].6
+        uses: pypa/[email protected].7
         with:
           user: __token__
           password: ${{ secrets.TEST_PYPI_TOKEN }}
           repository_url: https://test.pypi.org/legacy/
 
       - name: Publish the release notes
-        uses: release-drafter/release-drafter@v5.23.0
+        uses: release-drafter/release-drafter@v5.24.0
         with:
           publish: ${{ steps.check-version.outputs.tag != '' }}
           tag: ${{ steps.check-version.outputs.tag }}

pyproject.toml

@@ -1,11 +1,10 @@
 [tool.poetry]
 name = "multidimio"
-version = "0.3.1"
+version = "0.4.0"
 description = "Cloud-native, scalable, and user-friendly multi dimensional energy data!"
 authors = ["TGS <[email protected]>"]
 maintainers = [
     "Altay Sansal <[email protected]>",
-    "Sri Kainkaryam <[email protected]>",
 ]
 license = "Apache-2.0"
 readme = "README.md"

src/mdio/segy/geometry.py

@@ -153,7 +153,7 @@ def check_required_params(self, grid_overrides: dict[str, str | int]) -> None:
 class AutoChannelWrap(GridOverrideCommand):
     """Automatically determine Streamer acquisition type."""
 
-    required_keys = {"shot", "cable", "channel"}
+    required_keys = {"shot_point", "cable", "channel"}
     required_parameters = None
 
     def validate(
@@ -204,7 +204,7 @@ def transform(
 class ChannelWrap(GridOverrideCommand):
     """Wrap channels to start from one at cable boundaries."""
 
-    required_keys = {"shot", "cable", "channel"}
+    required_keys = {"shot_point", "cable", "channel"}
     required_parameters = {"ChannelsPerCable"}
 
     def validate(
@@ -234,7 +234,7 @@ def transform(
 class CalculateCable(GridOverrideCommand):
     """Calculate cable numbers from unwrapped channels."""
 
-    required_keys = {"shot", "cable", "channel"}
+    required_keys = {"shot_point", "cable", "channel"}
     required_parameters = {"ChannelsPerCable"}
 
     def validate(

tests/integration/test_segy_import_export.py

@@ -18,7 +18,7 @@
 
 
 @pytest.mark.parametrize("header_locations", [(17, 137, 13)])
-@pytest.mark.parametrize("header_names", [("shot", "cable", "channel")])
+@pytest.mark.parametrize("header_names", [("shot_point", "cable", "channel")])
 @pytest.mark.parametrize("header_types", [("int32", "int16", "int32")])
 @pytest.mark.parametrize("endian", ["big"])
 @pytest.mark.parametrize("grid_overrides", [{"AutoChannelWrap": True}, None])

tests/unit/test_segy_grid_overrides.py

@@ -35,7 +35,7 @@ def mock_streamer_headers() -> dict[str, npt.NDArray]:
         permutations[shot_mask, -1] = arange(1, len(CABLES) * len(RECEIVERS) + 1)
 
     result = dict(
-        shot=permutations[:, 0],
+        shot_point=permutations[:, 0],
         cable=permutations[:, 1],
         channel=permutations[:, 2],
     )