|
|
1 | NO CONTENT: file renamed from schaincli/README.md to schainpy/cli/README.md |
|
|
1 | NO CONTENT: file renamed from schaincli/__init__.py to schainpy/cli/__init__.py |
| @@ -7,7 +7,6 import glob | |||
|
|
7 | 7 | save_stdout = sys.stdout |
|
|
8 | 8 | sys.stdout = open('trash', 'w') |
|
|
9 | 9 | from multiprocessing import cpu_count |
|
|
10 | from schaincli import templates | |
|
|
11 | 10 | from schainpy.controller import Project |
|
|
12 | 11 | from schainpy.model import Operation, ProcessingUnit |
|
|
13 | 12 | from schainpy.utils import log |
| @@ -15,6 +14,7 from importlib import import_module | |||
|
|
15 | 14 | from pydoc import locate |
|
|
16 | 15 | from fuzzywuzzy import process |
|
|
17 | 16 | from schainpy.utils import paramsFinder |
|
|
17 | import templates | |
|
|
18 | 18 | sys.stdout = save_stdout |
|
|
19 | 19 | |
|
|
20 | 20 | |
|
|
1 | NO CONTENT: file renamed from schaincli/templates.py to schainpy/cli/templates.py |
|
|
1 | NO CONTENT: file renamed from schaincli/tests/__init__.py to schainpy/cli/tests/__init__.py |
| @@ -1,6 +1,6 | |||
|
|
1 | 1 | import pytest |
|
|
2 | 2 | from click.testing import CliRunner |
|
|
3 | from schaincli import cli | |
|
|
3 | from schainpy.cli import cli | |
|
|
4 | 4 | |
|
|
5 | 5 | |
|
|
6 | 6 | @pytest.fixture |
| @@ -11,7 +11,6 except: | |||
|
|
11 | 11 | 'You should install PyQt4 module in order to run the GUI. See the README.') |
|
|
12 | 12 | sys.exit() |
|
|
13 | 13 | |
|
|
14 | ||
|
|
15 | 14 | from schainpy.gui.viewcontroller.initwindow import InitWindow |
|
|
16 | 15 | from schainpy.gui.viewcontroller.basicwindow import BasicWindow |
|
|
17 | 16 | from schainpy.gui.viewcontroller.workspace import Workspace |
| @@ -147,7 +147,8 class Data(object): | |||
|
|
147 | 147 | return |
|
|
148 | 148 | |
|
|
149 | 149 | self.parameters = getattr(dataOut, 'parameters', []) |
|
|
150 |
|
|
|
|
150 | if hasattr(dataOut, 'pairsList'): | |
|
|
151 | self.pairs = dataOut.pairsList | |
|
|
151 | 152 | self.channels = dataOut.channelList |
|
|
152 | 153 | self.interval = dataOut.getTimeInterval() |
|
|
153 | 154 | self.localtime = dataOut.useLocalTime |
| @@ -499,7 +500,7 class PlotterReceiver(ProcessingUnit, Process): | |||
|
|
499 | 500 | |
|
|
500 | 501 | self.address = address |
|
|
501 | 502 | self.plot_address = plot_address |
|
|
502 |
self.plottypes = [s.strip() for s in kwargs.get('plottypes', ' |
|
|
|
503 | self.plottypes = [s.strip() for s in kwargs.get('plottypes', '').split(',') if s] | |
|
|
503 | 504 | self.realtime = kwargs.get('realtime', False) |
|
|
504 | 505 | self.localtime = kwargs.get('localtime', True) |
|
|
505 | 506 | self.throttle_value = kwargs.get('throttle', 5) |
| @@ -17,13 +17,13 class build_ext(_build_ext): | |||
|
|
17 | 17 | import numpy |
|
|
18 | 18 | self.include_dirs.append(numpy.get_include()) |
|
|
19 | 19 | |
|
|
20 | setup(name="schainpy", | |
|
|
21 | version=__version__, | |
|
|
22 | description="Python tools to read, write and process Jicamarca data", | |
|
|
23 | author="Miguel Urco", | |
|
|
24 | author_email="miguel.urco@jro.igp.gob.pe", | |
|
|
25 | url="http://jro.igp.gob.pe", | |
|
|
26 | packages={'schainpy', | |
|
|
20 | setup(name = "schainpy", | |
|
|
21 | version = __version__, | |
|
|
22 | description = "Python tools to read, write and process Jicamarca data", | |
|
|
23 | author = "Miguel Urco", | |
|
|
24 | author_email = "miguel.urco@jro.igp.gob.pe", | |
|
|
25 | url = "http://jro.igp.gob.pe", | |
|
|
26 | packages = {'schainpy', | |
|
|
27 | 27 | 'schainpy.model', |
|
|
28 | 28 | 'schainpy.model.data', |
|
|
29 | 29 | 'schainpy.model.graphics', |
| @@ -36,25 +36,25 setup(name="schainpy", | |||
|
|
36 | 36 | 'schainpy.gui.figures', |
|
|
37 | 37 | 'schainpy.gui.viewcontroller', |
|
|
38 | 38 | 'schainpy.gui.viewer', |
|
|
39 |
'schainpy.gui.viewer.windows' |
|
|
|
40 | ext_package='schainpy', | |
|
|
41 | py_modules=[''], | |
|
|
42 | package_data={'': ['schain.conf.template'], | |
|
|
43 | 'schainpy.gui.figures': ['*.png', '*.jpg'], | |
|
|
44 | }, | |
|
|
45 | include_package_data=False, | |
|
|
46 | scripts=['schainpy/gui/schainGUI'], | |
|
|
47 | ext_modules=[ | |
|
|
48 | Extension("cSchain", ["schainpy/model/proc/extensions.c"] | |
|
|
49 |
|
|
|
|
50 | entry_points={ | |
|
|
39 | 'schainpy.gui.viewer.windows', | |
|
|
40 | 'schainpy.cli'}, | |
|
|
41 | ext_package = 'schainpy', | |
|
|
42 | package_data = {'': ['schain.conf.template'], | |
|
|
43 | 'schainpy.gui.figures': ['*.png', '*.jpg'], | |
|
|
44 | }, | |
|
|
45 | include_package_data = False, | |
|
|
46 | scripts = ['schainpy/gui/schainGUI'], | |
|
|
47 | ext_modules = [ | |
|
|
48 | Extension("cSchain", ["schainpy/model/proc/extensions.c"]) | |
|
|
49 | ], | |
|
|
50 | entry_points = { | |
|
|
51 | 51 | 'console_scripts': [ |
|
|
52 | 'schain = schaincli.cli:main', | |
|
|
52 | 'schain = schainpy.cli.cli:main', | |
|
|
53 | 53 | ], |
|
|
54 | 54 | }, |
|
|
55 | cmdclass={'build_ext': build_ext}, | |
|
|
56 | setup_requires=["numpy >= 1.11.2"], | |
|
|
57 | install_requires=[ | |
|
|
55 | cmdclass = {'build_ext': build_ext}, | |
|
|
56 | setup_requires = ["numpy >= 1.11.2"], | |
|
|
57 | install_requires = [ | |
|
|
58 | 58 | "scipy >= 0.14.0", |
|
|
59 | 59 | "h5py >= 2.2.1", |
|
|
60 | 60 | "matplotlib >= 2.0.0", |
| @@ -65,5 +65,5 setup(name="schainpy", | |||
|
|
65 | 65 | "fuzzywuzzy", |
|
|
66 | 66 | "click", |
|
|
67 | 67 | "python-Levenshtein" |
|
|
68 | ], | |
|
|
69 | ) | |
|
|
68 | ], | |
|
|
69 | ) | |
General Comments 0
You need to be logged in to leave comments.
Login now