Merge branch 'master' of git.debian.org:/git/pkg-exppsy/neurodebian

* 'master' of git.debian.org:/git/pkg-exppsy/neurodebian:
  Added Japan mirror (Thanks Kiyotaka)
  initial sketch for derivatives page

diff --git a/future/blends/neo b/future/blends/neo
index afea791f12fb424a27b3c5b10e42cd3d2ed8b1e6..8663a96fd5138f60ee380e9a8f3dc9e35178ee04 100644 (file)
--- a/future/blends/neo
+++ b/future/blends/neo
@@ -4,7 +4,8 @@ Homepage: http://neuralensemble.org/trac/neo
 License: BSD
 Author: Samuel Garcia, Pierre Yger, Luc Estabanez, Andrew Davison, Yury V. Zaytsev
 Language: Python
-Version: 0.1
+Version: 0.2
+WNPP: 659691
 Vcs-SVN: https://neuralensemble.org/svn/neo/
 Pkg-Description: IO library for electrophysiological data formats in Python
  NEO stands for Neural Ensemble Objects and is a project to provide common

diff --git a/tools/nd_apachelogs2subscriptionstats b/tools/nd_apachelogs2subscriptionstats
index b39df162fb0799ebcbcc61b19fd3306c3faad3d4..b3daf28f26800c4a483fd90fa8b6e5621615c56c 100755 (executable)
--- a/tools/nd_apachelogs2subscriptionstats
+++ b/tools/nd_apachelogs2subscriptionstats
@@ -24,12 +24,12 @@ dt = [('ip', '|S16'),
       ('date', float)]
 
 
-def make_figure(data):
+def make_figure(data, ymax):
     fig = pl.figure(figsize=(14,3))
     ax = fig.add_subplot(121)
-    plot_datehist(ax, data, 10, [code for code in cfg.options('release codenames') if cfg.get('release codenames', code).count('Debian')], title="Debian", ymax=11)
+    plot_datehist(ax, data, 10, [code for code in cfg.options('release codenames') if cfg.get('release codenames', code).count('Debian')], title="Debian", ymax=ymax)
     ax = fig.add_subplot(122)
-    plot_datehist(ax, data, 10, [code for code in cfg.options('release codenames') if cfg.get('release codenames', code).count('Ubuntu')], title="Ubuntu", ymax=11)
+    plot_datehist(ax, data, 10, [code for code in cfg.options('release codenames') if cfg.get('release codenames', code).count('Ubuntu')], title="Ubuntu", ymax=ymax)
     fig.autofmt_xdate()
     return fig
 
@@ -90,6 +90,10 @@ if __name__ == '__main__':
     if not len(sys.argv) > 1:
         print 'Need output filename.'
         sys.exit(1)
+    if len(sys.argv) > 2:
+        ymax = float(sys.argv[2])
+    else:
+        ymax = 13
     cfg_path="/home/neurodebian/neurodebian.git/neurodebian.cfg"
     cfg = SafeConfigParser()
     cfg.read(cfg_path)
@@ -104,4 +108,4 @@ if __name__ == '__main__':
         date = datetime.strptime(date, "%d %b %Y")
         data.append((ip.strip(), loc, suite, date2num(date)))
     data = np.array(data, dtype=dt)
-    make_figure(data).savefig(sys.argv[1], bbox_inches='tight', dpi=60)
+    make_figure(data, ymax).savefig(sys.argv[1], bbox_inches='tight', dpi=60)