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.

Sign up for GitHub

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

Use iris.tests.mock for Python 3 #3003

Merged
merged 1 commit into from
May 1, 2018
Merged

Use iris.tests.mock for Python 3 #3003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/iris/tests/unit/data_manager/test_DataManager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) British Crown Copyright 2017, Met Office
# (C) British Crown Copyright 2017 - 2018, Met Office
#
# This file is part of Iris.
#
Expand Down Expand Up @@ -27,13 +27,13 @@
import iris.tests as tests

import copy
import mock
import numpy as np
import numpy.ma as ma
import six

from iris._data_manager import DataManager
from iris._lazy_data import as_lazy_data
from iris.tests import mock


class Test___copy__(tests.IrisTest):
Expand Down
5 changes: 2 additions & 3 deletions lib/iris/tests/unit/fileformats/dot/test__dot_path.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) British Crown Copyright 2016, Met Office
# (C) British Crown Copyright 2016 - 2018, Met Office
#
# This file is part of Iris.
#
Expand Down Expand Up @@ -26,9 +26,8 @@
import os.path
import subprocess

import mock

from iris.fileformats.dot import _dot_path, _DOT_EXECUTABLE_PATH
from iris.tests import mock


class Test(tests.IrisTest):
Expand Down
4 changes: 2 additions & 2 deletions lib/iris/tests/unit/fileformats/netcdf/test__FillValueMaskCheckAndStoreTarget.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) British Crown Copyright 2017, Met Office
# (C) British Crown Copyright 2017 - 2018, Met Office
#
# This file is part of Iris.
#
Expand Down Expand Up @@ -27,10 +27,10 @@
# importing anything else.
import iris.tests as tests

import mock
import numpy as np

from iris.fileformats.netcdf import _FillValueMaskCheckAndStoreTarget
from iris.tests import mock


class Test__FillValueMaskCheckAndStoreTarget(tests.IrisTest):
Expand Down
4 changes: 2 additions & 2 deletions lib/iris/tests/unit/fileformats/netcdf/test_save.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) British Crown Copyright 2014 - 2017, Met Office
# (C) British Crown Copyright 2014 - 2018, Met Office
#
# This file is part of Iris.
#
Expand All @@ -23,14 +23,14 @@
# importing anything else.
import iris.tests as tests

import mock
import netCDF4 as nc
import numpy as np

import iris
from iris.coords import DimCoord
from iris.cube import Cube, CubeList
from iris.fileformats.netcdf import save, CF_CONVENTIONS_VERSION
from iris.tests import mock
from iris.tests.stock import lat_lon_cube


Expand Down
5 changes: 2 additions & 3 deletions lib/iris/tests/unit/fileformats/rules/test_Loader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) British Crown Copyright 2015 - 2017, Met Office
# (C) British Crown Copyright 2015 - 2018, Met Office
#
# This file is part of Iris.
#
Expand All @@ -23,9 +23,8 @@
# importing anything else.
import iris.tests as tests

import mock

from iris.fileformats.rules import Loader
from iris.tests import mock


class Test___init__(tests.IrisTest):
Expand Down
5 changes: 2 additions & 3 deletions lib/iris/tests/unit/fileformats/um/test_um_to_pp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) British Crown Copyright 2014 - 2016, Met Office
# (C) British Crown Copyright 2014 - 2018, Met Office
#
# This file is part of Iris.
#
Expand Down Expand Up @@ -27,9 +27,8 @@
# before importing anything else.
import iris.tests as tests

import mock

from iris.fileformats.um import um_to_pp
from iris.tests import mock


class Test_call(tests.IrisTest):
Expand Down
5 changes: 2 additions & 3 deletions lib/iris/tests/unit/lazy_data/test_as_lazy_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) British Crown Copyright 2017, Met Office
# (C) British Crown Copyright 2017 - 2018, Met Office
#
# This file is part of Iris.
#
Expand All @@ -23,13 +23,12 @@
# importing anything else.
import iris.tests as tests

import mock

import dask.array as da
import numpy as np
import numpy.ma as ma

from iris._lazy_data import as_lazy_data, _MAX_CHUNK_SIZE, _limited_shape
from iris.tests import mock


class Test_as_lazy_data(tests.IrisTest):
Expand Down
5 changes: 2 additions & 3 deletions lib/iris/tests/unit/test_sample_data_path.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) British Crown Copyright 2016 - 2017, Met Office
# (C) British Crown Copyright 2016 - 2018, Met Office
#
# This file is part of Iris.
#
Expand Down Expand Up @@ -28,9 +28,8 @@
import shutil
import tempfile

import mock

from iris import sample_data_path
from iris.tests import mock


def _temp_file(sample_dir):
Expand Down