Moved commonlib.export to calculators

gem · Dec 4, 2016 · 1bd7382 · 1bd7382
1 parent cc13e06
commit 1bd7382
Show file tree

Hide file tree

Showing 19 changed files with 26 additions and 26 deletions.
diff --git a/doc/sphinx/openquake.commonlib.export.rst b/doc/sphinx/openquake.commonlib.export.rst
@@ -1,18 +1,18 @@
-openquake.commonlib.export package
+openquake.calculators.export package
 ==================================
 
-openquake.commonlib.export.hazard module
+openquake.calculators.export.hazard module
 ----------------------------------------
 
-.. automodule:: openquake.commonlib.export.hazard
+.. automodule:: openquake.calculators.export.hazard
     :members:
     :undoc-members:
     :show-inheritance:
 
-openquake.commonlib.export.risk module
+openquake.calculators.export.risk module
 --------------------------------------
 
-.. automodule:: openquake.commonlib.export.risk
+.. automodule:: openquake.calculators.export.risk
     :members:
     :undoc-members:
     :show-inheritance:
@@ -21,7 +21,7 @@ openquake.commonlib.export.risk module
 Module contents
 ---------------
 
-.. automodule:: openquake.commonlib.export
+.. automodule:: openquake.calculators.export
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/doc/tutorials/my_calculators/scenario.py b/doc/tutorials/my_calculators/scenario.py
@@ -19,7 +19,7 @@
 from openquake.calculators import base
 from openquake.commonlib import readinput
 from openquake.hazardlib.calc.gmf import ground_motion_fields
-from openquake.commonlib.export import export
+from openquake.calculators.export import export
 
 
 @base.calculators.add('my_scenario')

diff --git a/openquake/calculators/base.py b/openquake/calculators/base.py
@@ -39,7 +39,7 @@
 from openquake.commonlib.oqvalidation import OqParam
 from openquake.baselib.parallel import starmap, executor, wakeup_pool
 from openquake.baselib.python3compat import with_metaclass
-from openquake.commonlib.export import export as exp
+from openquake.calculators.export import export as exp
 
 get_taxonomy = operator.attrgetter('taxonomy')
 get_weight = operator.attrgetter('weight')

diff --git a/openquake/commonlib/export/__init__.py → openquake/calculators/export/__init__.py b/openquake/commonlib/export/__init__.py → openquake/calculators/export/__init__.py
@@ -63,4 +63,4 @@ def keyfunc(ekey):
 
 export.from_db = False  # overridden when exporting from db
 
-import_all('openquake.commonlib.export')
+import_all('openquake.calculators.export')
diff --git a/openquake/commonlib/export/hazard.py → openquake/calculators/export/hazard.py b/openquake/commonlib/export/hazard.py → openquake/calculators/export/hazard.py
@@ -29,7 +29,7 @@
 from openquake.hazardlib.imt import from_string
 from openquake.hazardlib.calc import disagg, gmf
 from openquake.risklib.riskinput import GmfGetter
-from openquake.commonlib.export import export
+from openquake.calculators.export import export
 from openquake.commonlib import writers, hazard_writers, calc, util
 
 F32 = numpy.float32

diff --git a/openquake/commonlib/export/risk.py → openquake/calculators/export/risk.py b/openquake/commonlib/export/risk.py → openquake/calculators/export/risk.py
@@ -23,8 +23,8 @@
 
 from openquake.baselib.general import AccumDict, get_array, group_array
 from openquake.risklib import scientific, riskinput
