fixed remarks made in #367

easybuild/easyconfigs/a/ACML/ACML-5.3.1-ifort-64bit.eb

@@ -10,3 +10,5 @@ computational fluid dynamics, financial analysis, oil and gas applications and m
 toolchain = {'name': 'dummy', 'version': 'dummy'}
 
 sources = ['%s-%s%s.tgz' % (name.lower(), '-'.join(version.split('.')), versionsuffix)]
+
+moduleclass = 'numlib'

easybuild/easyconfigs/a/ant/ant-1.9.0-Java-1.7.0_15.eb

@@ -3,7 +3,7 @@ version = '1.9.0'
 
 homepage = 'http://ant.apache.org/'
 description = """Apache Ant is a Java library and command-line tool whose mission is to drive processes described in build files
-as targets and extension points dependent upon each other. The main known usage of Ant is the build of Java applications."""
+ as targets and extension points dependent upon each other. The main known usage of Ant is the build of Java applications."""
 
 toolchain = {'name': 'dummy', 'version': ''}
 
@@ -22,3 +22,5 @@ sanity_check_paths = {
     'files': ['bin/ant', 'lib/ant.jar', 'lib/ant.jar'],
     'dirs': []
 }
+
+moduleclass = 'devel'

easybuild/easyconfigs/c/cairo/cairo-1.12.14-goalf-1.1.0-no-OFED.eb

@@ -20,3 +20,5 @@ dependencies = [
     ('expat', '2.1.0'),
     ('bzip2', '1.0.6'),
 ]
+
+moduleclass = 'vis'

easybuild/easyconfigs/c/cairo/cairo-1.12.14-goolf-1.4.10.eb

@@ -20,3 +20,5 @@ dependencies = [
     ('expat', '2.1.0'),
     ('bzip2', '1.0.6'),
 ]
+
+moduleclass = 'vis'

easybuild/easyconfigs/c/cairo/cairo-1.12.14-ictce-3.2.2.u3.eb

@@ -20,3 +20,5 @@ dependencies = [
     ('expat', '2.1.0'),
     ('bzip2', '1.0.6'),
 ]
+
+moduleclass = 'vis'

easybuild/easyconfigs/c/cairo/cairo-1.12.14-ictce-4.1.13.eb

@@ -20,3 +20,5 @@ dependencies = [
     ('expat', '2.1.0'),
     ('bzip2', '1.0.6'),
 ]
+
+moduleclass = 'vis'

easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.0.0.eb

@@ -25,3 +25,5 @@ sources = [
 # EasyBuild is a (set of) Python packages, so it depends on Python
 # usually, we want to use the system Python, so no actual Python dependency is listed
 allow_system_deps = [('Python', SYS_PYTHON_VERSION)]
+
+moduleclass = 'tools'

easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.0.1.eb

@@ -25,3 +25,5 @@ sources = [
 # EasyBuild is a (set of) Python packages, so it depends on Python
 # usually, we want to use the system Python, so no actual Python dependency is listed
 allow_system_deps = [('Python', SYS_PYTHON_VERSION)]
+
+moduleclass = 'tools'

easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.0.2.eb

@@ -25,3 +25,5 @@ sources = [
 # EasyBuild is a (set of) Python packages, so it depends on Python
 # usually, we want to use the system Python, so no actual Python dependency is listed
 allow_system_deps = [('Python', SYS_PYTHON_VERSION)]
+
+moduleclass = 'tools'

easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.1.0.eb

@@ -25,3 +25,5 @@ sources = [
 # EasyBuild is a (set of) Python packages, so it depends on Python
 # usually, we want to use the system Python, so no actual Python dependency is listed
 allow_system_deps = [('Python', SYS_PYTHON_VERSION)]
+
+moduleclass = 'tools'

easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.2.0.eb

@@ -25,3 +25,5 @@ sources = [
 # EasyBuild is a (set of) Python packages, so it depends on Python
 # usually, we want to use the system Python, so no actual Python dependency is listed
 allow_system_deps = [('Python', SYS_PYTHON_VERSION)]
+
+moduleclass = 'tools'

easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.3.0.eb

@@ -25,3 +25,5 @@ sources = [
 # EasyBuild is a (set of) Python packages, so it depends on Python
 # usually, we want to use the system Python, so no actual Python dependency is listed
 allow_system_deps = [('Python', SYS_PYTHON_VERSION)]
+
+moduleclass = 'tools'

easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.4.0.eb

@@ -25,3 +25,5 @@ sources = [
 # EasyBuild is a (set of) Python packages, so it depends on Python
 # usually, we want to use the system Python, so no actual Python dependency is listed
 allow_system_deps = [('Python', SYS_PYTHON_VERSION)]
+
+moduleclass = 'tools'

easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.5.0.eb

@@ -25,3 +25,5 @@ sources = [
 # EasyBuild is a (set of) Python packages, so it depends on Python
 # usually, we want to use the system Python, so no actual Python dependency is listed
 allow_system_deps = [('Python', SYS_PYTHON_VERSION)]
+
+moduleclass = 'tools'

easybuild/easyconfigs/f/FSL/FSL-4.1.9-goalf-1.1.0-no-OFED.eb

@@ -14,4 +14,4 @@ patches = ['FSL_makefile_fixes.patch']
 # libX11-devel is required for X11/Xlib.h, required by tk build
 osdependencies = ['libX11-devel']
 
-moduleclass = 'tools'
+moduleclass = 'bio'

easybuild/easyconfigs/f/FSL/FSL-4.1.9-goolf-1.4.10.eb

@@ -14,4 +14,4 @@ patches = ['FSL_makefile_fixes.patch']
 # libX11-devel is required for X11/Xlib.h, required by tk build
 osdependencies = ['libX11-devel']
 
-moduleclass = 'tools'
+moduleclass = 'bio'

easybuild/easyconfigs/f/FSL/FSL-4.1.9-ictce-4.0.6.eb

@@ -17,4 +17,4 @@ patches = [
 # libX11-devel is required for X11/Xlib.h, required by tk build
 osdependencies = ['libX11-devel']
 
-moduleclass = 'tools'
+moduleclass = 'bio'

easybuild/easyconfigs/f/FSL/FSL-4.1.9-ictce-5.3.0.eb

@@ -17,4 +17,4 @@ patches = [
 # libX11-devel is required for X11/Xlib.h, required by tk build
 osdependencies = ['libX11-devel']
 
-moduleclass = 'tools'
+moduleclass = 'bio'

easybuild/easyconfigs/f/FSL/FSL-5.0.4-goolf-1.4.10.eb

@@ -21,3 +21,5 @@ dependencies = [
 
 # libX11-devel is required for X11/Xlib.h, required by tk build
 osdependencies = ['libX11-devel']
+
+moduleclass = 'bio'

easybuild/easyconfigs/f/FSL/FSL-5.0.4-ictce-4.1.13.eb

@@ -22,3 +22,5 @@ dependencies = [
 
 # libX11-devel is required for X11/Xlib.h, required by tk build
 osdependencies = ['libX11-devel']
+
+moduleclass = 'bio'

easybuild/easyconfigs/f/fontconfig/fontconfig-2.10.91-goalf-1.1.0-no-OFED.eb

@@ -11,3 +11,5 @@ source_urls = ['http://www.freedesktop.org/software/fontconfig/release/']
 sources = [SOURCE_TAR_GZ]
 
 dependencies = [('expat', '2.1.0')]
+
+moduleclass = 'vis'

easybuild/easyconfigs/f/fontconfig/fontconfig-2.10.91-goolf-1.4.10.eb

@@ -11,3 +11,5 @@ source_urls = ['http://www.freedesktop.org/software/fontconfig/release/']
 sources = [SOURCE_TAR_GZ]
 
 dependencies = [('expat', '2.1.0')]
+
+moduleclass = 'vis'

easybuild/easyconfigs/f/fontconfig/fontconfig-2.10.91-ictce-3.2.2.u3.eb

@@ -11,3 +11,5 @@ source_urls = ['http://www.freedesktop.org/software/fontconfig/release/']
 sources = [SOURCE_TAR_GZ]
 
 dependencies = [('expat', '2.1.0')]
+
+moduleclass = 'vis'

easybuild/easyconfigs/f/fontconfig/fontconfig-2.10.91-ictce-4.1.13.eb

@@ -11,3 +11,5 @@ source_urls = ['http://www.freedesktop.org/software/fontconfig/release/']
 sources = [SOURCE_TAR_GZ]
 
 dependencies = [('expat', '2.1.0')]
+
+moduleclass = 'vis'

easybuild/easyconfigs/m/MariaDB/MariaDB-5.5.29-ictce-4.1.13.eb

@@ -27,3 +27,5 @@ sanity_check_paths = {
     'files': ['bin/mysql', 'bin/mysqld_safe', 'lib/libmysqlclient.so', 'scripts/mysql_install_db'],
     'dirs': ['include', 'share'],
 }
+
+moduleclass = 'data'

easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-4.1.13-mt.eb

@@ -24,3 +24,4 @@ dependencies = [
     ('Boost', '1.53.0', '-%s-%s' % (python, pyver)),
 ]
 
+moduleclass = 'chem'

easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-4.1.13.eb

@@ -22,3 +22,4 @@ dependencies = [
     ('Boost', '1.53.0', '-%s-%s' % (python, pyver)),
 ]
 
+moduleclass = 'chem'

easybuild/easyconfigs/p/Perl/Perl-5.16.3-ictce-4.1.13.eb

@@ -206,3 +206,5 @@ exts_list = [
         'source_urls': ['http://www.cpan.org/modules/by-module/MouseX/GFUJI/'],
     }),
 ]
+
+moduleclass = 'lang'

easybuild/easyconfigs/p/pixman/pixman-0.28.2-goalf-1.1.0-no-OFED.eb

@@ -14,3 +14,5 @@ sanity_check_paths = {
     'files': ['lib/libpixman-1.so'],
     'dirs': []
 }
+
+moduleclass = 'vis'

easybuild/easyconfigs/p/pixman/pixman-0.28.2-goolf-1.4.10.eb

@@ -14,3 +14,5 @@ sanity_check_paths = {
     'files': ['lib/libpixman-1.so'],
     'dirs': []
 }
+
+moduleclass = 'vis'

easybuild/easyconfigs/p/pixman/pixman-0.28.2-ictce-3.2.2.u3.eb

@@ -14,3 +14,5 @@ sanity_check_paths = {
     'files': ['lib/libpixman-1.so'],
     'dirs': []
 }
+
+moduleclass = 'vis'

easybuild/easyconfigs/p/pixman/pixman-0.28.2-ictce-4.1.13.eb

@@ -14,3 +14,5 @@ sanity_check_paths = {
     'files': ['lib/libpixman-1.so'],
     'dirs': []
 }
+
+moduleclass = 'vis'

easybuild/easyconfigs/s/Stacks/Stacks-1.03-goolf-1.4.10.eb

@@ -3,14 +3,14 @@ version = '1.03'
 
 homepage = 'http://creskolab.uoregon.edu/stacks/'
 description = """Stacks is a software pipeline for building loci from short-read sequences, such as those generated on
