Merge pull request #184 from bam241/clean_import

removing Pyne import when not required

CHANGELOG.rst

@@ -8,6 +8,7 @@ cymetric Change Log
 
 **Changed**
 * Converted test suite from nose to pytest (#188)
+* Removed some unused imports, mainly pyne (#184)
 
 v1.5.5
 ====================

cymetric/execution.py

@@ -13,6 +13,7 @@
 import numpy as np
 import pandas as pd
 
+
 from cymetric.evaluator import Evaluator, METRIC_REGISTRY
 
 

cymetric/fco_metrics.py

@@ -1,5 +1,7 @@
 """FCO metrics"""
 import pandas as pd
+
+
 try:
     from pyne import data
     import pyne.enrichment as enr
@@ -167,9 +169,15 @@ def fco_fuel_loading(mats, trans):
     mass = mass.groupby(mass.index)['Mass'].sum()
     mass = mass.reset_index()
     # sum by years (12 time steps)
-    mass = pd.DataFrame(data={'Year': mass.TimeCreated.apply(lambda x: x // 12),
-                              'FuelLoading': mass.Mass.apply(lambda x: x / 1000)},
-                        columns=['Year', 'FuelLoading'])
+    mass = pd.DataFrame(
+        data={
+            'Year': mass.TimeCreated.apply(
+                lambda x: x // 12),
+            'FuelLoading': mass.Mass.apply(
+                lambda x: x / 1000)},
+        columns=[
+            'Year',
+            'FuelLoading'])
     mass = mass.groupby('Year').sum()
     rtn = mass.reset_index()
     return rtn

cymetric/filters.py

@@ -1,6 +1,4 @@
 import warnings
-import pandas as pd
-import numpy as np
 
 try:
     from graphviz import Digraph
@@ -10,8 +8,6 @@
 
 try:
     from pyne import data
-    import pyne.enrichment as enr
-    from pyne import nucname
     HAVE_PYNE = True
 except ImportError:
     HAVE_PYNE = False

cymetric/graphs.py

@@ -2,23 +2,13 @@
 """
 import warnings
 
-import pandas as pd
-import numpy as np
 
 try:
     from graphviz import Digraph
     HAVE_GRAPHVIZ = True
 except ImportError:
     HAVE_GRAPHVIZ = False
 
-try:
-    from pyne import data
-    import pyne.enrichment as enr
-    from pyne import nucname
-    HAVE_PYNE = True
-except ImportError:
-    HAVE_PYNE = False
-
 from cymetric import tools
 from cymetric.filters import transactions_nuc
 

cymetric/metrics.py

@@ -6,9 +6,9 @@
 import numpy as np
 import pandas as pd
 
+
 try:
     from pyne import data
-    import pyne.enrichment as enr
     HAVE_PYNE = True
 except ImportError:
     HAVE_PYNE = False
@@ -284,7 +284,7 @@ def agents(entry, exit, decom, info):
     mergeon = ['SimId', 'AgentId']
     df = entry[['SimId', 'AgentId', 'Kind', 'Spec', 'Prototype', 'ParentId',
                 'Lifetime', 'EnterTime']]
-    df['ExitTime'] = [np.nan]*len(entry)
+    df['ExitTime'] = [np.nan] * len(entry)
     if exit is not None:
         exit.columns = ['SimId', 'AgentId', 'Exits']
         df = tools.merge_and_fillna_col(df, exit[['SimId', 'AgentId',

cymetric/schemas.py

@@ -8,7 +8,6 @@
 else:
     str_types = (str, unicode)
 
-from cyclus import typesystem as ts
 from cyclus.typesystem import NAMES, RANKS, IDS
 
 
@@ -40,8 +39,9 @@ def canon_shape(shape, dbtype):
             s.append(i)
         rank = RANKS[dbtype]
         if len(s) != rank:
-            msg = ('the shape rank for the {0} type must be {1}, got {2} for a '
-                   'shape of {3}.')
+            msg = (
+                'the shape rank for the {0} type must be {1}, got {2} for a '
+                'shape of {3}.')
             raise ValueError(msg.format(NAMES[dbtype], rank, len(s), s))
         rtn = tuple(s)
     elif isinstance(shape, int):

cymetric/timeseries.py

@@ -1,16 +1,5 @@
 import warnings
 
-import pandas as pd
-import numpy as np
-
-try:
-    from pyne import data
-    import pyne.enrichment as enr
-    from pyne import nucname
-    HAVE_PYNE = True
-except ImportError:
-    HAVE_PYNE = False
-
 from cymetric import tools
 from cymetric import filters
 
@@ -42,7 +31,12 @@ def transactions(evaler, senders=(), receivers=(), commodities=(), nucs=()):
     return df
 
 
-def transactions_activity(evaler, senders=(), receivers=(), commodities=(), nucs=()):
+def transactions_activity(
+        evaler,
+        senders=(),
+        receivers=(),
+        commodities=(),
+        nucs=()):
     """
     Shape the reduced transation Data Frame into a simple time serie. Applying nuclides selection when required.
 
@@ -86,8 +80,8 @@ def transactions_decayheat(
     if len(nucs) != 0:
         nucs = tools.format_nucs(nucs)
 
-    df = filters.transactions_decayheat(evaler, senders, receivers, commodities,
-                                        nucs)
+    df = filters.transactions_decayheat(
+        evaler, senders, receivers, commodities, nucs)
 
     df = df[['Time', 'DecayHeat']].groupby(['Time']).sum()
     df.reset_index(inplace=True)

cymetric/tools.py

@@ -5,12 +5,10 @@
 import sys
 import warnings
 
-import numpy as np
 import pandas as pd
 
+
 try:
-    from pyne import data
-    import pyne.enrichment as enr
     from pyne import nucname
     HAVE_PYNE = True
 except ImportError:
@@ -26,8 +24,9 @@ def dbopen(fname):
     """Opens a Cyclus database."""
     _, ext = os.path.splitext(fname)
     if ext not in EXT_BACKENDS:
-        msg = ('The backend database type of {0!r} could not be determined from '
-               'extension {1!r}.')
+        msg = (
+            'The backend database type of {0!r} could not be determined from '
+            'extension {1!r}.')
         raise ValueError(msg.format(fname, ext))
     db = EXT_BACKENDS[ext](fname)
     return db