Merge branch 'it4i-barbora'

archive/p/Python/Python-2.7.10-foss-2015a.eb

@@ -8,8 +8,8 @@ description = """Python is a programming language that lets you work more quickl
 toolchain = {'name': 'foss', 'version': '2015a'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.9.2'
-scilocal_pyversion = '0.15.1'
+local_numpyversion = '1.9.2'
+local_scipyversion = '0.15.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -41,12 +41,12 @@ exts_list = [
     ('nose', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
         'patches': ['numpy-1.8.0-mkl.patch'],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],

archive/p/Python/Python-2.7.10-foss-2015b.eb

@@ -8,8 +8,8 @@ description = """Python is a programming language that lets you work more quickl
 toolchain = {'name': 'foss', 'version': '2015b'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.9.2'
-scilocal_pyversion = '0.15.1'
+local_numpyversion = '1.9.2'
+local_scipyversion = '0.15.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -41,12 +41,12 @@ exts_list = [
     ('nose', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
         'patches': ['numpy-1.8.0-mkl.patch'],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],

archive/p/Python/Python-2.7.10-intel-2015a.eb

@@ -8,8 +8,8 @@ description = """Python is a programming language that lets you work more quickl
 toolchain = {'name': 'intel', 'version': '2015a'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.9.2'
-scilocal_pyversion = '0.15.1'
+local_numpyversion = '1.9.2'
+local_scipyversion = '0.15.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -41,12 +41,12 @@ exts_list = [
     ('nose', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
         'patches': ['numpy-1.8.0-mkl.patch'],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],

archive/p/Python/Python-2.7.10-intel-2015b.eb

@@ -8,8 +8,8 @@ description = """Python is a programming language that lets you work more quickl
 toolchain = {'name': 'intel', 'version': '2015b'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.9.2'
-scilocal_pyversion = '0.15.1'
+local_numpyversion = '1.9.2'
+local_scipyversion = '0.15.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -40,12 +40,12 @@ exts_list = [
     ('nose', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
         'patches': ['numpy-1.8.0-mkl.patch'],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],

archive/p/Python/Python-2.7.11-foss-2015a.eb

@@ -8,8 +8,8 @@ description = """Python is a programming language that lets you work more quickl
 toolchain = {'name': 'foss', 'version': '2015a'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.10.1'
-scilocal_pyversion = '0.16.1'
+local_numpyversion = '1.10.1'
+local_scipyversion = '0.16.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -41,12 +41,12 @@ exts_list = [
     ('nose', '1.3.7', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
         'patches': ['numpy-1.8.0-mkl.patch'],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],

archive/p/Python/Python-2.7.11-foss-2016a.eb

@@ -8,8 +8,8 @@ description = """Python is a programming language that lets you work more quickl
 toolchain = {'name': 'foss', 'version': '2016a'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.10.1'
-scilocal_pyversion = '0.16.1'
+local_numpyversion = '1.10.1'
+local_scipyversion = '0.16.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]

archive/p/Python/Python-2.7.11-intel-2015b.eb

@@ -8,8 +8,8 @@ description = """Python is a programming language that lets you work more quickl
 toolchain = {'name': 'intel', 'version': '2015b'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.10.1'
-scilocal_pyversion = '0.16.1'
+local_numpyversion = '1.10.1'
+local_scipyversion = '0.16.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -41,15 +41,15 @@ exts_list = [
     ('nose', '1.3.7', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
         'patches': [
             'numpy-1.8.0-mkl.patch',
-            'numpy-%s-sse42.patch' % numlocal_pyversion,
+            'numpy-%s-sse42.patch' % local_numpyversion,
         ],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],

archive/p/Python/Python-2.7.11-intel-2016.02-GCC-4.9.eb

@@ -8,8 +8,8 @@ description = """Python is a programming language that lets you work more quickl
 toolchain = {'name': 'intel', 'version': '2016.02-GCC-4.9'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.10.1'
-scilocal_pyversion = '0.16.1'
+local_numpyversion = '1.10.1'
+local_scipyversion = '0.16.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -41,15 +41,15 @@ exts_list = [
     ('nose', '1.3.7', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
         'patches': [
             'numpy-1.8.0-mkl.patch',
-            'numpy-%s-sse42.patch' % numlocal_pyversion,
+            'numpy-%s-sse42.patch' % local_numpyversion,
         ],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],

archive/p/Python/Python-2.7.11-intel-2016a-libX11-1.6.3.eb

@@ -10,8 +10,8 @@ description = """Python is a programming language that lets you work more quickl
 toolchain = {'name': 'intel', 'version': '2016a'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.10.1'
-scilocal_pyversion = '0.16.1'
+local_numpyversion = '1.10.1'
+local_scipyversion = '0.16.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -43,15 +43,15 @@ exts_list = [
     ('nose', '1.3.7', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
         'patches': [
             'numpy-1.8.0-mkl.patch',
-            'numpy-%s-sse42.patch' % numlocal_pyversion,
+            'numpy-%s-sse42.patch' % local_numpyversion,
         ],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],

archive/p/Python/Python-2.7.11-intel-2016a.eb

@@ -8,8 +8,8 @@ description = """Python is a programming language that lets you work more quickl
 toolchain = {'name': 'intel', 'version': '2016a'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.10.1'
-scilocal_pyversion = '0.16.1'
+local_numpyversion = '1.10.1'
+local_scipyversion = '0.16.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -41,15 +41,15 @@ exts_list = [
     ('nose', '1.3.7', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
         'patches': [
             'numpy-1.8.0-mkl.patch',
-            'numpy-%s-sse42.patch' % numlocal_pyversion,
+            'numpy-%s-sse42.patch' % local_numpyversion,
         ],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],

archive/p/Python/Python-2.7.9-foss-2015.05.eb

@@ -7,8 +7,8 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = {'name': 'foss', 'version': '2015.05'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.9.1'
-scilocal_pyversion = '0.14.1'
+local_numpyversion = '1.9.1'
+local_scipyversion = '0.14.1'
 
 source_urls = ['https://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -39,11 +39,11 @@ exts_list = [
     ('nose', '1.3.4', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('https://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('https://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('https://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('https://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],

archive/p/Python/Python-2.7.9-foss-2015a.eb

@@ -7,8 +7,8 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = {'name': 'foss', 'version': '2015a'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.9.1'
-scilocal_pyversion = '0.14.1'
+local_numpyversion = '1.9.1'
+local_scipyversion = '0.14.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -39,11 +39,11 @@ exts_list = [
     ('nose', '1.3.4', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],

archive/p/Python/Python-2.7.9-foss-2015b.eb

@@ -7,8 +7,8 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = {'name': 'foss', 'version': '2015b'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.9.1'
-scilocal_pyversion = '0.14.1'
+local_numpyversion = '1.9.1'
+local_scipyversion = '0.14.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -39,11 +39,11 @@ exts_list = [
     ('nose', '1.3.4', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],

archive/p/Python/Python-2.7.9-foss-2015g.eb

@@ -7,8 +7,8 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = {'name': 'foss', 'version': '2015g'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.9.1'
-scilocal_pyversion = '0.14.1'
+local_numpyversion = '1.9.1'
+local_scipyversion = '0.14.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -38,11 +38,11 @@ exts_list = [
     ('nose', '1.3.4', {
         'source_urls': ['http://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['http://pypi.python.org/packages/source/b/blist/'],

archive/p/Python/Python-2.7.9-intel-2015a.eb

@@ -7,8 +7,8 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = {'name': 'intel', 'version': '2015a'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.9.1'
-scilocal_pyversion = '0.14.1'
+local_numpyversion = '1.9.1'
+local_scipyversion = '0.14.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -39,12 +39,12 @@ exts_list = [
     ('nose', '1.3.4', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
         'patches': ['numpy-1.8.0-mkl.patch'],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],

archive/p/Python/Python-2.7.9-intel-2015b.eb

@@ -7,8 +7,8 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = {'name': 'intel', 'version': '2015b'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.9.1'
-scilocal_pyversion = '0.14.1'
+local_numpyversion = '1.9.1'
+local_scipyversion = '0.14.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]

archive/p/Python/Python-3.5.0-intel-2015b.eb

@@ -7,8 +7,8 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = {'name': 'intel', 'version': '2015b'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.9.3'
-scilocal_pyversion = '0.16.0'
+local_numpyversion = '1.9.3'
+local_scipyversion = '0.16.0'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -40,11 +40,11 @@ exts_list = [
     ('nose', '1.3.7', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
+    ('numpy', local_numpyversion, {
         'source_urls': ['https://pypi.python.org/packages/source/n/numpy/'],
         'patches': ['numpy-1.8.0-mkl.patch'],
     }),
-    ('scipy', scilocal_pyversion, {
+    ('scipy', local_scipyversion, {
         'source_urls': ['https://pypi.python.org/packages/source/s/scipy/'],
     }),
     ('blist', '1.3.6', {

archive/p/Python/Python-3.5.1-foss-2015a.eb

@@ -7,8 +7,8 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = {'name': 'foss', 'version': '2015a'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.10.4'
-scilocal_pyversion = '0.17.0'
+local_numpyversion = '1.10.4'
+local_scipyversion = '0.17.0'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -41,10 +41,10 @@ exts_list = [
     ('nose', '1.3.7', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
+    ('numpy', local_numpyversion, {
         'source_urls': ['https://pypi.python.org/packages/source/n/numpy/'],
     }),
-    ('scipy', scilocal_pyversion, {
+    ('scipy', local_scipyversion, {
         'source_urls': ['https://pypi.python.org/packages/source/s/scipy/'],
     }),
     ('blist', '1.3.6', {

archive/p/Python/Python-3.5.1-foss-2016a.eb

@@ -7,8 +7,8 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = {'name': 'foss', 'version': '2016a'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.10.4'
-scilocal_pyversion = '0.17.0'
+local_numpyversion = '1.10.4'
+local_scipyversion = '0.17.0'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -41,10 +41,10 @@ exts_list = [
     ('nose', '1.3.7', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
+    ('numpy', local_numpyversion, {
         'source_urls': ['https://pypi.python.org/packages/source/n/numpy/'],
     }),
-    ('scipy', scilocal_pyversion, {
+    ('scipy', local_scipyversion, {
         'source_urls': ['https://pypi.python.org/packages/source/s/scipy/'],
     }),
     ('blist', '1.3.6', {

archive/p/Python/Python-3.5.1-intel-2016.01.eb

@@ -7,8 +7,8 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = {'name': 'intel', 'version': '2016.01'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.10.4'
-scilocal_pyversion = '0.17.0'
+local_numpyversion = '1.10.4'
+local_scipyversion = '0.17.0'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -41,14 +41,14 @@ exts_list = [
     ('nose', '1.3.7', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
+    ('numpy', local_numpyversion, {
         'source_urls': ['https://pypi.python.org/packages/source/n/numpy/'],
         'patches': [
             'numpy-1.8.0-mkl.patch',
-            'numpy-%s-sse42.patch' % numlocal_pyversion,
+            'numpy-%s-sse42.patch' % local_numpyversion,
         ],
     }),
-    ('scipy', scilocal_pyversion, {
+    ('scipy', local_scipyversion, {
         'source_urls': ['https://pypi.python.org/packages/source/s/scipy/'],
     }),
     ('blist', '1.3.6', {

archive/p/Python/Python-3.5.1-intel-2016a.eb

@@ -7,8 +7,8 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = {'name': 'intel', 'version': '2016a'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.10.4'
-scilocal_pyversion = '0.17.0'
+local_numpyversion = '1.10.4'
+local_scipyversion = '0.17.0'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -41,14 +41,14 @@ exts_list = [
     ('nose', '1.3.7', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
+    ('numpy', local_numpyversion, {
         'source_urls': ['https://pypi.python.org/packages/source/n/numpy/'],
         'patches': [
             'numpy-1.8.0-mkl.patch',
-            'numpy-%s-sse42.patch' % numlocal_pyversion,
+            'numpy-%s-sse42.patch' % local_numpyversion,
         ],
     }),
-    ('scipy', scilocal_pyversion, {
+    ('scipy', local_scipyversion, {
         'source_urls': ['https://pypi.python.org/packages/source/s/scipy/'],
     }),
     ('blist', '1.3.6', {

p/Python/Python-2.7.10-gimkl-2.11.5.eb

@@ -8,8 +8,8 @@ description = """Python is a programming language that lets you work more quickl
 toolchain = {'name': 'gimkl', 'version': '2.11.5'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.9.2'
-scilocal_pyversion = '0.15.1'
+local_numpyversion = '1.9.2'
+local_scipyversion = '0.15.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -40,12 +40,12 @@ exts_list = [
     ('nose', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
         'patches': ['numpy-1.8.0-mkl.patch'],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],

p/Python/Python-2.7.10-goolf-1.4.10.eb

@@ -8,8 +8,8 @@ description = """Python is a programming language that lets you work more quickl
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.9.2'
-scilocal_pyversion = '0.15.1'
+local_numpyversion = '1.9.2'
+local_scipyversion = '0.15.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -41,12 +41,12 @@ exts_list = [
     ('nose', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
         'patches': ['numpy-1.8.0-mkl.patch'],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],

p/Python/Python-2.7.10-goolf-1.7.20.eb

@@ -8,8 +8,8 @@ description = """Python is a programming language that lets you work more quickl
 toolchain = {'name': 'goolf', 'version': '1.7.20'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.9.2'
-scilocal_pyversion = '0.15.1'
+local_numpyversion = '1.9.2'
+local_scipyversion = '0.15.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -41,12 +41,12 @@ exts_list = [
     ('nose', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
         'patches': ['numpy-1.8.0-mkl.patch'],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],

p/Python/Python-2.7.11-CrayGNU-2015.11.eb

@@ -10,8 +10,8 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = {'name': 'CrayGNU', 'version': '2015.11'}
 toolchainopts = {'pic': True}
 
-numlocal_pyversion = '1.10.4'
-scilocal_pyversion = '0.16.1'
+local_numpyversion = '1.10.4'
+local_scipyversion = '0.16.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -44,12 +44,12 @@ exts_list = [
     ('nose', '1.3.7', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
         'patches': ['numpy-1.8.0-mkl.patch'],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],

p/Python/Python-2.7.11-CrayGNU-2016.03.eb

@@ -10,8 +10,8 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = {'name': 'CrayGNU', 'version': '2016.03'}
 toolchainopts = {'pic': True}
 
-numlocal_pyversion = '1.10.4'
-scilocal_pyversion = '0.16.1'
+local_numpyversion = '1.10.4'
+local_scipyversion = '0.16.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -44,12 +44,12 @@ exts_list = [
     ('nose', '1.3.7', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
         'patches': ['numpy-1.8.0-mkl.patch'],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],

p/Python/Python-2.7.11-gimkl-2.11.5.eb

@@ -8,8 +8,8 @@ description = """Python is a programming language that lets you work more quickl
 toolchain = {'name': 'gimkl', 'version': '2.11.5'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.10.1'
-scilocal_pyversion = '0.16.1'
+local_numpyversion = '1.10.1'
+local_scipyversion = '0.16.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -41,15 +41,15 @@ exts_list = [
     ('nose', '1.3.7', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
         'patches': [
             'numpy-1.8.0-mkl.patch',
-            'numpy-%s-sse42.patch' % numlocal_pyversion,
+            'numpy-%s-sse42.patch' % local_numpyversion,
         ],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],

p/Python/Python-2.7.11-goolf-1.7.20.eb

@@ -8,8 +8,8 @@ description = """Python is a programming language that lets you work more quickl
 toolchain = {'name': 'goolf', 'version': '1.7.20'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.10.1'
-scilocal_pyversion = '0.16.1'
+local_numpyversion = '1.10.1'
+local_scipyversion = '0.16.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -42,12 +42,12 @@ exts_list = [
     ('nose', '1.3.7', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
         'patches': ['numpy-1.8.0-mkl.patch'],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],

p/Python/Python-2.7.11-iomkl-2016.07.eb

@@ -10,8 +10,8 @@ description = """Python is a programming language that lets you work more quickl
 toolchain = {'name': 'iomkl', 'version': '2016.07'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.10.1'
-scilocal_pyversion = '0.16.1'
+local_numpyversion = '1.10.1'
+local_scipyversion = '0.16.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -46,12 +46,12 @@ exts_list = [
     ('nose', '1.3.7', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
         'patches': ['numpy-1.8.0-mkl.patch'],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],

p/Python/Python-2.7.11-iomkl-2016.09-GCC-4.9.3-2.25.eb

@@ -8,8 +8,8 @@ description = """Python is a programming language that lets you work more quickl
 toolchain = {'name': 'iomkl', 'version': '2016.09-GCC-4.9.3-2.25'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.10.1'
-scilocal_pyversion = '0.16.1'
+local_numpyversion = '1.10.1'
+local_scipyversion = '0.16.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -44,12 +44,12 @@ exts_list = [
     ('nose', '1.3.7', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
         'patches': ['numpy-1.8.0-mkl.patch'],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],

p/Python/Python-2.7.9-CrayGNU-2015.06.eb

@@ -7,8 +7,8 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = {'name': 'CrayGNU', 'version': '2015.06'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.9.1'
-scilocal_pyversion = '0.14.1'
+local_numpyversion = '1.9.1'
+local_scipyversion = '0.14.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -43,14 +43,14 @@ exts_list = [
     ('nose', '1.3.4', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
         'patches': [
-            'numpy-1.8.0-mkl.patch',  # % numlocal_pyversion,
+            'numpy-1.8.0-mkl.patch',  # % local_numpyversion,
         ],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],

p/Python/Python-2.7.9-CrayGNU-2015.11.eb

@@ -7,8 +7,8 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = {'name': 'CrayGNU', 'version': '2015.11'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.9.1'
-scilocal_pyversion = '0.14.1'
+local_numpyversion = '1.9.1'
+local_scipyversion = '0.14.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -43,14 +43,14 @@ exts_list = [
     ('nose', '1.3.4', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
         'patches': [
-            'numpy-1.8.0-mkl.patch',  # % numlocal_pyversion,
+            'numpy-1.8.0-mkl.patch',  # % local_numpyversion,
         ],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],

p/Python/Python-2.7.9-GNU-5.1.0-2.25.eb

@@ -7,8 +7,8 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = {'name': 'GNU', 'version': '5.1.0-2.25'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.9.1'
-scilocal_pyversion = '0.14.1'
+local_numpyversion = '1.9.1'
+local_scipyversion = '0.14.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]

p/Python/Python-2.7.9-gompi-2015e.eb

@@ -7,8 +7,8 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = {'name': 'gompi', 'version': '2015e'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.9.1'
-scilocal_pyversion = '0.14.1'
+local_numpyversion = '1.9.1'
+local_scipyversion = '0.14.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]

p/Python/Python-2.7.9-goolf-1.5.14.eb

@@ -7,8 +7,8 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = {'name': 'goolf', 'version': '1.5.14'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.9.1'
-scilocal_pyversion = '0.14.1'
+local_numpyversion = '1.9.1'
+local_scipyversion = '0.14.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -39,11 +39,11 @@ exts_list = [
     ('nose', '1.3.4', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],

p/Python/Python-2.7.9-goolf-1.5.16.eb

@@ -7,8 +7,8 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = {'name': 'goolf', 'version': '1.5.16'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.9.1'
-scilocal_pyversion = '0.14.1'
+local_numpyversion = '1.9.1'
+local_scipyversion = '0.14.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -39,11 +39,11 @@ exts_list = [
     ('nose', '1.3.4', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('https://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('https://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('https://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('https://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],

p/Python/Python-2.7.9-goolf-1.7.20.eb

@@ -7,8 +7,8 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = {'name': 'goolf', 'version': '1.7.20'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.9.1'
-scilocal_pyversion = '0.14.1'
+local_numpyversion = '1.9.1'
+local_scipyversion = '0.14.1'
 
 source_urls = ['https://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -39,11 +39,11 @@ exts_list = [
     ('nose', '1.3.4', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('https://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('https://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('https://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('https://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],

p/Python/Python-2.7.9.eb

@@ -9,8 +9,8 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = SYSTEM
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.9.1'
-scilocal_pyversion = '0.14.1'
+local_numpyversion = '1.9.1'
+local_scipyversion = '0.14.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -42,11 +42,11 @@ exts_list = [
     ('nose', '1.3.4', {
         'source_urls': ['http://pypi.python.org/packages/source/n/nose/'],
     }),
-    #    ('numpy', numlocal_pyversion, {
-    #        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    #    ('numpy', local_numpyversion, {
+    #        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
     #    }),
-    #    ('scipy', scilocal_pyversion, {
-    #        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    #    ('scipy', local_scipyversion, {
+    #        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     #    }),
     #    ('blist', '1.3.6', {
     #        'source_urls': ['http://pypi.python.org/packages/source/b/blist/'],

p/Python/Python-3.5.1-intel-2017.00.eb

@@ -7,7 +7,7 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = {'name': 'intel', 'version': '2017.00'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-scilocal_pyversion = '0.17.0'
+local_scipyversion = '0.17.0'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]

p/Python/Python-3.5.1.eb

@@ -7,8 +7,8 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = SYSTEM
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.10.4'
-scilocal_pyversion = '0.17.0'
+local_numpyversion = '1.10.4'
+local_scipyversion = '0.17.0'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -41,10 +41,10 @@ exts_list = [
     ('nose', '1.3.7', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    #    ('numpy', numlocal_pyversion, {
+    #    ('numpy', local_numpyversion, {
     #        'source_urls': ['https://pypi.python.org/packages/source/n/numpy/'],
     #    }),
-    #    ('scipy', scilocal_pyversion, {
+    #    ('scipy', local_scipyversion, {
     #        'source_urls': ['https://pypi.python.org/packages/source/s/scipy/'],
     #    }),
     #    ('blist', '1.3.6', {

p/Python/Python-3.5.2-intel-2017.00.eb

@@ -7,7 +7,7 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = {'name': 'intel', 'version': '2017.00'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-scilocal_pyversion = '0.17.0'
+local_scipyversion = '0.17.0'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]

p/Python/Python-3.5.2.eb

@@ -7,8 +7,8 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = SYSTEM
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.10.4'
-scilocal_pyversion = '0.17.0'
+local_numpyversion = '1.10.4'
+local_scipyversion = '0.17.0'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -41,10 +41,10 @@ exts_list = [
     ('nose', '1.3.7', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    #    ('numpy', numlocal_pyversion, {
+    #    ('numpy', local_numpyversion, {
     #        'source_urls': ['https://pypi.python.org/packages/source/n/numpy/'],
     #    }),
-    #    ('scipy', scilocal_pyversion, {
+    #    ('scipy', local_scipyversion, {
     #        'source_urls': ['https://pypi.python.org/packages/source/s/scipy/'],
     #    }),
     #    ('blist', '1.3.6', {