importlib simplified

deeptools/alignmentSieve.py

@@ -7,12 +7,8 @@
 from deeptools import parserCommon
 from deeptools.bamHandler import openBam
 from deeptools.mapReduce import mapReduce
-try:  # keep python 3.7 support.
-    from importlib.metadata import version
-except ModuleNotFoundError:
-    from importlib_metadata import version
 from deeptools.utilities import getTLen, smartLabels, getTempFileName
-
+from importlib.metadata import version
 
 def parseArguments():
     parser = argparse.ArgumentParser(

deeptools/bamPEFragmentSize.py

@@ -18,11 +18,7 @@
 # own tools
 from deeptools.parserCommon import writableFile
 from deeptools.getFragmentAndReadSize import get_read_and_fragment_length
-try:  # keep python 3.7 support.
-    from importlib.metadata import version
-except ModuleNotFoundError:
-    from importlib_metadata import version
-
+from importlib.metadata import version
 
 def parse_arguments():
     parser = argparse.ArgumentParser(

deeptools/computeMatrix.py

@@ -7,15 +7,11 @@
 import multiprocessing
 
 from deeptools.parserCommon import writableFile, numberOfProcessors
-try:  # keep python 3.7 support.
-    from importlib.metadata import version
-except ModuleNotFoundError:
-    from importlib_metadata import version
 from deeptools import parserCommon
 from deeptools import heatmapper
 import deeptools.computeMatrixOperations as cmo
 import deeptools.deepBlue as db
-
+from importlib.metadata import version
 
 def parse_arguments(args=None):
     parser = \

deeptools/computeMatrixOperations.py

@@ -6,11 +6,7 @@
 import sys
 import os
 import csv
-try:  # keep python 3.7 support.
-    from importlib.metadata import version
-except ModuleNotFoundError:
-    from importlib_metadata import version
-
+from importlib.metadata import version
 
 def parse_arguments():
     parser = argparse.ArgumentParser(

deeptools/deeptools_list_tools.py

@@ -3,11 +3,7 @@
 
 import argparse
 import sys
-try:  # keep python 3.7 support.
-    from importlib.metadata import version
-except ModuleNotFoundError:
-    from importlib_metadata import version
-
+from importlib.metadata import version
 
 def parse_arguments(args=None):
     parser = argparse.ArgumentParser(

deeptools/estimateReadFiltering.py

@@ -5,11 +5,7 @@
 from deeptools import parserCommon, bamHandler, utilities
 from deeptools.mapReduce import mapReduce
 from deeptools.utilities import smartLabels
-try:  # keep python 3.7 support.
-    from importlib.metadata import version
-except ModuleNotFoundError:
-    from importlib_metadata import version
-
+from importlib.metadata import version
 
 def parseArguments():
     parser = argparse.ArgumentParser(

deeptools/estimateScaleFactor.py

@@ -6,11 +6,7 @@
 
 from deeptools.SES_scaleFactor import estimateScaleFactor
 from deeptools.parserCommon import numberOfProcessors
-try:  # keep python 3.7 support.
-    from importlib.metadata import version
-except ModuleNotFoundError:
-    from importlib_metadata import version
-
+from importlib.metadata import version
 debug = 0
 
 

deeptools/getFragmentAndReadSize.py

@@ -76,7 +76,8 @@ def get_read_and_fragment_length(bamFile, return_lengths=False, blackListFileNam
     -------
     d : dict
         tuple of two dictionaries, one for the fragment length and the other
-        for the read length. The dictionaries summarise the mean, median etc. values
+for the read length. The dictionaries summarise the mean, median etc. values
+
     """
 
     bam_handle = bamHandler.openBam(bamFile)

deeptools/multiBamSummary.py

@@ -9,11 +9,7 @@
 import deeptools.countReadsPerBin as countR
 from deeptools import parserCommon
 from deeptools.utilities import smartLabels
-try:  # keep python 3.7 support.
-    from importlib.metadata import version
-except ModuleNotFoundError:
-    from importlib_metadata import version
-
+from importlib.metadata import version
 old_settings = np.seterr(all='ignore')
 
 

deeptools/multiBigwigSummary.py

@@ -10,10 +10,7 @@
 from deeptools.utilities import smartLabels
 import deeptools.getScorePerBigWigBin as score_bw
 import deeptools.deepBlue as db
-try:  # keep python 3.7 support.
-    from importlib.metadata import version
-except ModuleNotFoundError:
-    from importlib_metadata import version
+from importlib.metadata import version
 
 old_settings = np.seterr(all='ignore')
 

deeptools/parserCommon.py

@@ -1,10 +1,6 @@
 import argparse
 import os
-try:  # keep python 3.7 support.
-    from importlib.metadata import version
-except ModuleNotFoundError:
-    from importlib_metadata import version
-
+from importlib.metadata import version
 
 def check_float_0_1(value):
     v = float(value)

deeptools/plotCorrelation.py

@@ -10,13 +10,9 @@
 matplotlib.rcParams['svg.fonttype'] = 'none'
 from deeptools import cm  # noqa: F401
 import matplotlib.pyplot as plt
-
+from importlib.metadata import version
 from deeptools.correlation import Correlation
 from deeptools.parserCommon import writableFile
-try:  # keep python 3.7 support.
-    from importlib.metadata import version
-except ModuleNotFoundError:
-    from importlib_metadata import version
 
 old_settings = np.seterr(all='ignore')
 

deeptools/plotCoverage.py

@@ -14,14 +14,10 @@
 import matplotlib.pyplot as plt
 import plotly.offline as py
 import plotly.graph_objs as go
-
+from importlib.metadata import version
 import deeptools.countReadsPerBin as countR
 from deeptools import parserCommon
 from deeptools.utilities import smartLabels
-try:  # keep python 3.7 support.
-    from importlib.metadata import version
-except ModuleNotFoundError:
-    from importlib_metadata import version
 
 old_settings = np.seterr(all='ignore')
 

deeptools/plotPCA.py

@@ -8,13 +8,9 @@
 matplotlib.rcParams['pdf.fonttype'] = 42
 matplotlib.rcParams['svg.fonttype'] = 'none'
 from deeptools import cm  # noqa: F401
-
+from importlib.metadata import version
 from deeptools.correlation import Correlation
 from deeptools.parserCommon import writableFile
-try:  # keep python 3.7 support.
-    from importlib.metadata import version
-except ModuleNotFoundError:
-    from importlib_metadata import version
 
 
 def parse_arguments(args=None):