From fcc2abba71ff5673c4e2660b77da469de38b72da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Krup=C4=8D=C3=ADk?= <lukas.krupcik@vsb.cz>
Date: Thu, 27 Aug 2020 13:23:14 +0200
Subject: [PATCH] 	modified:   h/HTSlib/HTSlib-1.9-intel-2020a.eb 
 deleted:   
 s/SciPy-bundle/SciPy-bundle-2020.03-intel-2020a-Python-3.8.2-LK.eb 
 deleted:    s/SciPy-bundle/SciPy-bundle-2020.03-intel-2020a-Python-3.8.2.eb

---
 h/HTSlib/HTSlib-1.9-intel-2020a.eb            |  8 +--
 ...dle-2020.03-intel-2020a-Python-3.8.2-LK.eb | 57 ------------------
 ...bundle-2020.03-intel-2020a-Python-3.8.2.eb | 58 -------------------
 3 files changed, 4 insertions(+), 119 deletions(-)
 delete mode 100644 s/SciPy-bundle/SciPy-bundle-2020.03-intel-2020a-Python-3.8.2-LK.eb
 delete mode 100644 s/SciPy-bundle/SciPy-bundle-2020.03-intel-2020a-Python-3.8.2.eb

diff --git a/h/HTSlib/HTSlib-1.9-intel-2020a.eb b/h/HTSlib/HTSlib-1.9-intel-2020a.eb
index c8cde508..4059ade4 100644
--- a/h/HTSlib/HTSlib-1.9-intel-2020a.eb
+++ b/h/HTSlib/HTSlib-1.9-intel-2020a.eb
@@ -1,4 +1,4 @@
-# IT4Innovations 2020
+# JH 2020
 
 easyblock = 'ConfigureMake'
 
