Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

style fixes #266

Merged
merged 4 commits into from
May 20, 2013
Merged

style fixes #266

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
01353c9
style fixes
boegel May 17, 2013
7d21d65
aling numpy version in iomkl Python-2.7.3 easyconfig with others
boegel May 17, 2013
1076cc5
Revert "correctly enable debug logging"
boegel May 20, 2013
0cb5aa7
Merge branch 'develop' into style_fixes
boegel May 20, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-cgmpolf-1.1.6.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ toolchain = {'name': 'cgmpolf', 'version': '1.1.6'}
toolchainopts = {'pic': True}

sources = [SOURCE_TAR_GZ]
source_urls = ['http://www.bzip.org/%s/' % version]
source_urls = ['http://www.bzip.org/%(version)s/']

moduleclass = 'tools'
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-cgmvolf-1.1.12rc1.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ toolchain = {'name': 'cgmvolf', 'version': '1.1.12rc1'}
toolchainopts = {'pic': True}

sources = [SOURCE_TAR_GZ]
source_urls = ['http://www.bzip.org/%s/' % version]
source_urls = ['http://www.bzip.org/%(version)s/']

moduleclass = 'tools'
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-cgoolf-1.1.7.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ toolchain = {'name': 'cgoolf', 'version': '1.1.7'}
toolchainopts = {'pic': True}

sources = [SOURCE_TAR_GZ]
source_urls = ['http://www.bzip.org/%s/' % version]
source_urls = ['http://www.bzip.org/%(version)s/']

moduleclass = 'tools'
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-gmvolf-1.7.12rc1.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ toolchain = {'name': 'gmvolf', 'version': '1.7.12rc1'}
toolchainopts = {'pic': True}

sources = [SOURCE_TAR_GZ]
source_urls = ['http://www.bzip.org/%s/' % version]
source_urls = ['http://www.bzip.org/%(version)s/']

moduleclass = 'tools'
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-goalf-1.1.0-no-OFED.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
toolchainopts = {'pic': True}

sources = [SOURCE_TAR_GZ]
source_urls = ['http://www.bzip.org/%(version)s']
source_urls = ['http://www.bzip.org/%(version)s/']

moduleclass = 'tools'
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-goolf-1.4.10.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'}
toolchainopts = {'pic': True}

sources = [SOURCE_TAR_GZ]
source_urls = ['http://www.bzip.org/%s/' % version]
source_urls = ['http://www.bzip.org/%(version)s/']

moduleclass = 'tools'
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmpolf-1.1.6.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ additional functions to maintain a list of previously-entered command lines, to
and perform csh-like history expansion on previous commands."""
toolchain = {'name': 'cgmpolf', 'version': '1.1.6'}

sources = ['readline-%s.tar.gz' % (version)]
sources = ['readline-%(version)s.tar.gz']
source_urls = ['http://ftpmirror.gnu.org/readline']

sanity_check_paths = {
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.1.12rc1.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ additional functions to maintain a list of previously-entered command lines, to
and perform csh-like history expansion on previous commands."""
toolchain = {'name': 'cgmvolf', 'version': '1.1.12rc1'}

sources = ['readline-%s.tar.gz' % (version)]
sources = ['readline-%(version)s.tar.gz']
source_urls = ['http://ftpmirror.gnu.org/readline']

