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.

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

Numpy version response bug #2435

Merged
merged 2 commits into from Aug 12, 2019

Conversation

@aringler-usgs
Copy link
Contributor

commented Aug 7, 2019

What does this PR do?

This pull-request is a one-line check on the numpy version before the response removal.

Why was it initiated? Any relevant Issues?

fixes #2434

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 remove the space in the following string after the + sign: "+ DOCS"
  • If any network modules should be tested for the PR, add them as a comma separated list
    (e.g. clients.fdsn,clients.arclink) after the colon in the following magic string: "+TESTS:"
    (you can also add "ALL" to just simply run all tests across all modules)
  • All tests still pass.
  • Any new features or fixed regressions are be covered via new tests.
  • Any new or changed features have are fully documented.
  • Significant changes have been added to CHANGELOG.txt .
  • First time contributors have added your name to CONTRIBUTORS.txt .
@aringler-usgs

This comment has been minimized.

Copy link
Contributor Author

commented Aug 7, 2019

Hopefully, I did the branching correctly. I apologize if I didn't (and would like to know what I did wrong if that is the case). Sometimes doing git correctly is the crux of all of this.

@QuLogic

This comment has been minimized.

Copy link
Member

commented Aug 7, 2019

You made your commit on the master branch and are targetting maintenance_1.1.x, so no.

Either you need to make the commit starting from maintenance_1.1.x or you need to target master.

@aringler-usgs aringler-usgs force-pushed the aringler-usgs:numpy_version_response_bug branch from aacaa7f to 3f73027 Aug 7, 2019

@aringler-usgs

This comment has been minimized.

Copy link
Contributor Author

commented Aug 7, 2019

@QuLogic thanks so much for pointing this out. @amkearns-usgs helped figure out my git problems. Hopefully this is now on the correct branch.

@megies

This comment has been minimized.

Copy link
Member

commented Aug 8, 2019

@QuLogic @aringler-usgs we don't do anymore releases on 1.1.x, aso everthing goes into master right now. Just force push back to your previous state aacaa7f and change the base branch ("edit" button top right). I can do it if you need help

@megies

This comment has been minimized.

Copy link
Member

commented Aug 8, 2019

Also @aringler-usgs version comparisons can't be done with plain strings, compare e.g. this:

signal/spectral_estimation.py
40:from obspy.core.util import AttribDict, NUMPY_VERSION
1345:        if NUMPY_VERSION >= [1, 7]:
1436:        if NUMPY_VERSION >= [1, 7]:

@aringler-usgs aringler-usgs force-pushed the aringler-usgs:numpy_version_response_bug branch from 3f73027 to cc064f1 Aug 8, 2019

@aringler-usgs aringler-usgs changed the base branch from maintenance_1.1.x to master Aug 8, 2019

@aringler-usgs

This comment has been minimized.

Copy link
Contributor Author

commented Aug 8, 2019

@megies I think I have switched the branches correctly. Thanks for your help!

@megies

megies approved these changes Aug 12, 2019

Copy link
Member

left a comment

Looks good

@megies megies merged commit cac9013 into obspy:master Aug 12, 2019

0 of 4 checks passed

continuous-integration/travis-ci/pr The Travis CI build could not complete due to an error
Details
ci/circleci Your tests failed on CircleCI
Details
continuous-integration/appveyor/pr AppVeyor build failed
Details
docker-testbot docker testbot results not available yet
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.