Skip to content

Conversation

@bjlittle
Copy link
Member

This PR tidies the dependencies of iris now that it is exclusively Python3.

# importing anything else.
import iris.tests as tests

from unittest import mock

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

F401 'unittest.mock' imported but unused

# importing anything else.
import iris.tests as tests

from unittest import mock

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

F401 'unittest.mock' imported but unused

# importing anything else.
import iris.tests as tests

from unittest import mock

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

F401 'unittest.mock' imported but unused

# importing anything else.
import iris.tests as tests

from unittest import mock

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

F401 'unittest.mock' imported but unused


import types
import cftime
import types

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

F401 'types' imported but unused

# importing anything else.
import iris.tests as tests

from unittest import mock

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

F401 'unittest.mock' imported but unused

import iris.tests as tests

from mock import MagicMock
from unittest.mock import MagicMock

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

F401 'unittest.mock.MagicMock' imported but unused

@@ -1,8 +1,6 @@
[System]
udunits2_path = /path/to/libudunits2.so
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is now no longer used.

try:
from unittest import mock
except ImportError:
import mock
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now use unittest.mock from Python3

Copy link
Member

@lbdreyer lbdreyer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Other than Stickler complaining about unused imports this all looks good!

@bjlittle Can you address the unused imports, then I'll be happy to merge!

@lbdreyer
Copy link
Member

Thanks @bjlittle !

@lbdreyer lbdreyer merged commit 563426c into SciTools:master Oct 14, 2019
@pp-mo pp-mo mentioned this pull request Oct 14, 2019
@bjlittle bjlittle deleted the requirements-tidy branch November 12, 2019 14:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants