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

Fix station format in FDSN client #1857

Merged
merged 1 commit into from Sep 20, 2017

Conversation

Projects
None yet
4 participants
@Brtle
Copy link
Contributor

commented Aug 22, 2017

The get_stations method of the FDSN client has an optional parameter format with xml as default value. This parameter is consequently always given to the url of the FDSN webservice. However, this parameter is optional for the FDSN webservice. If the FDSN webservice doesn't implement the format parameter, the get_stations method will crash. Just giving a None default value solves the problem. The FDSN webservice returns a StationXML file by default anyway.

Since it's only a small change, I didn't make a unit test for that. Does that suit you?

@megies

This comment has been minimized.

Copy link
Member

commented Sep 1, 2017

I don't see harm in this.. I'm triggering CI again, there was a build error somehow.

@megies

This comment has been minimized.

Copy link
Member

commented Sep 1, 2017

Hmm.. seems something changed at CircleCI.. :-( looks like we now have to manually prevent it from trying to install obspy..

@QuLogic

This comment has been minimized.

Copy link
Member

commented Sep 1, 2017

There's no Circle config on the maintenance branch, so it does its default thing of guessing.

@megies

This comment has been minimized.

Copy link
Member

commented Sep 2, 2017

Oh.. nice catch! @Brtle we won't do a 1.0.4 release, so currently everything goes into master. Only once 1.1.0 is out we will use another maintenance branch again.

I'll change the base branch for this PR.

Hmm.. CI doesn't seem to trigger..

@megies megies changed the base branch from maintenance_1.0.x to master Sep 2, 2017

@Brtle

This comment has been minimized.

Copy link
Contributor Author

commented Sep 19, 2017

I rebased from master and CircleCI seems to be fine.

@megies

megies approved these changes Sep 20, 2017

Copy link
Member

left a comment

I don't see harm in merging this..

@Jollyfant Jollyfant merged commit 838ece2 into obspy:master Sep 20, 2017

3 of 4 checks passed

docker-testbot docker testbot results not available yet
ci/circleci Your tests passed on CircleCI!
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@QuLogic QuLogic added this to the 1.1.0 milestone Oct 18, 2017

nackerley pushed a commit to nackerley/obspy that referenced this pull request May 8, 2018

Fix station format in FDSN client (obspy#1857)
Change default parameter `format=xml` to `format=None`. This lets the web service decide the default format and prevents a crash on services that do not support the `format` parameter.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.