@@ -15,9 +15,9 @@ source_urls = ['https://github.com/samtools/%(namelower)s/releases/download/%(ve
 sources = [SOURCELOWER_TAR_BZ2]
 
 dependencies = [
-    ('zlib', '1.2.11', '', True),
-    ('bzip2', '1.0.6', '', True),
-    ('XZ', '5.2.4', '', True),
+    ('zlib', '1.2.11'),
+    ('bzip2', '1.0.8'),
+    ('XZ', '5.2.5'),
 ]
 
 sanity_check_paths = {
diff --git a/s/SciPy-bundle/SciPy-bundle-2020.03-intel-2020a-Python-3.8.2-LK.eb b/s/SciPy-bundle/SciPy-bundle-2020.03-intel-2020a-Python-3.8.2-LK.eb
deleted file mode 100644
index 8ab8c6b2..00000000
--- a/s/SciPy-bundle/SciPy-bundle-2020.03-intel-2020a-Python-3.8.2-LK.eb
+++ /dev/null
@@ -1,57 +0,0 @@
-# JH 2020
-
-easyblock = 'PythonBundle'
-
-name = 'SciPy-bundle'
-version = '2020.03'
-versionsuffix = '-Python-3.8.2-LK'
-
-homepage = 'https://python.org/'
-description = "Bundle of Python packages for scientific software"
-
-toolchain = {'name': 'intel', 'version': '2020a'}
-toolchainopts = {'pic': True, 'lowopt': True}
-
-dependencies = [
-    ('Python', '3.8.2'),
-    ('pybind11', '2.4.3', '-Python-3.8.2'),  # required by scipy
-]
-
-use_pip = True
-
-exts_default_options = {'source_urls': [PYPI_SOURCE]}
-
-# order is important!
-exts_list = [
-    ('numpy', '1.18.5', {
-        'patches': ['numpy-1.18.2-mkl.patch'],
-        'source_tmpl': '%(name)s-%(version)s.zip',
-#        'checksums': [
-#            'e46e2384209c91996d5ec16744234d1c906ab79a701ce1a26155c9ec890b8dc8',  # numpy-1.18.2.zip
-#            'ea25ad5c0148c1398d282f0424e642fb9815a1a80f4512659b018e2adc378bcf',  # numpy-1.18.2-mkl.patch
-#        ],
-    }),
-    ('scipy', '1.4.1', {
-        'patches': ['scipy-1.4.1-fix-pthread.patch'],
-        'checksums': [
-            'dee1bbf3a6c8f73b6b218cb28eed8dd13347ea2f87d572ce19b289d6fd3fbc59',  # scipy-1.4.1.tar.gz
-            '4e2162a93caddce63a1aa2dfb6c181774a4f6615950e1d60c54bb4308fee3bb3',  # scipy-1.4.1-fix-pthread.patch
-        ],
-    }),
-    ('mpi4py', '3.0.3', {
-        'checksums': ['012d716c8b9ed1e513fcc4b18e5af16a8791f51e6d1716baccf988ad355c5a1f'],
-    }),
-    ('pandas', '1.0.3', {
-        'checksums': ['32f42e322fb903d0e189a4c10b75ba70d90958cc4f66a1781ed027f1a1d14586'],
-    }),
-    ('mpmath', '1.1.0', {
-        'checksums': ['fc17abe05fbab3382b61a123c398508183406fa132e0223874578e20946499f6'],
-    }),
-    ('deap', '1.3.1', {
-        'checksums': ['11f54493ceb54aae10dde676577ef59fc52d52f82729d5a12c90b0813c857a2f'],
-    }),
-]
-
-sanity_pip_check = True
-
-moduleclass = 'lang'
diff --git a/s/SciPy-bundle/SciPy-bundle-2020.03-intel-2020a-Python-3.8.2.eb b/s/SciPy-bundle/SciPy-bundle-2020.03-intel-2020a-Python-3.8.2.eb
deleted file mode 100644
index 02e3cae1..00000000
--- a/s/SciPy-bundle/SciPy-bundle-2020.03-intel-2020a-Python-3.8.2.eb
+++ /dev/null
@@ -1,58 +0,0 @@
-# JH 2020
-
-easyblock = 'PythonBundle'
-
-name = 'SciPy-bundle'
-version = '2020.03'
-versionsuffix = '-Python-%(pyver)s'
-
-homepage = 'https://python.org/'
-description = "Bundle of Python packages for scientific software"
-
-toolchain = {'name': 'intel', 'version': '2020a'}
-toolchainopts = {'pic': True, 'lowopt': True}
-
-dependencies = [
-    ('Python', '3.8.2'),
-    ('pybind11', '2.4.3', versionsuffix),  # required by scipy
-]
-
-use_pip = True
-
-exts_default_options = {'source_urls': [PYPI_SOURCE]}
-default_easyblock = 'PythonPackage'
-
-# order is important!
-exts_list = [
-    ('numpy', '1.18.3', {
-        'patches': ['numpy-1.18.2-mkl.patch'],
-        'source_tmpl': '%(name)s-%(version)s.zip',
-        'checksums': [
-            'e46e2384209c91996d5ec16744234d1c906ab79a701ce1a26155c9ec890b8dc8',  # numpy-1.18.2.zip
-            'ea25ad5c0148c1398d282f0424e642fb9815a1a80f4512659b018e2adc378bcf',  # numpy-1.18.2-mkl.patch
-        ],
-    }),
-    ('scipy', '1.4.1', {
-        'patches': ['scipy-1.4.1-fix-pthread.patch'],
-        'checksums': [
-            'dee1bbf3a6c8f73b6b218cb28eed8dd13347ea2f87d572ce19b289d6fd3fbc59',  # scipy-1.4.1.tar.gz
-            '4e2162a93caddce63a1aa2dfb6c181774a4f6615950e1d60c54bb4308fee3bb3',  # scipy-1.4.1-fix-pthread.patch
-        ],
-    }),
-    ('mpi4py', '3.0.3', {
-        'checksums': ['012d716c8b9ed1e513fcc4b18e5af16a8791f51e6d1716baccf988ad355c5a1f'],
-    }),
-    ('pandas', '1.0.3', {
-        'checksums': ['32f42e322fb903d0e189a4c10b75ba70d90958cc4f66a1781ed027f1a1d14586'],
-    }),
-    ('mpmath', '1.1.0', {
-        'checksums': ['fc17abe05fbab3382b61a123c398508183406fa132e0223874578e20946499f6'],
-    }),
-    ('deap', '1.3.1', {
-        'checksums': ['11f54493ceb54aae10dde676577ef59fc52d52f82729d5a12c90b0813c857a2f'],
-    }),
-]
-
-sanity_pip_check = True
-
-moduleclass = 'lang'