probe headers location

fix missing usock

Author: Matthieu Bec

README

@@ -10,8 +10,16 @@ git clone git://github.com/dhmunro/yorick.git
 sudo python setup.py install
 
 - rpm style:
-python setup.py bdist_rpm
-sudo yum install -y dist/python-gist-*.`uname -m`.rpm
+
+sudo dnf install \
+  python3-devel \
+  python3-numpy \
+  python3-numpy-f2py \
+  libX11-devel \
+  libXft-devel
+
+python3 setup.py bdist_rpm
+sudo yum install -y dist/python-gist3-*.`uname -m`.rpm
 
 OSX
 ---

gist/Mplot.py

@@ -48,7 +48,7 @@
 # directory for storing temporary *.gp and *.gs files
 _user_path = os.path.join(os.environ['HOME'],'.gist')
 
-def histogram(data,nbins=80,range=None,ntype=0,bar=1,bwidth=0.8,bcolor='fg'):
+def histogram(data,nbins=80,range=None,ntype=0,bar=1,bwidth=0.8,bcolor='fg',rval=False):
   '''Plot a histogram.
 
      Returns an array (nbins,2) of bin values,count.
@@ -83,10 +83,16 @@ def histogram(data,nbins=80,range=None,ntype=0,bar=1,bwidth=0.8,bcolor='fg'):
     barplot(arr[:,0],arr[:,1],width=bwidth,color=bcolor)
   else:
     plot(arr[:,0],arr[:,1])
-  return arr
+  if rval: return arr
 
 def barplot(x,y,width=0.8,color='fg', horiz=False):
   '''Plot a barplot.
+           
+         X   X
+         X   X X
+       X X X X X X X
+
+     SEE ALSO: stem, stairplot
 
         x --      Centers of bars
         x --      Heights of bars
@@ -768,8 +774,10 @@ def stem(y, x=None, linetype='b-', mtype='mo', shift=0.013):
      y,x --      data points
      linetype -- type,color,marker,mark for lines
      mtype --    type,color,marker,mark for marker
+  
+     EXAMPLE: stem(np.random.rand(10))
 
-     SEE ALSO: stairplot
+     SEE ALSO: stairplot, barplot
   '''
   y0 = numpy.zeros(len(y),y.dtype.char)
   y1 = y
@@ -894,7 +902,7 @@ def twoplane(DATA,slice1,slice2,dx=[1,1,1],cmin=None,cmax=None,xb=None,xe=None,
     xwidth = rescale * xwidth
     height1 = rescale * height1
     totalheight = totalheight * rescale
-    print((xwidth, height1))
+    print(xwidth, height1)
   else:
     print(xwidth)
   ystart = 0.5 - totalheight / 2
@@ -1084,7 +1092,7 @@ def stairplot(a,*arg,**kwd):
       | |_|   |_
      _|         |_
 
-     SEE ALSO: stem
+     SEE ALSO: stem, barplot
   '''
   if type(a)==numpy.ndarray and len(a.shape)==2:
     xs=a[:,0]
@@ -1352,3 +1360,5 @@ def colorbar (minz, maxz, ncol = 255, ymax=0.85, ymin=0.44, xmin0=0.62, xmax0=0.
     if zlabel:
         ymidpt = (ymax+ymin)/2.0
         plt(zlabel, xmin0, ymidpt, color=color,font=font, justify='CB', height=fontsize, orient=1)
+
+

setup.py

@@ -11,7 +11,8 @@
 from distutils.core import Distribution, Command
 from distutils.command.build import build
 from distutils import log
-import numpy.distutils.system_info # pkg_config
+import numpy 
+import numpy.distutils.system_info
 
 gistsource = glob.glob('yorick/gist/*.c')
 gistsource.pop(gistsource.index('yorick/gist/browser.c'))
@@ -25,6 +26,7 @@
   'yorick/play/unix/handler.c',
   'yorick/play/unix/pathnm.c',
   #'yorick/play/unix/pmain.c',
+  'yorick/play/unix/usock.c',
   'yorick/play/unix/slinks.c',
   'yorick/play/unix/stdinit.c',
   'yorick/play/unix/timeu.c',
@@ -91,9 +93,7 @@
 
 libraries = x11_info.get('libraries',['X11'])
 
-if sys.platform == 'darwin':
-  import numpy
-  include_dirs.extend([numpy.get_include()])
+include_dirs.extend([numpy.get_include()])
 
 # sources
 sources = unixsource + x11source + anysource + gistsource