version to 0.11.2

Changelog.txt

@@ -1,3 +1,9 @@
+Moa 0.11.2 / 2012-10-15
+==========================
+
+  * some code cleanup
+  * improved installer (that might even work)
+
 Moa 0.11.1 / 2012-10-14
 ==========================
 

MANIFEST.in

@@ -1,25 +1,24 @@
-exclude .*
 include VERSION
 include README
 include COPYING
 include etc/bash_completion.d/moa
 include etc/config
 
-recursive-include bin/ *
-recursive-include template2 *.mk *.moa *.jinja2
+include bin/moa
+include bin/moar
+include bin/moainit
 
-recursive-include lib/jinja2/ *.jinja2
-recursive-include lib/ruff/ *.jinja2
-recursive-include lib/gnumake/ *.mk
+recursive-include template2 *.moa *.jinja2
 
-include lib/gnumake/util/__gmsl
-include lib/gnumake/util/gmsl
+recursive-include lib/jinja2 *jinja2
 
-recursive-include share/ *.fq *fasta
+recursive-include share/test *.fq *fasta
+
+include etc/config
+include etc/bash_completion.d/moa
+include etc/profile.d/moa.sh
+
+include share/logo/moa.logo.txt
 
-recursive-include etc *.mk *.conf *.jinja2
-recursive-include share/ *.txt
-recursive-include www/ *.html *.js *.css *.png *.gif *.jpg *.css *.cgi
 
 
-

VERSION

@@ -1 +1 @@
-0.11.1
+0.11.2

setup.py

@@ -2,8 +2,8 @@
 """
 Setup script --
 """
-
 import os
+import glob
 
 from setuptools import setup
 
@@ -13,59 +13,21 @@
 scripts = [os.path.join('bin', x) for x in """
 moa        fastaSplitter  fastaNfinder  fastaInfo  fastaExtract
 fasta2gff  blastReport    blastInfo     blast2gff  moaprompt
-moainit
+moainit    moar
 """.split()]
 
 data_files = []
 template_data = []
 exclude = ['build', 'sphinx', 'debian', 'dist', 'util', 'www']
 
-for dirpath, dirnames, filenames in os.walk('.'):
-
-    toRemove = []
-    for dirname in dirnames:
-        if dirname[0] == '.':
-            toRemove.append(dirname)
-
-        if dirpath == '.' and dirname in exclude:
-            toRemove.append(dirname)
-
-    for t in toRemove:
-        dirnames.remove(t)
-
-    if 'moa.egg-info' in dirpath:
-        continue
-
-    if dirpath[-5:] == '/dist':
-        continue
-
-    toRemove = []
-    for filename in filenames:
-        if filename[-1] in ['~']:
-            toRemove.append(filename)
-        if filename[0] in ['#', '.']:
-            toRemove.append(filename)
-    for t in toRemove:
-        filenames.remove(t)
-
-    if '__init__.py' in filenames:
-        continue
-
-    #np = os.path.join('./', dirpath)
-    if dirpath[0] == '/':
-        np = dirpath[1:]
-    elif dirpath[:2] == './':
-        np = dirpath[2:]
-    else:
-        np = dirpath
-    if np[:3] == 'etc':
-        np = '/etc/moa' + np[3:]
-    data_files.append([np, [os.path.join(dirpath, f) for f in filenames]])
-
-#data_files.append(['/etc/moa', ['./etc/config']])
-
-#from pprint import pprint
-#pprint(data_files)
+data_files = [
+    ('/usr/local/share/moa/template2', glob.glob('template2/*')),
+    ('/usr/local/share/moa/logo', ['share/logo/moa.logo.txt']),
+    ('/usr/local/share/moa/test', glob.glob('share/test/*')),
+    ('/etc/moa',  ['etc/config']),
+    ('/etc/profile.d',  ['etc/profile.d/moa.sh']),
+    ('/etc/bash_completion.d',  ['etc/bash_completion.d/moa']),
+]
 
 packagenames = []
 
@@ -86,14 +48,15 @@
 
 setup(name='moa',
       version=version,
-      description='Moa - lightweight workflows in bioinformatics',
+      description='Moa - command-line workflows (in bioinformatics)',
       author='Mark Fiers',
       author_email='mark.fiers.42@gmail.com',
       url='http://mfiers.github.com/Moa/',
       packages=packagenames,
       package_dir={'': os.path.join('lib', 'python')},
-      scripts=scripts,
       data_files=data_files,
+      scripts=scripts,
+      zip_safe=False,
       install_requires=[
           'Jinja2>2.0',
           'GitPython>0.3',

util/newVersion

@@ -1,22 +1,22 @@
 #!/bin/bash
-# 
+#
 # Copyright 2009-2011, Mark Fiers, Plant & Food Research
-# 
+#
 # This file is part of Moa - http://github.com/mfiers/Moa
-# 
+#
 # Moa is free software: you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free
 # Software Foundation, either version 3 of the License, or (at your
 # option) any later version.
-# 
+#
 # Moa is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
 # License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with Moa.  If not, see <http://www.gnu.org/licenses/>.
-# 
+#
 
 VERSION=$1
 if [[ -z $VERSION ]]; then
@@ -39,9 +39,9 @@ git-changelog --list | grep -v '^  \* minor' >> $tmp
 echo '' >> $tmp
 if [ -f Changelog.txt ]; then cat Changelog.txt >> $tmp; fi
 mv $tmp Changelog.txt
-$EDITOR Changelog.txt
+ls $EDITOR Changelog.txt
 
-echo git commit -m \"version to $VERSION\" -a 
+echo git commit -m \"version to $VERSION\" -a
 echo git tag v${VERSION}
 echo git push --tags
 echo python setup.py sdist register upload