Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

return self from st.merge(method=-1) #3005

Merged
merged 1 commit into from Mar 3, 2022
Merged

return self from st.merge(method=-1) #3005

merged 1 commit into from Mar 3, 2022

Conversation

TomWinder
Copy link
Contributor

@TomWinder TomWinder commented Mar 3, 2022 •
edited

Explicitly return the Stream object for st.merge(method=-1)

What does this PR do?

Makes the behaviour of st.merge() consistent when using method=-1; previously the Stream object was not explicitly returned in this case.

Why was it initiated? Any relevant Issues?

fixes #3004

PR Checklist

  • Correct base branch selected? master for new features, maintenance_... for bug fixes
  • This PR is not directly related to an existing issue (which has no PR yet).
  • If the PR is making changes to documentation, docs pages can be built automatically.
    Just add the "build_docs" tag to this PR.
  • If all tests including network modules (e.g. clients.fdsn) should be tested for the PR,
    just add the "test_network" tag to this PR.
  • All tests still pass.
  • Any new features or fixed regressions are covered via new tests.
  • Any new or changed features are fully documented.
  • Significant changes have been added to CHANGELOG.txt .
  • First time contributors have added your name to CONTRIBUTORS.txt .
  • If the changes affect any plotting functions you have checked that the plots
    from all the CI builds look correct. Add the "upload_plots" tag so that plotting
    outputs are attached as artifacts.
  • Add the "ready for review" tag when you are ready for the PR to be reviewed.

@TomWinder
return self from st.merge(method=-1)
97149fd 
Explicitly return the `Stream` object when method=-1 is chosen, to make
behaviour consistent with other merge options.

Update CONTRIBUTORS.txt
@trichter
Copy link
Member

trichter commented Mar 3, 2022

@TomWinder, thank you for your fist PR!

@trichter trichter merged commit 94b3aea into obspy:master Mar 3, 2022
@trichter trichter added the .core issues affecting our functionality at the very core label Mar 3, 2022
@trichter trichter added this to the 1.3.0 milestone Mar 3, 2022
@TomWinder TomWinder deleted the st-merge_cleanup branch March 3, 2022 13:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@trichter trichter trichter approved these changes

Assignees
No one assigned
Labels
.core issues affecting our functionality at the very core
Projects
None yet
Milestone
1.3.0
Development

Successfully merging this pull request may close these issues.

Inconsistent behaviour with st.merge(method=-1)
2 participants
@TomWinder @trichter