From 23da82af6f76397f5b9ec79fcc5de41946be9f26 2017-08-09 21:05:46 From: Juan C. Espinoza Date: 2017-08-09 21:05:46 Subject: [PATCH] Update setup.py and README --- diff --git a/README.md b/README.md index 85641e6..b8960ef 100644 --- a/README.md +++ b/README.md @@ -6,12 +6,13 @@ Signal Chain (SCh) is a radar data processing library developed using [Python](w ## Installation -Install system dependencies, download the latest stable release from [svn](http://jro-dev.igp.gob.pe/svn/jro_soft/schain/Releases/) e.g. schainpy-2.2.5.tar.gz. and install it as a normal python package. +Install system dependencies, clone the latest version from [git](http://jro-dev.igp.gob.pe/rhodecode/schain/) and install it as a normal python package. ``` $ sudo apt-get install python-pip python-dev gfortran libpng-dev freetype* libblas-dev liblapack-dev libatlas-base-dev python-qt4 python-tk libssl-dev libhdf5-dev -$ tar xvzf schainpy-2.2.5.tar.gz -$ cd schainpy-2.2.5 +$ sudo pip install numpy +$ git clone http://jro-dev.igp.gob.pe/rhodecode/schain/ +$ cd schain $ sudo pip install ./ ``` @@ -21,7 +22,7 @@ $ sudo pip install ./ $ sudo pip install virtualenv $ virtualenv /path/to/virtual --system-site-packages $ source /path/to/virtual/bin/activate -(virtual) $ cd schainpy-2.2.5 +(virtual) $ cd schain (virtual) $ pip install ./ ``` diff --git a/schainpy/controller.py b/schainpy/controller.py index 82a8787..4576a6f 100644 --- a/schainpy/controller.py +++ b/schainpy/controller.py @@ -47,6 +47,8 @@ def multiSchain(child, nProcess=cpu_count(), startDate=None, endDate=None, by_da if by_day: continue nFiles = q.get() + if nFiles==0: + continue firstProcess.terminate() skip = int(math.ceil(nFiles/nProcess)) while True: diff --git a/setup.py b/setup.py index 42f7b81..9763198 100644 --- a/setup.py +++ b/setup.py @@ -5,8 +5,9 @@ Created on Jul 16, 2014 @author: Miguel Urco """ -from schainpy import __version__ +import numpy from setuptools import setup, Extension +from schainpy import __version__ setup(name="schainpy", version=__version__, @@ -44,8 +45,7 @@ setup(name="schainpy", "scipy >= 0.14.0", "h5py >= 2.2.1", "matplotlib >= 1.4.2", - "pyfits >= 3.4", - "numpy >= 1.11.2", + "pyfits >= 3.4", "paramiko >= 2.1.2", "paho-mqtt >= 1.2", "zmq",