new file: c/Cube/Cube-4.3.5-intel-2017a.eb

new file:   d/dask/dask-0.17.0-Py-3.6.eb
	new file:   d/decorator/decorator-4.2.1-Py-3.6.eb
	modified:   n/networkx/networkx-1.11-Python-2.7.13.eb
	new file:   n/networkx/networkx-2.1-Py-3.6.eb
	new file:   p/Pillow/Pillow-5.0.0-Py-3.6.eb
	new file:   p/PyWavelets/PyWavelets-0.5.2-Py-3.6.eb
	modified:   s/Score-P/Score-P-3.1-intel-2017a.eb
	modified:   s/scikit-image/scikit-image-0.13.1-Py-3.6.eb
	new file:   t/toolz/toolz-0.9.0-Py-3.6.eb
	deleted:    n/networkx/networkx-1.11-Py-3.6.eb
	deleted:    s/scikit-image/.scikit-image-0.13.1-Py-3.6.eb.swp

c/Cube/Cube-4.3.5-intel-2017a.eb

@@ -0,0 +1,33 @@
+# IT4Innovations 2018
+
+easyblock = 'EB_Score_minus_P'
+
+name = 'Cube'
+version = '4.3.5'
+
+homepage = 'http://www.scalasca.org/software/cube-4.x/download.html'
+description = """Cube, which is used as performance report explorer for Scalasca and
+ Score-P, is a generic tool for displaying a multi-dimensional performance space
+ consisting of the dimensions (i) performance metric, (ii) call path, and (iii) system
+ resource. Each dimension can be represented as a tree, where non-leaf nodes of the tree
+ can be collapsed or expanded to achieve the desired level of granularity."""
+
+toolchain = {'name': 'intel', 'version': '2017a'}
+toolchainopts = {'optarch': False}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://apps.fz-juelich.de/scalasca/releases/cube/%(version_major_minor)s/dist']
+
+dependencies = [
+    ('Qt', '4.8.7', '', True),
+]
+
+configopts = '--enable-platform-mic --with-qt-specs=linux-icc-64 --with-frontend-compiler-suite=intel' 
+
+sanity_check_paths = {
+    'files': ["bin/cube", ("lib/libcube4.a", "lib64/libcube4.a"),
+              ("lib/libcube4.%s" % SHLIB_EXT, "lib64/libcube4.%s" % SHLIB_EXT)],
+    'dirs': ["include/cube", "include/cubew"],
+}
+
+moduleclass = 'perf'

d/dask/dask-0.17.0-Py-3.6.eb

@@ -0,0 +1,24 @@
+# IT4Innovations 2018
+
+easyblock = "PythonPackage"
+name = 'dask'
+version = '0.17.0'
+
+homepage = 'https://pypi.python.org/pypi/dask'
+description = 'Parallel PyData with Task Scheduling.'
+
+toolchain = {'name': 'Py', 'version': '3.6'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+#dependencies = [
+ #  ('MarkupSafe', '1.0'),
+#]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python3.6/site-packages/%(name)s-%(version)s-py3.6.egg'],
+}
+
+moduleclass = 'python'

d/decorator/decorator-4.2.1-Py-3.6.eb

@@ -0,0 +1,20 @@
+# IT4Innovations 2018
+
+easyblock = "PythonPackage"
+name = 'decorator'
+version = '4.2.1'
+
+homepage = 'https://pypi.python.org/pypi/decorator'
+description = 'Better living through Python with decorators.'
+
+toolchain = {'name': 'Py', 'version': '3.6'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python3.6/site-packages/%(name)s-%(version)s-py3.6.egg'],
+}
+
+moduleclass = 'python'

n/networkx/networkx-1.11-Python-2.7.13.eb

@@ -1,5 +1,3 @@
-# IT4Innovations 2018
-
 easyblock = 'PythonPackage'
 
 name = 'networkx'

n/networkx/networkx-2.1-Py-3.6.eb

@@ -1,25 +1,26 @@
+# IT4Innovations 2018
+
 easyblock = 'PythonPackage'
 
 name = 'networkx'
-version = '1.11'
+version = '2.1'
-versionsuffix = '-Python-%(pyver)s' 
 
 homepage = 'https://pypi.python.org/pypi/networkx'
 description = """NetworkX is a Python package for the creation, manipulation, and study of the structure, dynamics,
  and functions of complex networks."""
 
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = {'name': 'Py', 'version': '3.6'}
 
 source_urls = [PYPI_SOURCE]
