tidy requirements and site.cfg #3458
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
stickler-ci
reviewed
Oct 10, 2019
| @@ -23,6 +23,8 @@ | |||
| # importing anything else. | |||
| import iris.tests as tests | |||
|
|
|||
| from unittest import mock | |||
There was a problem hiding this comment.
F401 'unittest.mock' imported but unused
| @@ -24,12 +24,13 @@ | |||
| # importing anything else. | |||
| import iris.tests as tests | |||
|
|
|||
| from unittest import mock | |||
There was a problem hiding this comment.
F401 'unittest.mock' imported but unused
| @@ -23,10 +23,11 @@ | |||
| # importing anything else. | |||
| import iris.tests as tests | |||
|
|
|||
| from unittest import mock | |||
There was a problem hiding this comment.
F401 'unittest.mock' imported but unused
| @@ -27,14 +27,15 @@ | |||
| # importing anything else. | |||
| import iris.tests as tests | |||
|
|
|||
| from unittest import mock | |||
There was a problem hiding this comment.
F401 'unittest.mock' imported but unused
| import cftime | ||
| import types |
| @@ -23,11 +23,12 @@ | |||
| # importing anything else. | |||
| import iris.tests as tests | |||
|
|
|||
| from unittest import mock | |||
There was a problem hiding this comment.
F401 'unittest.mock' imported but unused
| @@ -23,7 +23,8 @@ | |||
| # importing anything else. | |||
| import iris.tests as tests | |||
|
|
|||
| from mock import MagicMock | |||
| from unittest.mock import MagicMock | |||
There was a problem hiding this comment.
F401 'unittest.mock.MagicMock' imported but unused
bjlittle
commented
Oct 10, 2019
| @@ -1,8 +1,6 @@ | |||
| [System] | |||
| udunits2_path = /path/to/libudunits2.so | |||
There was a problem hiding this comment.
This is now no longer used.
bjlittle
commented
Oct 10, 2019
| try: | ||
| from unittest import mock | ||
| except ImportError: | ||
| import mock |
There was a problem hiding this comment.
Now use unittest.mock from Python3
|
Thanks @bjlittle ! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR tidies the dependencies of
irisnow that it is exclusively Python3.