Merge pull request #651 from yan12125/unittest-mock

Replace mock with unittest.mock

.github/workflows/tests.yml

@@ -50,10 +50,10 @@ jobs:
         python -m pip install jupyterlab~=3.0
         npm install -g codecov
 
-    - name: Use Node.js 12.x
+    - name: Use Node.js 14.x
       uses: actions/setup-node@v1
       with:
-        node-version: 12.x
+        node-version: 14.x
     - name: Get npm cache directory
       id: npm-cache-dir
       run: |
@@ -95,6 +95,7 @@ jobs:
           ${{ runner.os }}-pip-
     - name: Install dependencies
       run: |
+        export NODE_OPTIONS="--openssl-legacy-provider"
         python -m pip install codecov
         python -m pip install --upgrade pip
         python -m pip install jupyterlab~=3.0

nbdime/tests/test_git_diffdriver.py

@@ -9,8 +9,8 @@
 import os
 from os.path import join as pjoin
 import sys
+from unittest import mock
 
-import mock
 import pytest
 from tornado import ioloop
 

nbdime/tests/test_hg_differ.py

@@ -7,8 +7,8 @@
 
 import os
 from os.path import join as pjoin
+from unittest import mock
 
-import mock
 import pytest
 from tornado import ioloop
 

setup.py

@@ -140,7 +140,6 @@
         'pytest-tornado',
         'jupyter_server[test]',
         'jsonschema',
-        'mock',
         'notebook',
         'requests',
         'tabulate',  # For profiling