schain-jc Commit - r1026:cfaa3fd99bda

setup actualizado para no necesitar numpy previamente

José Chávez -

r1026:cfaa3fd99bda

parent child

Context file:

r1026:cfaa3fd99bda

Collapse all files

.gitignore +1 -1

              *.png
              *.pyc
              schainpy/scripts
+             .vscode
              schaingui/node_modules
  No newline at end of file

schainpy/model/utils/jroutils_ftp.py +49 -53

                      None
                  Written by:
-                     "Miguel Urco":mailto:miguel.urco@jro.igp.gob.pe  Jun. 03, 2015
+                     "Miguel Urco":mailto:miguel.urco@jro.igp.gob.pe Jun. 03, 2015
                  """
                  server = None
                          return 0
                      self.mutex.acquire()
-             #         init = time.time()
+             #
-             #         while(self.bussy):
-             #             sleep(0.1)
-             #             if time.time() - init > 2*self.period:
-             #                 return 0
+                     #         init = time.time()
+                     #
+                     #         while(self.bussy):
+                     #             sleep(0.1)
+                     #             if time.time() - init > 2*self.period:
+                     #                 return 0
                      self.fileList = fileList
                      self.mutex.release()
                      return 1
                          if self.stopFlag:
                              break
-             #             self.bussy = True
+                 #             self.bussy = True
                          self.mutex.acquire()
                          print "[Remote Server] Opening %s" %self.__server
                  def open(self, server, username, password, remotefolder, port=22):
                      """
-                     This method is used to set SSH parameters and establish a connection to a remote server
-                     Inputs:
-                         server    - remote server IP Address
+                         This method is used to set SSH parameters and establish a connection to a remote server
-                         username    - remote server Username
+                         Inputs:
+                             server    - remote server IP Address
+                             username    - remote server Username
+                             password    - remote server password
+                             remotefolder    - remote server current working directory
-                         password    - remote server password
+                         Return: void
-                         remotefolder    - remote server current working directory
-                     Return: void
-                     Affects:
-                         self.status        - in case of error or fail connection this parameter is set to 0 else 1
+                         Affects:
+                             self.status        - in case of error or fail connection this parameter is set to 0 else 1
                      """
                      import socket
                      try:
                          sshClientObj.connect(server, username=username, password=password, port=port)
                      except paramiko.AuthenticationException, e:
-             #             print "SSH username or password are incorrect: %s"
+                 #             print "SSH username or password are incorrect: %s"
                          print "[SSH Server]:", e
                          return 0
                      except SSHException, e:
                  def close(self):
                      """
-                     Close connection to remote server
+                         Close connection to remote server
                      """
                      if not self.status:
                          return 0
                  def __execute(self, command):
                      """
-                     __execute a command on remote server
-                     Input:
-                         command    - Exmaple 'ls -l'
-                     Return:
-in error case else 1
+                         __execute a command on remote server
+                         Input:
+                             command    - Exmaple 'ls -l'
+                         Return:
+in error case else 1
                      """
                      if not self.status:
                          return 0
                  def mkdir(self, remotefolder):
                      """
-                     mkdir is used to make a new directory in remote server
-                     Input:
-                         remotefolder    - directory name
-                     Return:
-in error case else 1
+                         mkdir is used to make a new directory in remote server
+                         Input:
+                             remotefolder    - directory name
+                         Return:
+in error case else 1
                      """
                      command = 'mkdir %s' %remotefolder
                  def cd(self, remotefolder):
                      """
-                     cd is used to change remote working directory on server
-                     Input:
-                         remotefolder    - current working directory
+                         cd is used to change remote working directory on server
-                     Affects:
-                         self.remotefolder
-                     Return:
-in case of error else 1
+                         Input:
+                             remotefolder    - current working directory
+                         Affects:
+                             self.remotefolder
+                         Return:
+in case of error else 1
                      """
                      if not self.status:
                          return 0
                      ProcessingUnit.__init__(self)
                      self.isConfig = False
-                     self.clientObj = None
+                     self.clientObj = None
                  def setup(self, server, username, password, remotefolder, localfolder, ext='.png', period=60, protocol='ftp', **kwargs):
                          self.ftp = ftplib.FTP(self.server)
                          self.ftp.login(self.username,self.password)
                          self.ftp.cwd(self.remotefolder)
-             #            print 'Connect to FTP Server: Successfully'
+                 #            print 'Connect to FTP Server: Successfully'
                      except ftplib.all_errors:
                          print 'Error FTP Service'
                          name, ext = os.path.splitext(f)
                          if ext != '':
                              self.fileList.append(f)
-             #                print 'filename: %s - size: %d'%(f,self.ftp.size(f))
+                 #                print 'filename: %s - size: %d'%(f,self.ftp.size(f))
                  def parmsByDefault(self):
                      server = 'jro-app.igp.gob.pe'

setup.py +15 -4

              @author: Miguel Urco
              '''
-             import numpy
              from setuptools import setup, Extension
+             from setuptools.command.build_ext import build_ext as _build_ext
              from schainpy import __version__
+             class build_ext(_build_ext):
+                 def finalize_options(self):
+                     _build_ext.finalize_options(self)
+                     # Prevent numpy from thinking it is still in its setup process:
+                     __builtins__.__NUMPY_SETUP__ = False
+                     import numpy
+                     self.include_dirs.append(numpy.get_include())
              setup(name="schainpy",
                      version=__version__,
                      description="Python tools to read, write and process Jicamarca data",
                      include_package_data=False,
                      scripts =['schainpy/gui/schainGUI',
                                'schainpy/scripts/schain'],
-                     ext_modules=[Extension("cSchain", ["schainpy/model/proc/extensions.c"], include_dirs=[numpy.get_include()])],
+                     ext_modules=[
+                       Extension("cSchain", ["schainpy/model/proc/extensions.c"]
+                     )],
+                     cmdclass={'build_ext':build_ext},
+                     setup_requires=["numpy >= 1.11.2"],
                      install_requires=[
                                        "scipy >= 0.14.0",
                                        "h5py >= 2.2.1",
                                        "matplotlib >= 1.4.2",
                                        "pyfits >= 3.4",
-                                       "numpy >= 1.11.2",
-                                       "paramiko >= 2.1.2",
                                        "paho-mqtt >= 1.2",
                                        "zmq",
                                        ],

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