Skip to content

Commit

Permalink
Merge branch 'main' into 229-cp
Browse files Browse the repository at this point in the history
  • Loading branch information
markspec authored Jul 19, 2023
2 parents f308e7e + 5216791 commit e108eb0
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/constraints.txt
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,21 +57,21 @@ jobs:
- name: Publish package on PyPI
if: steps.check-version.outputs.tag
uses: pypa/gh-action-pypi-publish@v1.8.6
uses: pypa/gh-action-pypi-publish@v1.8.7
with:
user: __token__
password: ${{ secrets.PYPI_TOKEN }}

- name: Publish package on TestPyPI
if: "! steps.check-version.outputs.tag"
uses: pypa/gh-action-pypi-publish@v1.8.6
uses: pypa/gh-action-pypi-publish@v1.8.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 }}
Expand Down
3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -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 <sys-opensource@tgs.com>"]
maintainers = [
"Altay Sansal <altay.sansal@tgs.com>",
"Sri Kainkaryam <sribharath.kainkaryam@tgs.com>",
]
license = "Apache-2.0"
readme = "README.md"
Expand Down
6 changes: 3 additions & 3 deletions src/mdio/segy/geometry.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/test_segy_import_export.py
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/test_segy_grid_overrides.py
Original file line number Diff line number Diff line change
Expand Up @@ -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],
)
Expand Down

0 comments on commit e108eb0

Please sign in to comment.