schain Commit - r1113:f2689c814816 · Jicamarca Repository

Move schaincli to schainpy.cli

Juan C. Espinoza -

r1113:f2689c814816

parent child

Context file:

r1113:f2689c814816

Collapse all files

schainpy/cli/README.md ~~schaincli/README.md~~ renamed 0 0

NO CONTENT: file renamed from schaincli/README.md to schainpy/cli/README.md

schainpy/cli/__init__.py ~~schaincli/__init__.py~~ renamed 0 0

NO CONTENT: file renamed from schaincli/__init__.py to schainpy/cli/__init__.py

schainpy/cli/cli.py ~~schaincli/cli.py~~ renamed +1 -1

             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
             from pydoc import locate
             from fuzzywuzzy import process
             from schainpy.utils import paramsFinder
+            import templates
             sys.stdout = save_stdout

schainpy/cli/templates.py ~~schaincli/templates.py~~ renamed 0 0

NO CONTENT: file renamed from schaincli/templates.py to schainpy/cli/templates.py

schainpy/cli/tests/__init__.py ~~schaincli/tests/__init__.py~~ renamed 0 0

NO CONTENT: file renamed from schaincli/tests/__init__.py to schainpy/cli/tests/__init__.py

schainpy/cli/tests/test_cli.py ~~schaincli/tests/test_cli.py~~ renamed +1 -1

             import pytest
             from click.testing import CliRunner
-            from schaincli import cli
+            from schainpy.cli import cli
             @pytest.fixture

schainpy/gui/schainGUI 0 -1

                     '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

schainpy/model/utils/jroutils_publish.py +3 -2

                         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
                     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)

setup.py +25 -25

@@ -17,13 +17,13 class build_ext(_build_ext):
17	import numpy	17	import numpy
18	self.include_dirs.append(numpy.get_include())	18	self.include_dirs.append(numpy.get_include())
19		19
20	setup(name="schainpy",	20	setup(name = "schainpy",
21	version=__version__,	21	version = __version__,
22	description="Python tools to read, write and process Jicamarca data",	22	description = "Python tools to read, write and process Jicamarca data",
23	author="Miguel Urco",	23	author = "Miguel Urco",
24	author_email="miguel.urco@jro.igp.gob.pe",	24	author_email = "miguel.urco@jro.igp.gob.pe",
25	url="http://jro.igp.gob.pe",	25	url = "http://jro.igp.gob.pe",
26	packages={'schainpy',	26	packages = {'schainpy',
27	'schainpy.model',	27	'schainpy.model',
28	'schainpy.model.data',	28	'schainpy.model.data',
29	'schainpy.model.graphics',	29	'schainpy.model.graphics',
@@ -36,25 +36,25 setup(name="schainpy",
36	'schainpy.gui.figures',	36	'schainpy.gui.figures',
37	'schainpy.gui.viewcontroller',	37	'schainpy.gui.viewcontroller',
38	'schainpy.gui.viewer',	38	'schainpy.gui.viewer',
39	'schainpy.gui.viewer.windows'},	39	'schainpy.gui.viewer.windows',
40	ext_package='schainpy',	40	'schainpy.cli'},
41	py_modules=[''],	41	ext_package = 'schainpy',
42	package_data={'': ['schain.conf.template'],	42	package_data = {'': ['schain.conf.template'],
43	'schainpy.gui.figures': ['.png', '.jpg'],	43	'schainpy.gui.figures': ['.png', '.jpg'],
44	},	44	},
45	include_package_data=False,	45	include_package_data = False,
46	scripts=['schainpy/gui/schainGUI'],	46	scripts = ['schainpy/gui/schainGUI'],
47	ext_modules=[	47	ext_modules = [
48	Extension("cSchain", ["schainpy/model/proc/extensions.c"]	48	Extension("cSchain", ["schainpy/model/proc/extensions.c"])
49	)],	49	],
50	entry_points={	50	entry_points = {
51	'console_scripts': [	51	'console_scripts': [
52	'schain = schaincli.cli:main',	52	'schain = schainpy.cli.cli:main',
53	],	53	],
54	},	54	},
55	cmdclass={'build_ext': build_ext},	55	cmdclass = {'build_ext': build_ext},
56	setup_requires=["numpy >= 1.11.2"],	56	setup_requires = ["numpy >= 1.11.2"],
57	install_requires=[	57	install_requires = [
58	"scipy >= 0.14.0",	58	"scipy >= 0.14.0",
59	"h5py >= 2.2.1",	59	"h5py >= 2.2.1",
60	"matplotlib >= 2.0.0",	60	"matplotlib >= 2.0.0",
@@ -65,5 +65,5 setup(name="schainpy",
65	"fuzzywuzzy",	65	"fuzzywuzzy",
66	"click",	66	"click",
67	"python-Levenshtein"	67	"python-Levenshtein"
68	],	68	],
69	)	69	)

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages