diff --git a/docs/conf.py b/docs/conf.py index 5bf65da..07a0d42 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -15,7 +15,7 @@ import sys import os -from mock import Mock as MagicMock +from unittest.mock import Mock as MagicMock class Mock(MagicMock): @classmethod @@ -222,8 +222,8 @@ def __getattr__(cls, name): # (source start file, target name, title, # author, documentclass [howto, manual, or own class]). latex_documents = [ - ('index', 'BioMAJ.tex', u'BioMAJ Documentation', - u'Olivier Sallou', 'manual'), + ('index', 'BioMAJ.tex', 'BioMAJ Documentation', + 'Olivier Sallou', 'manual'), ] # The name of an image file (relative to this directory) to place at the top of @@ -252,8 +252,8 @@ def __getattr__(cls, name): # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - ('index', 'biomaj', u'BioMAJ Documentation', - [u'Olivier Sallou'], 1) + ('index', 'biomaj', 'BioMAJ Documentation', + ['Olivier Sallou'], 1) ] # If true, show URL addresses after external links. @@ -266,8 +266,8 @@ def __getattr__(cls, name): # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - ('index', 'BioMAJ', u'BioMAJ Documentation', - u'Olivier Sallou', 'BioMAJ', 'Biological databanks update.', + ('index', 'BioMAJ', 'BioMAJ Documentation', + 'Olivier Sallou', 'BioMAJ', 'Biological databanks update.', 'Miscellaneous'), ] diff --git a/docs/requirements.txt b/docs/requirements.txt index 9fdb1fc..fcfd901 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,4 +1,3 @@ -mock nose pymongo==3.2 tabulate diff --git a/requirements.txt b/requirements.txt index 689020a..21e1952 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,6 @@ biomaj_user biomaj_download>=3.2.1 biomaj_process>=3.0.12 biomaj_cli -mock pytest pymongo==3.12.3 pycurl diff --git a/setup.py b/setup.py index 398a8bf..0cf1ff7 100644 --- a/setup.py +++ b/setup.py @@ -74,7 +74,7 @@ def run(self): 'Yapsy==1.12.2', 'packaging' ], - 'tests_require': ['pytest', 'mock'], + 'tests_require': ['pytest'], 'packages': find_packages(), 'include_package_data': True, 'scripts': ['scripts/biomaj_migrate_database.py'], diff --git a/tests/biomaj_tests.py b/tests/biomaj_tests.py index b56b3ec..f2b5666 100644 --- a/tests/biomaj_tests.py +++ b/tests/biomaj_tests.py @@ -6,12 +6,10 @@ import copy import stat import time -import pytest - -from mock import patch - from optparse import OptionParser +from unittest.mock import patch +import pytest from biomaj.bank import Bank from biomaj.session import Session