From f2689c81481695da9559df21b8376182f553083b 2017-11-06 22:31:01
From: Juan C. Espinoza <juan.espinoza@jro.igp.gob.pe>
Date: 2017-11-06 22:31:01
Subject: [PATCH] Move schaincli to schainpy.cli

---

diff --git a/schaincli/README.md b/schainpy/cli/README.md
similarity index 100%
rename from schaincli/README.md
rename to schainpy/cli/README.md
diff --git a/schaincli/__init__.py b/schainpy/cli/__init__.py
similarity index 100%
rename from schaincli/__init__.py
rename to schainpy/cli/__init__.py
diff --git a/schaincli/cli.py b/schainpy/cli/cli.py
similarity index 99%
rename from schaincli/cli.py
rename to schainpy/cli/cli.py
index 46e2cbb..9480dfc 100644
--- a/schaincli/cli.py
+++ b/schainpy/cli/cli.py
@@ -7,7 +7,6 @@ import glob
 save_stdout = sys.stdout
 sys.stdout = open('trash', 'w')
 from multiprocessing import cpu_count
-from schaincli import templates
 from schainpy.controller import Project
 from schainpy.model import Operation, ProcessingUnit
 from schainpy.utils import log
@@ -15,6 +14,7 @@ from importlib import import_module
 from pydoc import locate
 from fuzzywuzzy import process
 from schainpy.utils import paramsFinder
+import templates
 sys.stdout = save_stdout
 
 
diff --git a/schaincli/templates.py b/schainpy/cli/templates.py
similarity index 100%
rename from schaincli/templates.py
rename to schainpy/cli/templates.py
diff --git a/schaincli/tests/__init__.py b/schainpy/cli/tests/__init__.py
similarity index 100%
rename from schaincli/tests/__init__.py
rename to schainpy/cli/tests/__init__.py
diff --git a/schaincli/tests/test_cli.py b/schainpy/cli/tests/test_cli.py
similarity index 95%
rename from schaincli/tests/test_cli.py
rename to schainpy/cli/tests/test_cli.py
index 62e4f30..7af3a6f 100644
--- a/schaincli/tests/test_cli.py
+++ b/schainpy/cli/tests/test_cli.py
@@ -1,6 +1,6 @@
 import pytest
 from click.testing import CliRunner
-from schaincli import cli
+from schainpy.cli import cli
 
 
 @pytest.fixture
diff --git a/schainpy/gui/schainGUI b/schainpy/gui/schainGUI
index b3a8c54..6532eee 100644
--- a/schainpy/gui/schainGUI
+++ b/schainpy/gui/schainGUI
@@ -11,7 +11,6 @@ except:
         'You should install PyQt4 module in order to run the GUI. See the README.')
     sys.exit()
 
-
 from schainpy.gui.viewcontroller.initwindow import InitWindow
 from schainpy.gui.viewcontroller.basicwindow import BasicWindow
 from schainpy.gui.viewcontroller.workspace import Workspace
diff --git a/schainpy/model/utils/jroutils_publish.py b/schainpy/model/utils/jroutils_publish.py
index a1236e6..4b48b5b 100644
--- a/schainpy/model/utils/jroutils_publish.py
+++ b/schainpy/model/utils/jroutils_publish.py
@@ -147,7 +147,8 @@ class Data(object):
             return
 
         self.parameters = getattr(dataOut, 'parameters', [])
-        self.pairs = dataOut.pairsList
+        if hasattr(dataOut, 'pairsList'):
+            self.pairs = dataOut.pairsList
         self.channels = dataOut.channelList
         self.interval = dataOut.getTimeInterval()
         self.localtime = dataOut.useLocalTime
@@ -499,7 +500,7 @@ class PlotterReceiver(ProcessingUnit, Process):
 
         self.address = address
         self.plot_address = plot_address
-        self.plottypes = [s.strip() for s in kwargs.get('plottypes', 'rti').split(',')]
+        self.plottypes = [s.strip() for s in kwargs.get('plottypes', '').split(',') if s]
         self.realtime = kwargs.get('realtime', False)
         self.localtime = kwargs.get('localtime', True)
         self.throttle_value = kwargs.get('throttle', 5)
diff --git a/setup.py b/setup.py
index 4578386..3631dcc 100644
--- a/setup.py
+++ b/setup.py
@@ -17,13 +17,13 @@ class build_ext(_build_ext):
         import numpy
         self.include_dirs.append(numpy.get_include())
 
-setup(name="schainpy",
-      version=__version__,
-      description="Python tools to read, write and process Jicamarca data",
-      author="Miguel Urco",
-      author_email="miguel.urco@jro.igp.gob.pe",
-      url="http://jro.igp.gob.pe",
-      packages={'schainpy',
+setup(name = "schainpy",
+      version = __version__,
+      description = "Python tools to read, write and process Jicamarca data",
+      author = "Miguel Urco",
+      author_email = "miguel.urco@jro.igp.gob.pe",
+      url = "http://jro.igp.gob.pe",
+      packages = {'schainpy',
                   'schainpy.model',
                   'schainpy.model.data',
                   'schainpy.model.graphics',
@@ -36,25 +36,25 @@ setup(name="schainpy",
                   'schainpy.gui.figures',
                   'schainpy.gui.viewcontroller',
                   'schainpy.gui.viewer',
-                  'schainpy.gui.viewer.windows'},
-      ext_package='schainpy',
-      py_modules=[''],
-      package_data={'': ['schain.conf.template'],
-                    'schainpy.gui.figures': ['*.png', '*.jpg'],
-                    },
-      include_package_data=False,
-      scripts=['schainpy/gui/schainGUI'],
-      ext_modules=[
-          Extension("cSchain", ["schainpy/model/proc/extensions.c"]
-                    )],
-      entry_points={
+                  'schainpy.gui.viewer.windows',
+                  'schainpy.cli'},
+      ext_package = 'schainpy',      
+      package_data = {'': ['schain.conf.template'],
+                      'schainpy.gui.figures': ['*.png', '*.jpg'],
+                     },
+      include_package_data = False,
+      scripts = ['schainpy/gui/schainGUI'],
+      ext_modules = [
+          Extension("cSchain", ["schainpy/model/proc/extensions.c"])
+          ],
+      entry_points = {
           'console_scripts': [
-              'schain = schaincli.cli:main',
+              'schain = schainpy.cli.cli:main',
           ],
       },
-      cmdclass={'build_ext': build_ext},
-      setup_requires=["numpy >= 1.11.2"],
-      install_requires=[
+      cmdclass = {'build_ext': build_ext},
+      setup_requires = ["numpy >= 1.11.2"],
+      install_requires = [
           "scipy >= 0.14.0",
           "h5py >= 2.2.1",
           "matplotlib >= 2.0.0",
@@ -65,5 +65,5 @@ setup(name="schainpy",
           "fuzzywuzzy",
           "click",
           "python-Levenshtein"
-      ],
-      )
+          ],
+)