-the Illumina platform. Stacks was developed to work with restriction enzyme-based data, such as RAD-seq, for the purpose
-of building genetic maps and conducting population genomics and phylogeography.
+ the Illumina platform. Stacks was developed to work with restriction enzyme-based data, such as RAD-seq, for the purpose
+ of building genetic maps and conducting population genomics and phylogeography.
 """
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
-sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://creskolab.uoregon.edu/stacks/source/']
+sources = [SOURCELOWER_TAR_GZ]
 
 runtest = "check"
 

easybuild/easyconfigs/s/Stacks/Stacks-1.03-ictce-4.1.13.eb

@@ -3,13 +3,14 @@ version = '1.03'
 
 homepage = 'http://creskolab.uoregon.edu/stacks/'
 description = """Stacks is a software pipeline for building loci from short-read sequences, such as those generated on
-the Illumina platform. Stacks was developed to work with restriction enzyme-based data, such as RAD-seq, for the purpose
-of building genetic maps and conducting population genomics and phylogeography.
+ the Illumina platform. Stacks was developed to work with restriction enzyme-based data, such as RAD-seq, for the purpose
+ of building genetic maps and conducting population genomics and phylogeography.
 """
-toolchain = {'name': 'ictce', 'version': '4.1.13'} # tweaked by EasyBuild (was: {'name': 'goolf', 'version': '1.4.10'})
 
-sources = [SOURCELOWER_TAR_GZ]
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
+
 source_urls = ['http://creskolab.uoregon.edu/stacks/source/']
+sources = [SOURCELOWER_TAR_GZ]
 
 runtest = "check"
 

setup.py

@@ -41,7 +41,7 @@
 
 # note: release candidates should be versioned as a pre-release, e.g. "1.1rc1"
 # 1.1-rc1 would indicate a post-release, i.e., and update of 1.1, so beware!
-VERSION = "1.6.0.0rc1"
+VERSION = "1.7.0.0dev"
 
 API_VERSION = VERSION.split('.')[0]
 EB_VERSION = '.'.join(VERSION.split('.')[0:2])