Change to PythonBundle

easybuilders · Nov 6, 2018 · 04616b2 · 04616b2
1 parent 5e6233b
commit 04616b2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 16 deletions.
diff --git a/easybuild/easyconfigs/d/deepdiff/deepdiff-3.3.0-intel-2018b-Python-2.7.15.eb b/easybuild/easyconfigs/d/deepdiff/deepdiff-3.3.0-intel-2018b-Python-2.7.15.eb
@@ -1,4 +1,4 @@
-easyblock = 'Bundle'
+easyblock = 'PythonBundle'
 
 name = 'deepdiff'
 version = '3.3.0'
@@ -11,11 +11,7 @@ toolchain = {'name': 'intel', 'version': '2018b'}
 
 dependencies = [('Python', '2.7.15')]
 
-exts_defaultclass = 'PythonPackage'
-exts_default_options = {
-    'download_dep_fail': True,
-    'use_pip': True,
-}
+use_pip = True
 
 exts_list = [
     ('jsonpickle', '1.0', {
@@ -33,6 +29,4 @@ sanity_check_paths = {
     'dirs': ['lib/python%(pyshortver)s/site-packages']
 }
 
-modextrapaths = {'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages']}
-
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/p/pytest/pytest-3.8.2-intel-2018b-Python-2.7.15.eb b/easybuild/easyconfigs/p/pytest/pytest-3.8.2-intel-2018b-Python-2.7.15.eb
@@ -1,4 +1,4 @@
-easyblock = 'Bundle'
+easyblock = 'PythonBundle'
 
 name = 'pytest'
 version = '3.8.2'
@@ -11,11 +11,7 @@ toolchain = {'name': 'intel', 'version': '2018b'}
 
 dependencies = [('Python', '2.7.15')]
 
-exts_defaultclass = 'PythonPackage'
-exts_default_options = {
-    'download_dep_fail': True,
-    'use_pip': True,
-}
+use_pip = True
 
 exts_list = [
     ('py', '1.7.0', {
@@ -59,6 +55,4 @@ sanity_check_paths = {
     'dirs': ['lib/python%(pyshortver)s/site-packages'],
 }
 
-modextrapaths = {'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages']}
-
 moduleclass = 'tools'