-from openquake.commonlib.export import export
-from openquake.commonlib.export.hazard import build_etags, get_sm_id_eid, savez
+from openquake.calculators.export import export
+from openquake.calculators.export.hazard import build_etags, get_sm_id_eid, savez
 from openquake.commonlib import writers, risk_writers
 from openquake.commonlib.util import get_assets, compose_arrays
 from openquake.commonlib.risk_writers import (

diff --git a/openquake/calculators/scenario.py b/openquake/calculators/scenario.py
@@ -21,7 +21,7 @@
 from openquake.hazardlib.calc import filters
 from openquake.hazardlib.calc.gmf import GmfComputer
 from openquake.commonlib import readinput, source, calc
-from openquake.commonlib.export.hazard import gmv_dt
+from openquake.calculators.export.hazard import gmv_dt
 from openquake.calculators import base
 
 

diff --git a/openquake/calculators/tests/classical_risk_test.py b/openquake/calculators/tests/classical_risk_test.py
@@ -23,7 +23,7 @@
 from openquake.baselib.general import writetmp
 from openquake.calculators.tests import CalculatorTestCase
 from openquake.commonlib.writers import scientificformat
-from openquake.commonlib.export import export
+from openquake.calculators.export import export
 from openquake.calculators.views import view
 
 

diff --git a/openquake/calculators/tests/classical_test.py b/openquake/calculators/tests/classical_test.py
@@ -19,7 +19,7 @@
 from nose.plugins.attrib import attr
 from openquake.baselib import parallel
 from openquake.commonlib import InvalidFile
-from openquake.commonlib.export import export
+from openquake.calculators.export import export
 from openquake.calculators.tests import CalculatorTestCase, check_platform
 from openquake.qa_tests_data.classical import (
     case_1, case_2, case_3, case_4, case_5, case_6, case_7, case_8, case_9,

diff --git a/openquake/calculators/tests/event_based_risk_test.py b/openquake/calculators/tests/event_based_risk_test.py
@@ -20,7 +20,7 @@
 from openquake.baselib.general import writetmp
 from openquake.calculators.views import view
 from openquake.calculators.tests import CalculatorTestCase, strip_calc_id
-from openquake.commonlib.export import export
+from openquake.calculators.export import export
 from openquake.calculators.tests import check_platform
 from openquake.qa_tests_data.event_based_risk import (
     case_1, case_2, case_3, case_4, case_4a, case_master, case_miriam,

diff --git a/openquake/calculators/tests/event_based_test.py b/openquake/calculators/tests/event_based_test.py
@@ -27,7 +27,7 @@
 from openquake.baselib.general import group_array
 from openquake.commonlib.datastore import read
 from openquake.commonlib.util import max_rel_diff_index
-from openquake.commonlib.export import export
+from openquake.calculators.export import export
 from openquake.calculators.event_based import get_mean_curves
 from openquake.calculators.tests import CalculatorTestCase
 from openquake.qa_tests_data.event_based import (

diff --git a/openquake/calculators/tests/scenario_risk_test.py b/openquake/calculators/tests/scenario_risk_test.py
@@ -25,7 +25,7 @@
 from openquake.baselib.general import writetmp
 from openquake.calculators.tests import CalculatorTestCase
 from openquake.calculators.views import view
-from openquake.commonlib.export import export
+from openquake.calculators.export import export
 
 
 class ScenarioRiskTestCase(CalculatorTestCase):

diff --git a/openquake/calculators/tests/ucerf_test.py b/openquake/calculators/tests/ucerf_test.py
@@ -18,7 +18,7 @@
 import h5py
 import unittest
 from openquake.baselib.general import writetmp
-from openquake.commonlib.export import export
+from openquake.calculators.export import export
 from openquake.calculators.views import view
 from openquake.qa_tests_data import ucerf
 from openquake.calculators.tests import CalculatorTestCase, strip_calc_id

diff --git a/openquake/commands/export.py b/openquake/commands/export.py
@@ -22,7 +22,7 @@
 
 from openquake.baselib import general, performance, sap
 from openquake.commonlib import datastore
-from openquake.commonlib.export import export as export_
+from openquake.calculators.export import export as export_
 
 
 # the export is tested in the demos

diff --git a/openquake/commands/info.py b/openquake/commands/info.py
@@ -26,7 +26,7 @@
 from openquake.baselib.performance import Monitor
 from openquake.commonlib import nrml, readinput
 from openquake.baselib.parallel import get_pickled_sizes
-from openquake.commonlib.export import export
+from openquake.calculators.export import export
 from openquake.calculators import base, reportwriter
 from openquake.calculators.views import view, rst_table
 from openquake.hazardlib import gsim

diff --git a/openquake/commonlib/source.py b/openquake/commonlib/source.py
@@ -411,7 +411,7 @@ def __fromh5__(self, dic, attrs):
                 sourceconverter.SourceGroup(
                     self.trts[trti], id=grp_id, eff_ruptures=effrup)
                 for grp_id, trti, effrup, sm_id in tdata if effrup]
-            path = tuple(decode(rec['path']).split('_'))
+            path = tuple(str(decode(rec['path'])).split('_'))
             trts = set(sg.trt for sg in srcgroups)
             num_gsim_paths = self.gsim_lt.reduce(trts).get_num_paths()
             sm = SourceModel(rec['name'], rec['weight'], path, srcgroups,

diff --git a/openquake/engine/engine.py b/openquake/engine/engine.py
@@ -28,8 +28,8 @@
 from openquake.risklib import valid
 from openquake.baselib import parallel
 from openquake.commonlib.oqvalidation import OqParam
-from openquake.commonlib import export, datastore, config, readinput
-from openquake.calculators import base, views
+from openquake.commonlib import datastore, config, readinput
+from openquake.calculators import base, views, export
 from openquake.engine import logs
 
 TERMINATE = valid.boolean(

diff --git a/openquake/engine/export/core.py b/openquake/engine/export/core.py
@@ -26,7 +26,7 @@
 import zipfile
 import traceback
 
-from openquake.commonlib.export import export
+from openquake.calculators.export import export
 from openquake.commonlib import datastore
 from openquake.engine import logs, __version__
 

diff --git a/openquake/server/views.py b/openquake/server/views.py
@@ -46,7 +46,7 @@
 from openquake.baselib.python3compat import unicode
 from openquake.commonlib import nrml, readinput, oqvalidation
 from openquake.baselib.parallel import TaskManager, safely_call
-from openquake.commonlib.export import export
+from openquake.calculators.export import export
 from openquake.engine import __version__ as oqversion
 from openquake.engine.export import core
 from openquake.engine import engine, logs