sanity_check_paths = {
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgoolf-1.1.7.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ additional functions to maintain a list of previously-entered command lines, to
and perform csh-like history expansion on previous commands."""
toolchain = {'name': 'cgoolf', 'version': '1.1.7'}

sources = ['readline-%s.tar.gz' % (version)]
sources = ['readline-%(version)s.tar.gz']
source_urls = ['http://ftpmirror.gnu.org/readline']

sanity_check_paths = {
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12rc1.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ additional functions to maintain a list of previously-entered command lines, to
and perform csh-like history expansion on previous commands."""
toolchain = {'name': 'gmvolf', 'version': '1.7.12rc1'}

sources = ['readline-%s.tar.gz' % (version)]
sources = ['readline-%(version)s.tar.gz']
source_urls = ['http://ftpmirror.gnu.org/readline']

sanity_check_paths = {
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.1.0-no-OFED.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ description = """The GNU Readline library provides a set of functions for use by

toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}

sources = ['readline-%s.tar.gz' % (version)]
sources = ['readline-%(version)s.tar.gz']
source_urls = ['http://ftpmirror.gnu.org/readline']

dependencies = [('ncurses', '5.9')]
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/l/libreadline/libreadline-6.2-goolf-1.4.10.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ additional functions to maintain a list of previously-entered command lines, to
and perform csh-like history expansion on previous commands."""
toolchain = {'name': 'goolf', 'version': '1.4.10'}

sources = ['readline-%s.tar.gz' % (version)]
sources = ['readline-%(version)s.tar.gz']
source_urls = ['http://ftpmirror.gnu.org/readline']

sanity_check_paths = {
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.10.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ description = """The GNU Readline library provides a set of functions for use by

toolchain = {'name': 'ictce', 'version': '4.0.10'}

sources = ['readline-%s.tar.gz' % version]
sources = ['readline-%(version)s.tar.gz']
source_urls = ['http://ftpmirror.gnu.org/readline/']

dependencies = [('ncurses', '5.9')]
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.6.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ description = """The GNU Readline library provides a set of functions for use by

toolchain = {'name': 'ictce', 'version': '4.0.6'}

sources = ['readline-%s.tar.gz' % version]
sources = ['readline-%(version)s.tar.gz']
source_urls = ['http://ftpmirror.gnu.org/readline/']

dependencies = [('ncurses', '5.9')]
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.1.13.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ description = """The GNU Readline library provides a set of functions for use by

toolchain = {'name': 'ictce', 'version': '4.1.13'}

sources = ['readline-%s.tar.gz' % version]
sources = ['readline-%(version)s.tar.gz']
source_urls = ['http://ftpmirror.gnu.org/readline/']

dependencies = [('ncurses', '5.9')]
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.3.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by

toolchain = {'name': 'ictce', 'version': '5.3.0'}

sources = ['readline-%s.tar.gz' % version]
sources = ['readline-%(version)s.tar.gz']
source_urls = ['http://ftpmirror.gnu.org/readline/']

dependencies = [('ncurses', '5.9')]
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/l/libreadline/libreadline-6.2-iomkl-4.6.13.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ description = """The GNU Readline library provides a set of functions for use by

toolchain = {'name': 'iomkl', 'version': '4.6.13'}

sources = ['readline-%s.tar.gz' % version]
sources = ['readline-%(version)s.tar.gz']
source_urls = ['http://ftpmirror.gnu.org/readline/']

dependencies = [('ncurses', '5.9')]
Expand Down
6 changes: 3 additions & 3 deletions easybuild/easyconfigs/n/numpy/numpy-1.6.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ description = """NumPy is the fundamental package for scientific computing with

toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}

source_urls = [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % version, 'download')]
source_urls = [('http://sourceforge.net/projects/numpy/files/NumPy/%(version)s', 'download')]
sources = [SOURCE_TAR_GZ]

patches = ['numpy-1.6.2_distutils_multiple-lib-dirs.patch']
Expand All @@ -20,7 +20,7 @@ pyver = '2.7.3'
versionsuffix = '-%s-%s' % (python, pyver)

dependencies = [
(python, pyver),
]
(python, pyver),
]

moduleclass = 'math'
6 changes: 3 additions & 3 deletions easybuild/easyconfigs/n/numpy/numpy-1.6.2-goolf-1.4.10-Python-2.7.3.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ NumPy can also be used as an efficient multi-dimensional container of generic da
defined. This allows NumPy to seamlessly and speedily integrate with a wide variety of databases."""
toolchain = {'name': 'goolf', 'version': '1.4.10'}

source_urls = [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % version, 'download')]
source_urls = [('http://sourceforge.net/projects/numpy/files/NumPy/%(version)s', 'download')]
sources = [SOURCE_TAR_GZ]

patches = ['numpy-1.6.2_distutils_multiple-lib-dirs.patch']
Expand All @@ -19,7 +19,7 @@ pyver = '2.7.3'
versionsuffix = '-%s-%s' % (python, pyver)

dependencies = [
(python, pyver),
]
(python, pyver),
]

moduleclass = 'math'
6 changes: 3 additions & 3 deletions easybuild/easyconfigs/n/numpy/numpy-1.6.2-ictce-4.0.6-Python-2.7.3.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ description = """NumPy is the fundamental package for scientific computing with

toolchain = {'name': 'ictce', 'version': '4.0.6'}

source_urls = [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % version, 'download')]
source_urls = [('http://sourceforge.net/projects/numpy/files/NumPy/%(version)s', 'download')]
sources = [SOURCE_TAR_GZ]

patches = ['numpy-1.6.2_distutils_multiple-lib-dirs.patch']
Expand All @@ -20,7 +20,7 @@ pyver = '2.7.3'
versionsuffix = '-%s-%s' % (python, pyver)

dependencies = [
(python, pyver),
]
(python, pyver),
]

moduleclass = 'math'
6 changes: 3 additions & 3 deletions easybuild/easyconfigs/n/numpy/numpy-1.6.2-ictce-5.3.0-Python-2.7.3.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ description = """NumPy is the fundamental package for scientific computing with

toolchain = {'name': 'ictce', 'version': '5.3.0'}

source_urls = [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % version, 'download')]
source_urls = [('http://sourceforge.net/projects/numpy/files/NumPy/%(version)s', 'download')]
sources = [SOURCE_TAR_GZ]

patches = ['numpy-1.6.2_distutils_multiple-lib-dirs.patch']
Expand All @@ -21,7 +21,7 @@ pyver = '2.7.3'
versionsuffix = '-%s-%s' % (python, pyver)

