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

Emsc get events #2096

Merged
merged 2 commits into from Apr 11, 2018

Conversation

Projects
None yet
3 participants
@bonaime
Contributor

bonaime commented Mar 28, 2018

What does this PR do?

Change the FDSN service shortcut in advanced_exercise_solution_1.py
+DOCS

Why was it initiated? Any relevant Issues?

ValueError: The FDSN service shortcut neries is unknown.

PR Checklist

  • Correct base branch selected? master for new fetures, 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 .

@bonaime bonaime requested review from QuLogic and megies Mar 28, 2018

@bonaime

This comment has been minimized.

Contributor

bonaime commented Mar 28, 2018

Not sure, I commit in the correct branch...

`introduction to Python <https://nbviewer.jupyter.org/github/obspy/docs/blob/master/workshops/2015-08-03_iris/01_Python_Crash_Course.ipynb>`__
(`with solutions/output <https://nbviewer.jupyter.org/github/obspy/docs/blob/master/workshops/2015-08-03_iris/01_Python_Crash_Course_with_output_and_solutions.ipynb>`__),
`introduction to Python <https://nbviewer.jupyter.org/github/obspy/docs/blob/master/workshops/2017-10-25_iris_stcu/Python Introduction/Python_Crash_Course.ipynb>`__
(`with solutions/output <https://nbviewer.jupyter.org/github/obspy/docs/blob/master/workshops/2017-10-25_iris_stcu/Python Introduction/Python_Crash_Course-with_solutions.ipynb>`__),

This comment has been minimized.

@krischer

krischer Mar 29, 2018

Member

The space in Python Introduction must be escaped with %20 - otherwise it will not work in the rendered version of the documentation.

This comment has been minimized.

@krischer

krischer Mar 29, 2018

Member

This is actually partially my fault as I merged the other PR without checking...

Can you rebase this PR on the latest master and fix this?

@krischer

This comment has been minimized.

Member

krischer commented Mar 29, 2018

Instead of asking I could have just done it myself - and that's what I just did. I also rebased on the latest master to get rid of the extra commits. Make sure to reset your branch if you keep working on this.

`introduction to Python <https://nbviewer.jupyter.org/github/obspy/docs/blob/master/workshops/2017-10-25_iris_stcu/Python Introduction/Python_Crash_Course.ipynb>`__
(`with solutions/output <https://nbviewer.jupyter.org/github/obspy/docs/blob/master/workshops/2017-10-25_iris_stcu/Python Introduction/Python_Crash_Course-with_solutions.ipynb>`__),
`introduction to Python <https://nbviewer.jupyter.org/github/obspy/docs/blob/master/workshops/2017-10-25_iris_stcu/Python%20Introduction/Python_Crash_Course.ipynb>`__
(`with solutions/output <https://nbviewer.jupyter.org/github/obspy/docs/blob/master/workshops/2017-10-25_iris_stcu/Python%20Introduction/Python_Crash_Course-with_solutions.ipynb>`__),

This comment has been minimized.

@megies

megies Apr 10, 2018

Member

These changes are already done with #2092 and are already in maintenance and master branch.

This comment has been minimized.

@krischer

krischer Apr 10, 2018

Member

Yes, but the space must be escaped, otherwise it does not render correctly.

This comment has been minimized.

@megies

megies Apr 10, 2018

Member

Ah, I see.. sorry then.

@megies

megies requested changes Apr 10, 2018 edited

Please..

  • rebase this on maintenance_1.1.x
  • change base branch to maintenance_1.1.x
    (I would just start fresh from maintenance and do that small change again)
  • drop the second commit about the notebook links

bonaime and others added some commits Mar 28, 2018

EMSC instead of neries
ValueError: The FDSN service shortcut `neries` is unknown.

@krischer krischer changed the base branch from master to maintenance_1.1.x Apr 10, 2018

@krischer

This comment has been minimized.

Member

krischer commented Apr 10, 2018

Please..

rebase this on maintenance_1.1.x
change base branch to maintenance_1.1.x
(I would just start fresh from maintenance and do that small change again)
drop the second commit about the notebook links

done.

@megies megies merged commit 0aae31c into maintenance_1.1.x Apr 11, 2018

5 of 7 checks passed

docs-buildbot Build succeeded, but there are warnings/errors:
Details
docker-testbot docker testbot results not available yet
ci/circleci Your tests passed on CircleCI!
Details
codecov/patch Coverage not affected when comparing 9c1f9ce...4ad7572
Details
codecov/project 88.08% (+1.14%) compared to 9c1f9ce
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@megies megies deleted the EMSC-get_events branch Apr 11, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment