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.

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

remove usage of old external mock library #138

Merged
merged 1 commit into from
Jul 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 7 additions & 7 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand All @@ -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'),
]

Expand Down
1 change: 0 additions & 1 deletion docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
mock
nose
pymongo==3.2
tabulate
Expand Down
1 change: 0 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
Expand Down
6 changes: 2 additions & 4 deletions tests/biomaj_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down