From ca4d335dd3fdd83350707d11d1b1055ba8f00067 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Fri, 16 Apr 2021 18:25:39 +0100
Subject: [PATCH] MNT: Remove six/backported mock
---
requirements.txt | 1 -
setup.py | 10 +++-------
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/requirements.txt b/requirements.txt
index 23dc58fde..faf34174f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,5 +2,4 @@ h5py>=2.9
nibabel>=2.4
numpy>=1
scipy>=0.18
-six>=1
dataclasses
diff --git a/setup.py b/setup.py
index 44e341281..60c5d46c2 100644
--- a/setup.py
+++ b/setup.py
@@ -8,8 +8,9 @@
from __future__ import print_function
-import os.path as op
-import shutil
+import os.path as op
+import shutil
+import unittest.mock as mock
from setuptools import setup
from setuptools import find_namespace_packages
@@ -68,11 +69,6 @@ class doc(Command):
import sphinx.cmd.build as sphinx_build
- try:
- import unittest.mock as mock
- except:
- import mock
-
mockobj = mock.MagicMock()
mockobj.__version__ = '2.2.0'
mockedModules = open(op.join(docdir, 'mock_modules.txt')).readlines()
--
GitLab