-sources = [SOURCE_TAR_GZ]
+sources = [SOURCE_ZIP]
 
 dependencies = [
-    ('Python', '2.7.13'),
+    ('decorator', '4.2.1')
 ]
 
 sanity_check_paths = {
     'files': [],
-    'dirs': ['lib/python%(pyshortver)s/site-packages/'],
+    'dirs': ['lib/python3.6/site-packages/'],
 }
 
-moduleclass = 'tools'
+moduleclass = 'python'

p/Pillow/Pillow-5.0.0-Py-3.6.eb

@@ -0,0 +1,31 @@
+# IT4Innovations 2018
+
+easyblock = 'PythonPackage'
+
+name = 'Pillow'
+version = '5.0.0'
+
+homepage = 'http://pillow.readthedocs.org/'
+description = """Pillow is the 'friendly PIL fork' by Alex Clark and Contributors.
+ PIL is the Python Imaging Library by Fredrik Lundh and Contributors."""
+
+toolchain = {'name': 'Py', 'version': '3.6'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('libjpeg-turbo', '1.5.1', '', True),
+    ('zlib', '1.2.11', '', True),
+    ('LibTIFF', '4.0.7', '', True),
+    ('freetype', '2.8', '', True),
+]
+
+options = {'modulename': 'PIL'}
+
+sanity_check_paths = {
+    'files': ['lib/python3.6/site-packages/%(name)s-%(version)s-py3.6-linux-x86_64.egg'],
+    'dirs': [],
+}
+
+moduleclass = 'python'

p/PyWavelets/PyWavelets-0.5.2-Py-3.6.eb

@@ -0,0 +1,27 @@
+# IT4Innovations 2018
+
+easyblock = "PythonPackage"
+name = 'PyWavelets'
+version = '0.5.2'
+
+homepage = 'https://pypi.python.org/pypi/PyWavelets'
+description = 'PyWavelets, wavelet transform module.'
+
+toolchain = {'name': 'Py', 'version': '3.6'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('numpy', '1.13.3'),
+    ('matplotlib', '2.1.1'),
+]
+
+options = {'modulename': 'pywt'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python3.6/site-packages/%(name)s-%(version)s-py3.6-linux-x86_64.egg'],
+}
+
+moduleclass = 'python'

s/Score-P/Score-P-3.1-intel-2017a.eb

@@ -25,7 +25,7 @@ checksums = [
 
 dependencies = [
 #    ('libunwind', '1.1'),
-    ('Cube', '4.3.5', '', True),
+    ('Cube', '4.3.5'),
     ('OPARI2', '2.0.2', '', True),
     ('OTF2', '2.1', '', True),
     ('PAPI', '5.4.3', '', True),

s/scikit-image/scikit-image-0.13.1-Py-3.6.eb

@@ -3,7 +3,7 @@
 easyblock = 'PythonPackage'
 
 name = 'scikit-image'
-version = '0.12.3'
+version = '0.13.1'
 
 homepage = 'http://scikit-learn.org/stable/index.html'
 description = """Scikit-learn integrates machine learning algorithms in the tightly-knit scientific Python world,
@@ -21,13 +21,18 @@ dependencies = [
     ('numpy', '1.13.3'),
     ('scipy', '1.0.0'),
     ('six', '1.11.0'),
+    ('networkx', '2.1'),
+    ('Pillow', '5.0.0'),
+    ('dask', '0.17.0'),
+    ('toolz', '0.9.0'),
+    ('PyWavelets', '0.5.2'),
 ]
 
 options = {'modulename': 'skimage'}
 
 sanity_check_paths = {
     'files': [],
-    'dirs': ['lib/python3.6/site-packages/'],
+    'dirs': ['lib/python3.6/site-packages/scikit_image-%(version)s-py3.6-linux-x86_64.egg'],
 }
 
 moduleclass = 'python'

t/toolz/toolz-0.9.0-Py-3.6.eb

@@ -0,0 +1,24 @@
+# IT4Innovations 2018
+
+easyblock = "PythonPackage"
+name = 'toolz'
+version = '0.9.0'
+
+homepage = 'https://pypi.python.org/pypi/toolz'
+description = 'List processing tools and functional utilities.'
+
+toolchain = {'name': 'Py', 'version': '3.6'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+#dependencies = [
+#    ('MarkupSafe', '1.0'),
+#]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python3.6/site-packages/%(name)s-%(version)s-py3.6.egg'],
+}
+
+moduleclass = 'python'