dependencies = [
(python, pyver),
]
(python, pyver),
]

moduleclass = 'math'
65 changes: 33 additions & 32 deletions easybuild/easyconfigs/p/Python/Python-2.7.3-cgmpolf-1.1.6.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,43 +10,44 @@ toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
numpyversion = '1.6.1'
scipyversion = '0.10.1'

source_urls = ['http://www.python.org/ftp/%s/%s/' % (name.lower(), version)]
sources = ['%s-%s.tgz' % (name, version)]
source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
sources = ['%(name)s-%(version)s.tgz']

# python needs bzip2 to build the bz2 package
dependencies = [
('bzip2', '1.0.6'),
('zlib', '1.2.7'),
('libreadline', '6.2'),
('ncurses', '5.9-20130406'),
]
('bzip2', '1.0.6'),
('zlib', '1.2.7'),
('libreadline', '6.2'),
('ncurses', '5.9-20130406'),
]

# order is important!
exts_list = [
('setuptools', '0.6c11', {
'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'],
}),
('nose', '1.1.2', {
'source_urls': ['http://pypi.python.org/packages/source/n/nose/'],
}),
('numpy', numpyversion, {
'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion,
'download')],
'patches': ['numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion],
}),
('scipy', scipyversion, {
'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion,
'download')],
}),
('paycheck', '1.0.2', {
'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'],
}),
('argparse', '1.2.1', {
'source_urls': ['http://argparse.googlecode.com/files/'],
}),
('lockfile', '0.9.1', {
'source_urls': ['http://pylockfile.googlecode.com/files/'],
}),
]
('setuptools', '0.6c11', {
'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'],
}),
('nose', '1.1.2', {
'source_urls': ['http://pypi.python.org/packages/source/n/nose/'],
}),
('numpy', numpyversion, {
'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')],
'patches': ['numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion],
}),
('scipy', scipyversion, {
'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')],
}),
('paycheck', '1.0.2', {
'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'],
}),
('argparse', '1.2.1', {
'source_urls': ['http://argparse.googlecode.com/files/'],
}),
('lockfile', '0.9.1', {
'source_urls': ['http://pylockfile.googlecode.com/files/'],
}),
('Cython', '0.17.2', {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see this in the source above, but I see it in another easyconfig of Python (Python-2.7.3-ictce-4.1.13.eb); just be aware of it, it might be desired or not so. Ditto for the other Python easyconfigs; other than that I didn't see something else raising attention.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was there in certain Python easyconfigs, but not in others, I wanted to align things to make them include the same set of extensions.
Adding an extension is OK, imho (as opposed to removing one).

'source_urls': ['http://www.cython.org/release/'],
}),
]

moduleclass = 'lang'
65 changes: 33 additions & 32 deletions easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.1.12rc1.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,43 +10,44 @@ toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
numpyversion = '1.6.1'
scipyversion = '0.10.1'

source_urls = ['http://www.python.org/ftp/%s/%s/' % (name.lower(), version)]
sources = ['%s-%s.tgz' % (name, version)]
source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
sources = ['%(name)s-%(version)s.tgz']

# python needs bzip2 to build the bz2 package
dependencies = [
('bzip2', '1.0.6'),
('zlib', '1.2.7'),
('libreadline', '6.2'),
('ncurses', '5.9-20130406'),
]
('bzip2', '1.0.6'),
('zlib', '1.2.7'),
('libreadline', '6.2'),
('ncurses', '5.9-20130406'),
]

# order is important!
exts_list = [
('setuptools', '0.6c11', {
'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'],
}),
('nose', '1.1.2', {
'source_urls': ['http://pypi.python.org/packages/source/n/nose/'],
}),
('numpy', numpyversion, {
'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion,
'download')],
'patches': ['numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion],
}),
('scipy', scipyversion, {
'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion,
'download')],
}),
('paycheck', '1.0.2', {
'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'],
}),
('argparse', '1.2.1', {
'source_urls': ['http://argparse.googlecode.com/files/'],
}),
('lockfile', '0.9.1', {
'source_urls': ['http://pylockfile.googlecode.com/files/'],
}),
]
('setuptools', '0.6c11', {
'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'],
}),
('nose', '1.1.2', {
'source_urls': ['http://pypi.python.org/packages/source/n/nose/'],
}),
('numpy', numpyversion, {
'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')],
'patches': ['numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion],
}),
('scipy', scipyversion, {
'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')],
}),
('paycheck', '1.0.2', {
'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'],
}),
('argparse', '1.2.1', {
'source_urls': ['http://argparse.googlecode.com/files/'],
}),
('lockfile', '0.9.1', {
'source_urls': ['http://pylockfile.googlecode.com/files/'],
}),
('Cython', '0.17.2', {
'source_urls': ['http://www.cython.org/release/'],
}),
]

moduleclass = 'lang'
Loading