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 2266 #2320

Merged
merged 3 commits into from Feb 15, 2019

Conversation

3 participants
@d-chambers
Copy link
Member

d-chambers commented Feb 14, 2019

What does this PR do?

Inventory.remove will now work for filtering station level inventories.

Why was it initiated? Any relevant Issues?

#2266

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 .

@d-chambers d-chambers added this to the 1.2.0 milestone Feb 14, 2019

@d-chambers

This comment has been minimized.

Copy link
Member Author

d-chambers commented Feb 14, 2019

I didn't make a changelog entry since this is only a bug on master.

@krischer krischer added this to In Progress in Release 1.2.0 Feb 14, 2019

@d-chambers d-chambers moved this from In Progress to Waiting for Review in Release 1.2.0 Feb 14, 2019

@ThomasLecocq
Copy link
Contributor

ThomasLecocq left a comment

small typo, otherwise good to go for me.

@@ -558,7 +580,7 @@ def test_read_invalid_filename(self):

@unittest.skipIf(not BASEMAP_VERSION, 'basemap not installed')
@unittest.skipIf(
BASEMAP_VERSION >= [1, 1, 0] and MATPLOTLIB_VERSION == [3, 0, 1],
BASEMAP_VERSION or [] >= [1, 1, 0] and MATPLOTLIB_VERSION == [3, 0, 1],
'matplotlib 3.0.1 is not campatible with basemap')

This comment has been minimized.

@ThomasLecocq

ThomasLecocq Feb 14, 2019

Contributor

campatible/compatible

This comment has been minimized.

@megies

megies Feb 14, 2019

Member

camfartable

@megies megies force-pushed the fix_2266 branch from bcc9930 to 24bb903 Feb 14, 2019

d-chambers added some commits Feb 14, 2019

@megies megies force-pushed the fix_2266 branch from 24bb903 to 7833c50 Feb 14, 2019

@megies

megies approved these changes Feb 15, 2019

Copy link
Member

megies left a comment

Looks good to me

@megies megies moved this from Waiting for Review to Waiting on CI in Release 1.2.0 Feb 15, 2019

@megies

This comment has been minimized.

Copy link
Member

megies commented Feb 15, 2019

Test fail unrelated, merging 🚀

@megies megies merged commit 7e67783 into master Feb 15, 2019

2 of 4 checks passed

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

@megies megies deleted the fix_2266 branch Feb 15, 2019

@megies megies moved this from Waiting on CI to Done in Release 1.2.0 Feb 15, 2019

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.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.