Merge pull request #134 from a-detiste/master

remove dependency on python3-future

Author: mboudet

biomaj/bank.py

@@ -1,5 +1,3 @@
-from builtins import str
-from builtins import object
 import os
 import logging
 import time
@@ -25,7 +23,7 @@
 import getpass
 
 
-class Bank(object):
+class Bank:
     """
     BioMAJ bank
     """

biomaj/mongo_connector.py

@@ -1,8 +1,7 @@
-from builtins import object
 from pymongo import MongoClient
 
 
-class MongoConnector(object):
+class MongoConnector:
     """
     Connector to mongodb
     """

biomaj/notify.py

@@ -1,5 +1,3 @@
-from builtins import str
-from builtins import object
 import smtplib
 import email.utils
 from biomaj.workflow import Workflow
@@ -8,16 +6,13 @@
 import sys
 from email.mime.base import MIMEBase
 from email.mime.multipart import MIMEMultipart
+from email.mime.text import MIMEText
 from email import encoders
-from jinja2 import Template
 
-if sys.version < '3':
-    from email.MIMEText import MIMEText
-else:
-    from email.mime.text import MIMEText
+from jinja2 import Template
 
 
-class Notify(object):
+class Notify:
     """
     Send notifications
     """

biomaj/options.py

@@ -1,7 +1,4 @@
-from builtins import object
-
-
-class Options(object):
+class Options:
     """
     Available options
     """

biomaj/process/metaprocess.py

@@ -1,4 +1,3 @@
-from builtins import str
 import threading
 import logging
 import os

biomaj/process/processfactory.py

@@ -1,12 +1,10 @@
-from builtins import range
-from builtins import object
 import threading
 import logging
 import os
 from biomaj.process.metaprocess import MetaProcess
 
 
-class ProcessFactory(object):
+class ProcessFactory:
     '''
     Manage process execution
     '''

biomaj/schema_version.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import pkg_resources
 import string
 import random
@@ -12,7 +11,7 @@
 import logging
 
 
-class SchemaVersion(object):
+class SchemaVersion:
 
     """
     BioMAJ database schema version. This package can be used to make some schema modification if needed during

biomaj/session.py

@@ -1,17 +1,13 @@
-from future import standard_library
-from builtins import str
-from builtins import object
 import os
 import time
 import copy
 import sys
 
 from biomaj.workflow import Workflow
 
-standard_library.install_aliases()
 
 
-class Session(object):
+class Session:
     """
     BioMAJ bank session
     """

biomaj/workflow.py

@@ -1,6 +1,3 @@
-from builtins import str
-from builtins import range
-from builtins import object
 import logging
 import datetime
 import time
@@ -29,7 +26,7 @@
 from packaging.version import parse
 
 
-class Workflow(object):
+class Workflow:
     """
     Bank update workflow
     """

docs/requirements.txt

@@ -5,7 +5,6 @@ tabulate
 ldap3
 py-bcrypt
 drmaa
-future
 elasticsearch
 biomaj_core
 biomaj_user