Use unittest.mock instead of mock

Mock is now part of unittest

Author: galenlynch

allensdk/test/api/test_annotated_section_data_set_api.py

@@ -36,7 +36,7 @@
 from allensdk.api.queries.annotated_section_data_sets_api import \
     AnnotatedSectionDataSetsApi
 import pytest
-from mock import MagicMock
+from unittest.mock import MagicMock
 
 
 @pytest.fixture

allensdk/test/api/test_api.py

@@ -41,7 +41,7 @@
 
 import numpy as np
 import pytest
-from mock import MagicMock, patch, mock_open
+from unittest.mock import MagicMock, patch, mock_open
 from requests.exceptions import HTTPError
 import requests
 

allensdk/test/api/test_biophysical_api.py

@@ -3,7 +3,7 @@
 
 import numpy as np
 import pytest
-from mock import patch
+from unittest.mock import patch
 from allensdk.api.queries.biophysical_api import BiophysicalApi
 
 

allensdk/test/api/test_brain_observatory_api.py

@@ -40,7 +40,7 @@
 import numpy as np
 import pandas as pd
 import pytest
-from mock import patch, call
+from unittest.mock import patch, call
 from collections import Counter
 import datetime
 from allensdk.api.queries.brain_observatory_api import (

allensdk/test/api/test_cache.py

@@ -41,7 +41,7 @@
 import time
 
 import pytest
-from mock import MagicMock, mock_open, patch
+from unittest.mock import MagicMock, mock_open, patch
 
 from allensdk.api.warehouse_cache.cache import Cache, memoize, get_default_manifest_file
 from allensdk.api.queries.rma_api import RmaApi

allensdk/test/api/test_cacheable.py

@@ -34,7 +34,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 import pytest
-from mock import MagicMock, patch, mock_open
+from unittest.mock import MagicMock, patch, mock_open
 from allensdk.api.warehouse_cache.cache import Cache, cacheable
 from allensdk.api.queries.rma_api import RmaApi
 import pandas as pd

allensdk/test/api/test_cell_types_api.py

@@ -1,5 +1,5 @@
 import pytest, os
-from mock import patch, mock_open, MagicMock
+from unittest.mock import patch, mock_open, MagicMock
 from allensdk.api.queries.cell_types_api import CellTypesApi
 
 @pytest.fixture

allensdk/test/api/test_file_download.py

@@ -34,7 +34,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 import pytest
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 from allensdk.api.warehouse_cache.cache import cacheable, Cache
 from allensdk.config.manifest import Manifest
 import allensdk.core.json_utilities as ju

allensdk/test/api/test_grid_data_api.py

@@ -34,7 +34,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 import pytest
-from mock import MagicMock, patch
+from unittest.mock import MagicMock, patch
 from allensdk.api.queries.grid_data_api import GridDataApi
 
 

allensdk/test/api/test_image_download_api.py

@@ -34,7 +34,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 import pytest
-from mock import MagicMock
+from unittest.mock import MagicMock
 import numpy as np
 from allensdk.api.queries.image_download_api import ImageDownloadApi