diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2022-07-30 15:19:18 -0700 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2022-07-31 13:29:20 -0700 |
| commit | f52f6e99dbf1131886a80112b8c79dfc414afb7c (patch) | |
| tree | 05cb7d64b2395922f2f24683da49f472075be12c /var/spack/repos/builtin.mock | |
| parent | 549ba1ed32372c67fc57271cde3797d58b7dec6e (diff) | |
| download | spack-f52f6e99dbf1131886a80112b8c79dfc414afb7c.tar.gz spack-f52f6e99dbf1131886a80112b8c79dfc414afb7c.tar.bz2 spack-f52f6e99dbf1131886a80112b8c79dfc414afb7c.tar.xz spack-f52f6e99dbf1131886a80112b8c79dfc414afb7c.zip | |
black: reformat entire repository with black
Diffstat (limited to 'var/spack/repos/builtin.mock')
256 files changed, 1811 insertions, 1528 deletions
diff --git a/var/spack/repos/builtin.mock/packages/a/package.py b/var/spack/repos/builtin.mock/packages/a/package.py index 4edee6b144..b556fbf06f 100644 --- a/var/spack/repos/builtin.mock/packages/a/package.py +++ b/var/spack/repos/builtin.mock/packages/a/package.py @@ -10,37 +10,32 @@ class A(AutotoolsPackage): """Simple package with one optional dependency""" homepage = "http://www.example.com" - url = "http://www.example.com/a-1.0.tar.gz" + url = "http://www.example.com/a-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') - version('2.0', 'abcdef0123456789abcdef0123456789') + version("1.0", "0123456789abcdef0123456789abcdef") + version("2.0", "abcdef0123456789abcdef0123456789") variant( - 'foo', description='', - values=any_combination_of('bar', 'baz', 'fee').with_default('bar'), + "foo", + description="", + values=any_combination_of("bar", "baz", "fee").with_default("bar"), ) - variant( - 'foobar', - values=('bar', 'baz', 'fee'), - default='bar', - description='', - multi=False - ) + variant("foobar", values=("bar", "baz", "fee"), default="bar", description="", multi=False) - variant('lorem_ipsum', description='', default=False) + variant("lorem_ipsum", description="", default=False) - variant('bvv', default=True, description='The good old BV variant') + variant("bvv", default=True, description="The good old BV variant") - depends_on('b', when='foobar=bar') - depends_on('test-dependency', type='test') + depends_on("b", when="foobar=bar") + depends_on("test-dependency", type="test") parallel = False def with_or_without_fee(self, activated): if not activated: - return '--no-fee' - return '--fee-all-the-time' + return "--no-fee" + return "--fee-all-the-time" def autoreconf(self, spec, prefix): pass diff --git a/var/spack/repos/builtin.mock/packages/archive-files/package.py b/var/spack/repos/builtin.mock/packages/archive-files/package.py index f168d25173..268ac41305 100644 --- a/var/spack/repos/builtin.mock/packages/archive-files/package.py +++ b/var/spack/repos/builtin.mock/packages/archive-files/package.py @@ -12,12 +12,12 @@ class ArchiveFiles(AutotoolsPackage): homepage = "http://www.example.com" url = "http://www.example.com/a-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') - version('2.0', 'abcdef0123456789abcdef0123456789') + version("1.0", "0123456789abcdef0123456789abcdef") + version("2.0", "abcdef0123456789abcdef0123456789") @property def archive_files(self): - return super(ArchiveFiles, self).archive_files + ['../../outside.log'] + return super(ArchiveFiles, self).archive_files + ["../../outside.log"] def autoreconf(self, spec, prefix): pass @@ -27,8 +27,8 @@ class ArchiveFiles(AutotoolsPackage): def build(self, spec, prefix): mkdirp(self.build_directory) - config_log = join_path(self.build_directory, 'config.log') + config_log = join_path(self.build_directory, "config.log") touch(config_log) def install(self, spec, prefix): - touch(join_path(prefix, 'deleteme')) + touch(join_path(prefix, "deleteme")) diff --git a/var/spack/repos/builtin.mock/packages/attributes-foo-app/package.py b/var/spack/repos/builtin.mock/packages/attributes-foo-app/package.py index b4f9ef14ca..a92f36bb3c 100644 --- a/var/spack/repos/builtin.mock/packages/attributes-foo-app/package.py +++ b/var/spack/repos/builtin.mock/packages/attributes-foo-app/package.py @@ -7,6 +7,6 @@ from spack.package import * class AttributesFooApp(BundlePackage): - version('1.0') - depends_on('bar') - depends_on('baz') + version("1.0") + depends_on("bar") + depends_on("baz") diff --git a/var/spack/repos/builtin.mock/packages/attributes-foo/package.py b/var/spack/repos/builtin.mock/packages/attributes-foo/package.py index bf68c96a53..f4bb9059a4 100644 --- a/var/spack/repos/builtin.mock/packages/attributes-foo/package.py +++ b/var/spack/repos/builtin.mock/packages/attributes-foo/package.py @@ -7,51 +7,51 @@ from spack.package import * class AttributesFoo(BundlePackage): - phases = ['install'] - version('1.0') + phases = ["install"] + version("1.0") - provides('bar') - provides('baz') + provides("bar") + provides("baz") def install(self, spec, prefix): - if 'platform=windows' in spec: - lib_suffix = '.lib' - elif 'platform=darwin' in spec: - lib_suffix = '.dylib' + if "platform=windows" in spec: + lib_suffix = ".lib" + elif "platform=darwin" in spec: + lib_suffix = ".dylib" else: - lib_suffix = '.so' + lib_suffix = ".so" mkdirp(prefix.include) - touch(prefix.include.join('foo.h')) + touch(prefix.include.join("foo.h")) mkdirp(prefix.include.bar) - touch(prefix.include.bar.join('bar.h')) + touch(prefix.include.bar.join("bar.h")) mkdirp(prefix.lib64) - touch(prefix.lib64.join('libFoo' + lib_suffix)) - touch(prefix.lib64.join('libFooBar' + lib_suffix)) + touch(prefix.lib64.join("libFoo" + lib_suffix)) + touch(prefix.lib64.join("libFooBar" + lib_suffix)) mkdirp(prefix.baz.include.baz) - touch(prefix.baz.include.baz.join('baz.h')) + touch(prefix.baz.include.baz.join("baz.h")) mkdirp(prefix.baz.lib) - touch(prefix.baz.lib.join('libFooBaz' + lib_suffix)) + touch(prefix.baz.lib.join("libFooBaz" + lib_suffix)) # Headers provided by Foo @property def headers(self): - return find_headers('foo', root=self.home.include, recursive=False) + return find_headers("foo", root=self.home.include, recursive=False) # Libraries provided by Foo @property def libs(self): - return find_libraries('libFoo', root=self.home, recursive=True) + return find_libraries("libFoo", root=self.home, recursive=True) # Header provided by the bar virutal package @property def bar_headers(self): - return find_headers('bar/bar', root=self.home.include, recursive=False) + return find_headers("bar/bar", root=self.home.include, recursive=False) # Libary provided by the bar virtual package @property def bar_libs(self): - return find_libraries('libFooBar', root=self.home, recursive=True) + return find_libraries("libFooBar", root=self.home, recursive=True) # The baz virtual package home @property @@ -61,9 +61,9 @@ class AttributesFoo(BundlePackage): # Header provided by the baz virtual package @property def baz_headers(self): - return find_headers('baz/baz', root=self.baz_home.include, recursive=False) + return find_headers("baz/baz", root=self.baz_home.include, recursive=False) # Library provided by the baz virtual package @property def baz_libs(self): - return find_libraries('libFooBaz', root=self.baz_home, recursive=True) + return find_libraries("libFooBaz", root=self.baz_home, recursive=True) diff --git a/var/spack/repos/builtin.mock/packages/autotools-conditional-variants-test/package.py b/var/spack/repos/builtin.mock/packages/autotools-conditional-variants-test/package.py index ca046c548a..47111cdddd 100644 --- a/var/spack/repos/builtin.mock/packages/autotools-conditional-variants-test/package.py +++ b/var/spack/repos/builtin.mock/packages/autotools-conditional-variants-test/package.py @@ -10,5 +10,5 @@ from spack.package import * class AutotoolsConditionalVariantsTest(AutotoolsPackage): homepage = "https://www.example.com" has_code = False - version('1.0') - variant('example', default=True, description='nope', when='@2.0:') + version("1.0") + variant("example", default=True, description="nope", when="@2.0:") diff --git a/var/spack/repos/builtin.mock/packages/autotools-config-replacement/package.py b/var/spack/repos/builtin.mock/packages/autotools-config-replacement/package.py index a869a359db..a86ed9cc09 100644 --- a/var/spack/repos/builtin.mock/packages/autotools-config-replacement/package.py +++ b/var/spack/repos/builtin.mock/packages/autotools-config-replacement/package.py @@ -17,15 +17,15 @@ class AutotoolsConfigReplacement(AutotoolsPackage): has_code = False - version('1.0.0') - variant('patch_config_files', default=False) - variant('gnuconfig', default=False) + version("1.0.0") + variant("patch_config_files", default=False) + variant("gnuconfig", default=False) - depends_on('gnuconfig', type='build', when='+gnuconfig') + depends_on("gnuconfig", type="build", when="+gnuconfig") @property def patch_config_files(self): - return self.spec.satisfies('+patch_config_files') + return self.spec.satisfies("+patch_config_files") def autoreconf(self, spec, prefix): pass @@ -37,12 +37,12 @@ class AutotoolsConfigReplacement(AutotoolsPackage): pass def install(self, spec, prefix): - broken = os.path.join(self.stage.source_path, 'broken') - working = os.path.join(self.stage.source_path, 'working') + broken = os.path.join(self.stage.source_path, "broken") + working = os.path.join(self.stage.source_path, "working") install_tree(broken, self.prefix.broken) install_tree(working, self.prefix.working) - @run_before('autoreconf') + @run_before("autoreconf") def create_the_package_sources(self): # Creates the following file structure: # ./broken/config.sub -- not executable @@ -52,37 +52,37 @@ class AutotoolsConfigReplacement(AutotoolsPackage): # Automatic config helper script substitution should replace the two # broken scripts with those from the gnuconfig package. - broken = os.path.join(self.stage.source_path, 'broken') - working = os.path.join(self.stage.source_path, 'working') + broken = os.path.join(self.stage.source_path, "broken") + working = os.path.join(self.stage.source_path, "working") mkdirp(broken) mkdirp(working) # a configure script is required - configure_script = join_path(self.stage.source_path, 'configure') - with open(configure_script, 'w') as f: + configure_script = join_path(self.stage.source_path, "configure") + with open(configure_script, "w") as f: f.write("#!/bin/sh\nexit 0") os.chmod(configure_script, 0o775) # broken config.sub (not executable) - broken_config_sub = join_path(broken, 'config.sub') - with open(broken_config_sub, 'w') as f: + broken_config_sub = join_path(broken, "config.sub") + with open(broken_config_sub, "w") as f: f.write("#!/bin/sh\nexit 0") # broken config.guess (exectuable but with error return code) - broken_config_guess = join_path(broken, 'config.guess') - with open(broken_config_guess, 'w') as f: + broken_config_guess = join_path(broken, "config.guess") + with open(broken_config_guess, "w") as f: f.write("#!/bin/sh\nexit 1") os.chmod(broken_config_guess, 0o775) # working config.sub - working_config_sub = join_path(working, 'config.sub') - with open(working_config_sub, 'w') as f: + working_config_sub = join_path(working, "config.sub") + with open(working_config_sub, "w") as f: f.write("#!/bin/sh\nexit 0") os.chmod(working_config_sub, 0o775) # working config.guess - working_config_guess = join_path(working, 'config.guess') - with open(working_config_guess, 'w') as f: + working_config_guess = join_path(working, "config.guess") + with open(working_config_guess, "w") as f: f.write("#!/bin/sh\nexit 0") os.chmod(working_config_guess, 0o775) diff --git a/var/spack/repos/builtin.mock/packages/b/package.py b/var/spack/repos/builtin.mock/packages/b/package.py index ed328f9268..23bd52e275 100644 --- a/var/spack/repos/builtin.mock/packages/b/package.py +++ b/var/spack/repos/builtin.mock/packages/b/package.py @@ -10,9 +10,9 @@ class B(Package): """Simple package with no dependencies""" homepage = "http://www.example.com" - url = "http://www.example.com/b-1.0.tar.gz" + url = "http://www.example.com/b-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') - version('0.9', 'abcd456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") + version("0.9", "abcd456789abcdef0123456789abcdef") - depends_on('test-dependency', type='test') + depends_on("test-dependency", type="test") diff --git a/var/spack/repos/builtin.mock/packages/boost/package.py b/var/spack/repos/builtin.mock/packages/boost/package.py index 476456a57a..06cca04b9e 100644 --- a/var/spack/repos/builtin.mock/packages/boost/package.py +++ b/var/spack/repos/builtin.mock/packages/boost/package.py @@ -10,52 +10,56 @@ class Boost(Package): """Fake boost package.""" homepage = "http://www.boost.org" - url = "http://downloads.sourceforge.net/project/boost/boost/1.63.0/boost_1_63_0.tar.bz2" - - version('1.63.0', '1c837ecd990bb022d07e7aab32b09847') - - default_install_libs = set(['atomic', - 'chrono', - 'date_time', - 'filesystem', - 'graph', - 'iostreams', - 'locale', - 'log', - 'math', - 'program_options', - 'random', - 'regex', - 'serialization', - 'signals', - 'system', - 'test', - 'thread', - 'timer', - 'wave']) + url = "http://downloads.sourceforge.net/project/boost/boost/1.63.0/boost_1_63_0.tar.bz2" + + version("1.63.0", "1c837ecd990bb022d07e7aab32b09847") + + default_install_libs = set( + [ + "atomic", + "chrono", + "date_time", + "filesystem", + "graph", + "iostreams", + "locale", + "log", + "math", + "program_options", + "random", + "regex", + "serialization", + "signals", + "system", + "test", + "thread", + "timer", + "wave", + ] + ) # mpi/python are not installed by default because they pull in many # dependencies and/or because there is a great deal of customization # possible (and it would be difficult to choose sensible defaults) - default_noinstall_libs = set(['mpi', 'python']) + default_noinstall_libs = set(["mpi", "python"]) all_libs = default_install_libs | default_noinstall_libs for lib in all_libs: - variant(lib, default=(lib not in default_noinstall_libs), - description="Compile with {0} library".format(lib)) - - variant('debug', default=False, - description='Switch to the debug version of Boost') - variant('shared', default=True, - description="Additionally build shared libraries") - variant('multithreaded', default=True, - description="Build multi-threaded versions of libraries") - variant('singlethreaded', default=False, - description="Build single-threaded versions of libraries") - variant('icu', default=False, - description="Build with Unicode and ICU suport") - variant('graph', default=False, - description="Build the Boost Graph library") - variant('taggedlayout', default=False, - description="Augment library names with build options") + variant( + lib, + default=(lib not in default_noinstall_libs), + description="Compile with {0} library".format(lib), + ) + + variant("debug", default=False, description="Switch to the debug version of Boost") + variant("shared", default=True, description="Additionally build shared libraries") + variant( + "multithreaded", default=True, description="Build multi-threaded versions of libraries" + ) + variant( + "singlethreaded", default=False, description="Build single-threaded versions of libraries" + ) + variant("icu", default=False, description="Build with Unicode and ICU suport") + variant("graph", default=False, description="Build the Boost Graph library") + variant("taggedlayout", default=False, description="Augment library names with build options") diff --git a/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-a/package.py b/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-a/package.py index 9dded76188..bea121f6b9 100644 --- a/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-a/package.py +++ b/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-a/package.py @@ -8,17 +8,17 @@ from spack.package import * class BothLinkAndBuildDepA(Package): """ - Structure where c occurs as a build dep down the line and as a direct - link dep. Useful for testing situations where you copy the parent spec - just with link deps, and you want to make sure b is not part of that. - a <--build-- b <-link-- c - a <--link--- c + Structure where c occurs as a build dep down the line and as a direct + link dep. Useful for testing situations where you copy the parent spec + just with link deps, and you want to make sure b is not part of that. + a <--build-- b <-link-- c + a <--link--- c """ homepage = "http://www.example.com" - url = "http://www.example.com/1.0.tar.gz" + url = "http://www.example.com/1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") - depends_on('both-link-and-build-dep-b', type='build') - depends_on('both-link-and-build-dep-c', type='link') + depends_on("both-link-and-build-dep-b", type="build") + depends_on("both-link-and-build-dep-c", type="link") diff --git a/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-b/package.py b/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-b/package.py index f4812e7fc6..43e1305634 100644 --- a/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-b/package.py +++ b/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-b/package.py @@ -8,16 +8,16 @@ from spack.package import * class BothLinkAndBuildDepB(Package): """ - Structure where c occurs as a build dep down the line and as a direct - link dep. Useful for testing situations where you copy the parent spec - just with link deps, and you want to make sure b is not part of that. - a <--build-- b <-link-- c - a <--link--- c + Structure where c occurs as a build dep down the line and as a direct + link dep. Useful for testing situations where you copy the parent spec + just with link deps, and you want to make sure b is not part of that. + a <--build-- b <-link-- c + a <--link--- c """ homepage = "http://www.example.com" - url = "http://www.example.com/1.0.tar.gz" + url = "http://www.example.com/1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") - depends_on('both-link-and-build-dep-c', type='link') + depends_on("both-link-and-build-dep-c", type="link") diff --git a/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-c/package.py b/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-c/package.py index 70a9ce1158..49eda45237 100644 --- a/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-c/package.py +++ b/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-c/package.py @@ -8,14 +8,14 @@ from spack.package import * class BothLinkAndBuildDepC(Package): """ - Structure where c occurs as a build dep down the line and as a direct - link dep. Useful for testing situations where you copy the parent spec - just with link deps, and you want to make sure b is not part of that. - a <--build-- b <-link-- c - a <--link--- c + Structure where c occurs as a build dep down the line and as a direct + link dep. Useful for testing situations where you copy the parent spec + just with link deps, and you want to make sure b is not part of that. + a <--build-- b <-link-- c + a <--link--- c """ homepage = "http://www.example.com" - url = "http://www.example.com/1.0.tar.gz" + url = "http://www.example.com/1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") diff --git a/var/spack/repos/builtin.mock/packages/bowtie/package.py b/var/spack/repos/builtin.mock/packages/bowtie/package.py index 273619d6cc..24d7312b74 100644 --- a/var/spack/repos/builtin.mock/packages/bowtie/package.py +++ b/var/spack/repos/builtin.mock/packages/bowtie/package.py @@ -11,8 +11,8 @@ class Bowtie(Package): homepage = "http://www.example.org" url = "http://bowtie-1.2.2.tar.bz2" - version('1.3.0', '1c837ecd990bb022d07e7aab32b09847') - version('1.2.2', '1c837ecd990bb022d07e7aab32b09847') - version('1.2.0', '1c837ecd990bb022d07e7aab32b09847') + version("1.3.0", "1c837ecd990bb022d07e7aab32b09847") + version("1.2.2", "1c837ecd990bb022d07e7aab32b09847") + version("1.2.0", "1c837ecd990bb022d07e7aab32b09847") - conflicts('%gcc@:4.5.0', when='@1.2.2') + conflicts("%gcc@:4.5.0", when="@1.2.2") diff --git a/var/spack/repos/builtin.mock/packages/brillig/package.py b/var/spack/repos/builtin.mock/packages/brillig/package.py index cc3d5c94d1..235bca3d43 100644 --- a/var/spack/repos/builtin.mock/packages/brillig/package.py +++ b/var/spack/repos/builtin.mock/packages/brillig/package.py @@ -8,10 +8,10 @@ from spack.package import * class Brillig(Package): - """ Mock package to test the spack versions command.""" + """Mock package to test the spack versions command.""" homepage = "https://www.example.com" - url = "https://github.com/vvolkl/brillig/archive/v2.0.0.tar.gz" + url = "https://github.com/vvolkl/brillig/archive/v2.0.0.tar.gz" - version('2.0.0', sha256='d4bb8f1737d5a7c0321e1675cceccb59dbcb66a94f3a9dd66a37f58bc6df7f15') - version('1.0.0', sha256='fcef53f45e82b881af9a6f0530b2732cdaf8c5c60e49b27671594ea658bfe315') + version("2.0.0", sha256="d4bb8f1737d5a7c0321e1675cceccb59dbcb66a94f3a9dd66a37f58bc6df7f15") + version("1.0.0", sha256="fcef53f45e82b881af9a6f0530b2732cdaf8c5c60e49b27671594ea658bfe315") diff --git a/var/spack/repos/builtin.mock/packages/build-error/package.py b/var/spack/repos/builtin.mock/packages/build-error/package.py index 7473d11b8d..bb0107987e 100644 --- a/var/spack/repos/builtin.mock/packages/build-error/package.py +++ b/var/spack/repos/builtin.mock/packages/build-error/package.py @@ -10,13 +10,14 @@ class BuildError(Package): """This package has an install method that fails in a build script.""" homepage = "http://www.example.com/trivial_install" - url = "http://www.unit-test-should-replace-this-url/trivial_install-1.0.tar.gz" + url = "http://www.unit-test-should-replace-this-url/trivial_install-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") def install(self, spec, prefix): - with open('configure', 'w') as f: - f.write("""#!/bin/sh\n + with open("configure", "w") as f: + f.write( + """#!/bin/sh\n echo 'checking build system type... x86_64-apple-darwin16.6.0' echo 'checking host system type... x86_64-apple-darwin16.6.0' echo 'checking for gcc... /Users/gamblin2/src/spack/lib/spack/env/clang/clang' @@ -26,5 +27,6 @@ echo 'checking for suffix of executables...' echo 'configure: error: in /path/to/some/file:' echo 'configure: error: cannot run C compiled programs.' exit 1 -""") +""" + ) configure() diff --git a/var/spack/repos/builtin.mock/packages/build-warnings/package.py b/var/spack/repos/builtin.mock/packages/build-warnings/package.py index 2dbeec5f0a..f2e49574cd 100644 --- a/var/spack/repos/builtin.mock/packages/build-warnings/package.py +++ b/var/spack/repos/builtin.mock/packages/build-warnings/package.py @@ -10,13 +10,14 @@ class BuildWarnings(Package): """This package's install fails but only emits warnings.""" homepage = "http://www.example.com/trivial_install" - url = "http://www.unit-test-should-replace-this-url/trivial_install-1.0.tar.gz" + url = "http://www.unit-test-should-replace-this-url/trivial_install-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") def install(self, spec, prefix): - with open('configure', 'w') as f: - f.write("""#!/bin/sh\n + with open("configure", "w") as f: + f.write( + """#!/bin/sh\n echo 'checking for gcc... /Users/gamblin2/src/spack/lib/spack/env/clang/clang' echo 'checking whether the C compiler works... yes' echo 'checking for C compiler default output file name... a.out' @@ -24,5 +25,6 @@ echo 'WARNING: ALL CAPITAL WARNING!' echo 'checking for suffix of executables...' echo 'foo.c:89: warning: some weird warning!' exit 1 -""") +""" + ) configure() diff --git a/var/spack/repos/builtin.mock/packages/c/package.py b/var/spack/repos/builtin.mock/packages/c/package.py index c94378f404..f57105f2ad 100644 --- a/var/spack/repos/builtin.mock/packages/c/package.py +++ b/var/spack/repos/builtin.mock/packages/c/package.py @@ -10,6 +10,6 @@ class C(Package): """Simple package with no dependencies""" homepage = "http://www.example.com" - url = "http://www.example.com/c-1.0.tar.gz" + url = "http://www.example.com/c-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") diff --git a/var/spack/repos/builtin.mock/packages/callpath/package.py b/var/spack/repos/builtin.mock/packages/callpath/package.py index 95056ccce3..2b226444a0 100644 --- a/var/spack/repos/builtin.mock/packages/callpath/package.py +++ b/var/spack/repos/builtin.mock/packages/callpath/package.py @@ -8,11 +8,11 @@ from spack.package import * class Callpath(Package): homepage = "https://github.com/tgamblin/callpath" - url = "http://github.com/tgamblin/callpath-1.0.tar.gz" + url = "http://github.com/tgamblin/callpath-1.0.tar.gz" - version(0.8, '0123456789abcdef0123456789abcdef') - version(0.9, '0123456789abcdef0123456789abcdef') - version(1.0, '0123456789abcdef0123456789abcdef') + version(0.8, "0123456789abcdef0123456789abcdef") + version(0.9, "0123456789abcdef0123456789abcdef") + version(1.0, "0123456789abcdef0123456789abcdef") depends_on("dyninst") depends_on("mpi") @@ -23,4 +23,4 @@ class Callpath(Package): make("install") def setup_run_environment(self, env): - env.set('FOOBAR', self.name) + env.set("FOOBAR", self.name) diff --git a/var/spack/repos/builtin.mock/packages/canfail/package.py b/var/spack/repos/builtin.mock/packages/canfail/package.py index 0fd79aa230..eb35fdec56 100644 --- a/var/spack/repos/builtin.mock/packages/canfail/package.py +++ b/var/spack/repos/builtin.mock/packages/canfail/package.py @@ -10,13 +10,13 @@ class Canfail(Package): """Package which fails install unless a special attribute is set""" homepage = "http://www.example.com" - url = "http://www.example.com/a-1.0.tar.gz" + url = "http://www.example.com/a-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") succeed = False def install(self, spec, prefix): if not self.succeed: raise InstallError("'succeed' was false") - touch(join_path(prefix, 'an_installation_file')) + touch(join_path(prefix, "an_installation_file")) diff --git a/var/spack/repos/builtin.mock/packages/cmake-client/package.py b/var/spack/repos/builtin.mock/packages/cmake-client/package.py index e0e45be508..54842fd2d8 100644 --- a/var/spack/repos/builtin.mock/packages/cmake-client/package.py +++ b/var/spack/repos/builtin.mock/packages/cmake-client/package.py @@ -16,18 +16,19 @@ def check(condition, msg): class CmakeClient(CMakePackage): """A dumy package that uses cmake.""" - homepage = 'https://www.example.com' - url = 'https://www.example.com/cmake-client-1.0.tar.gz' - version('1.0', '4cb3ff35b2472aae70f542116d616e63') + homepage = "https://www.example.com" + url = "https://www.example.com/cmake-client-1.0.tar.gz" + + version("1.0", "4cb3ff35b2472aae70f542116d616e63") variant( - 'multi', description='', - values=any_combination_of('up', 'right', 'back').with_default('up') + "multi", + description="", + values=any_combination_of("up", "right", "back").with_default("up"), ) - variant('single', description='', default='blue', - values=('blue', 'red', 'green'), multi=False) - variant('truthy', description='', default=True) + variant("single", description="", default="blue", values=("blue", "red", "green"), multi=False) + variant("truthy", description="", default=True) callback_counter = 0 @@ -36,47 +37,56 @@ class CmakeClient(CMakePackage): check_this_is_none = None did_something = False - @run_after('cmake') - @run_before('cmake', 'build', 'install') + @run_after("cmake") + @run_before("cmake", "build", "install") def increment(self): self.callback_counter += 1 - @run_after('cmake') + @run_after("cmake") @on_package_attributes(run_this=True, check_this_is_none=None) def flip(self): self.flipped = True - @run_after('cmake') + @run_after("cmake") @on_package_attributes(does_not_exist=None) def do_not_execute(self): self.did_something = True def setup_build_environment(self, spack_env): - spack_cc # Ensure spack module-scope variable is avaiabl - check(from_cmake == "from_cmake", - "setup_build_environment couldn't read global set by cmake.") + spack_cc # Ensure spack module-scope variable is avaiabl + check( + from_cmake == "from_cmake", + "setup_build_environment couldn't read global set by cmake.", + ) - check(self.spec['cmake'].link_arg == "test link arg", - "link arg on dependency spec not readable from " - "setup_build_environment.") + check( + self.spec["cmake"].link_arg == "test link arg", + "link arg on dependency spec not readable from " "setup_build_environment.", + ) def setup_dependent_build_environment(self, env, dependent_spec): - spack_cc # Ensure spack module-scope variable is avaiable - check(from_cmake == "from_cmake", - "setup_dependent_build_environment couldn't read global set by cmake.") + spack_cc # Ensure spack module-scope variable is avaiable + check( + from_cmake == "from_cmake", + "setup_dependent_build_environment couldn't read global set by cmake.", + ) - check(self.spec['cmake'].link_arg == "test link arg", - "link arg on dependency spec not readable from " - "setup_dependent_build_environment.") + check( + self.spec["cmake"].link_arg == "test link arg", + "link arg on dependency spec not readable from " "setup_dependent_build_environment.", + ) def setup_dependent_package(self, module, dspec): - spack_cc # Ensure spack module-scope variable is avaiable - check(from_cmake == "from_cmake", - "setup_dependent_package couldn't read global set by cmake.") + spack_cc # Ensure spack module-scope variable is avaiable + check( + from_cmake == "from_cmake", + "setup_dependent_package couldn't read global set by cmake.", + ) - check(self.spec['cmake'].link_arg == "test link arg", - "link arg on dependency spec not readable from " - "setup_dependent_package.") + check( + self.spec["cmake"].link_arg == "test link arg", + "link arg on dependency spec not readable from " "setup_dependent_package.", + ) def cmake(self, spec, prefix): assert self.callback_counter == 1 @@ -93,17 +103,20 @@ class CmakeClient(CMakePackage): check(cmake is not None, "No cmake was in environment!") # check that which('cmake') returns the right one. - cmake = which('cmake') + cmake = which("cmake") print(cmake) print(cmake.exe) - check(cmake.exe[0].startswith(spec['cmake'].prefix.bin), - "Wrong cmake was in environment: %s" % cmake) + check( + cmake.exe[0].startswith(spec["cmake"].prefix.bin), + "Wrong cmake was in environment: %s" % cmake, + ) - check(from_cmake == "from_cmake", - "Couldn't read global set by cmake.") + check(from_cmake == "from_cmake", "Couldn't read global set by cmake.") - check(os.environ['from_cmake'] == 'from_cmake', - "Couldn't read env var set in envieonmnt by dependency") + check( + os.environ["from_cmake"] == "from_cmake", + "Couldn't read env var set in envieonmnt by dependency", + ) mkdirp(prefix.bin) - touch(join_path(prefix.bin, 'dummy')) + touch(join_path(prefix.bin, "dummy")) diff --git a/var/spack/repos/builtin.mock/packages/cmake-conditional-variants-test/package.py b/var/spack/repos/builtin.mock/packages/cmake-conditional-variants-test/package.py index 0ce1bac894..0f7f6ba62d 100644 --- a/var/spack/repos/builtin.mock/packages/cmake-conditional-variants-test/package.py +++ b/var/spack/repos/builtin.mock/packages/cmake-conditional-variants-test/package.py @@ -8,5 +8,5 @@ from spack.package import * class CmakeConditionalVariantsTest(CMakePackage): homepage = "https://dev.null" - version('1.0') - variant('example', default=True, description='nope', when='@2.0:') + version("1.0") + variant("example", default=True, description="nope", when="@2.0:") diff --git a/var/spack/repos/builtin.mock/packages/cmake/package.py b/var/spack/repos/builtin.mock/packages/cmake/package.py index 0aa8f59087..4fe890df1a 100644 --- a/var/spack/repos/builtin.mock/packages/cmake/package.py +++ b/var/spack/repos/builtin.mock/packages/cmake/package.py @@ -8,7 +8,7 @@ import sys from spack.package import * -is_windows = sys.platform == 'win32' +is_windows = sys.platform == "win32" def check(condition, msg): @@ -19,22 +19,26 @@ def check(condition, msg): class Cmake(Package): """A dumy package for the cmake build system.""" - homepage = 'https://www.cmake.org' - url = 'https://cmake.org/files/v3.4/cmake-3.4.3.tar.gz' - version('3.4.3', '4cb3ff35b2472aae70f542116d616e63', - url='https://cmake.org/files/v3.4/cmake-3.4.3.tar.gz') + homepage = "https://www.cmake.org" + url = "https://cmake.org/files/v3.4/cmake-3.4.3.tar.gz" + + version( + "3.4.3", + "4cb3ff35b2472aae70f542116d616e63", + url="https://cmake.org/files/v3.4/cmake-3.4.3.tar.gz", + ) def setup_build_environment(self, env): - spack_cc # Ensure spack module-scope variable is avaiable - env.set('for_install', 'for_install') + spack_cc # Ensure spack module-scope variable is avaiable + env.set("for_install", "for_install") def setup_dependent_build_environment(self, env, dependent_spec): - spack_cc # Ensure spack module-scope variable is avaiable - env.set('from_cmake', 'from_cmake') + spack_cc # Ensure spack module-scope variable is avaiable + env.set("from_cmake", "from_cmake") def setup_dependent_package(self, module, dspec): - spack_cc # Ensure spack module-scope variable is avaiable + spack_cc # Ensure spack module-scope variable is avaiable self.spec.from_cmake = "from_cmake" module.from_cmake = "from_cmake" @@ -44,9 +48,11 @@ class Cmake(Package): def install(self, spec, prefix): mkdirp(prefix.bin) - check(os.environ['for_install'] == 'for_install', - "Couldn't read env var set in compile envieonmnt") - cmake_exe_ext = ".exe" if is_windows else '' - cmake_exe = join_path(prefix.bin, 'cmake{}'.format(cmake_exe_ext)) + check( + os.environ["for_install"] == "for_install", + "Couldn't read env var set in compile envieonmnt", + ) + cmake_exe_ext = ".exe" if is_windows else "" + cmake_exe = join_path(prefix.bin, "cmake{}".format(cmake_exe_ext)) touch(cmake_exe) set_executable(cmake_exe) diff --git a/var/spack/repos/builtin.mock/packages/conditional-constrained-dependencies/package.py b/var/spack/repos/builtin.mock/packages/conditional-constrained-dependencies/package.py index 6b9d87a360..f0cc95e3ec 100644 --- a/var/spack/repos/builtin.mock/packages/conditional-constrained-dependencies/package.py +++ b/var/spack/repos/builtin.mock/packages/conditional-constrained-dependencies/package.py @@ -9,11 +9,12 @@ class ConditionalConstrainedDependencies(Package): """Package that has a variant which adds a dependency forced to use non default values. """ + homepage = "https://dev.null" - version('1.0') + version("1.0") # This variant is on by default and attaches a dependency # with a lot of variants set at their non-default values - variant('dep', default=True, description='nope') - depends_on('dep-with-variants+foo+bar+baz', when='+dep') + variant("dep", default=True, description="nope") + depends_on("dep-with-variants+foo+bar+baz", when="+dep") diff --git a/var/spack/repos/builtin.mock/packages/conditional-provider/package.py b/var/spack/repos/builtin.mock/packages/conditional-provider/package.py index 643944a6f7..f2cc7f12c7 100644 --- a/var/spack/repos/builtin.mock/packages/conditional-provider/package.py +++ b/var/spack/repos/builtin.mock/packages/conditional-provider/package.py @@ -9,13 +9,14 @@ class ConditionalProvider(Package): """Mimic the real netlib-lapack, that may be built on top of an optimized blas. """ + homepage = "https://dev.null" - version('1.0') + version("1.0") - variant('disable-v1', default=False, description='nope') + variant("disable-v1", default=False, description="nope") - provides('v2') - provides('v1', when='~disable-v1') + provides("v2") + provides("v1", when="~disable-v1") - depends_on('v1', when='+disable-v1') + depends_on("v1", when="+disable-v1") diff --git a/var/spack/repos/builtin.mock/packages/conditional-values-in-variant/package.py b/var/spack/repos/builtin.mock/packages/conditional-values-in-variant/package.py index ffb4a837b5..788141565d 100644 --- a/var/spack/repos/builtin.mock/packages/conditional-values-in-variant/package.py +++ b/var/spack/repos/builtin.mock/packages/conditional-values-in-variant/package.py @@ -7,31 +7,34 @@ from spack.package import * class ConditionalValuesInVariant(Package): """Package with conditional possible values in a variant""" + homepage = "https://dev.null" - version('1.73.0') - version('1.72.0') - version('1.62.0') - version('1.60.0') - version('1.50.0') + version("1.73.0") + version("1.72.0") + version("1.62.0") + version("1.60.0") + version("1.50.0") variant( - 'cxxstd', default='98', + "cxxstd", + default="98", values=( - '98', '11', '14', + "98", + "11", + "14", # C++17 is not supported by Boost < 1.63.0. - conditional('17', when='@1.63.0:'), + conditional("17", when="@1.63.0:"), # C++20/2a is not support by Boost < 1.73.0 - conditional('2a', when='@1.73.0:') + conditional("2a", when="@1.73.0:"), ), multi=False, - description='Use the specified C++ standard when building.', - when='@1.60.0:' + description="Use the specified C++ standard when building.", + when="@1.60.0:", ) variant( - 'staging', values=any_combination_of( - conditional('flexpath', 'dataspaces', when='@1.73.0:') - ), - description='Enable dataspaces and/or flexpath staging transports' + "staging", + values=any_combination_of(conditional("flexpath", "dataspaces", when="@1.73.0:")), + description="Enable dataspaces and/or flexpath staging transports", ) diff --git a/var/spack/repos/builtin.mock/packages/conditional-variant-pkg/package.py b/var/spack/repos/builtin.mock/packages/conditional-variant-pkg/package.py index 87da713d30..0d5e67e45e 100644 --- a/var/spack/repos/builtin.mock/packages/conditional-variant-pkg/package.py +++ b/var/spack/repos/builtin.mock/packages/conditional-variant-pkg/package.py @@ -8,20 +8,29 @@ from spack.package import * class ConditionalVariantPkg(Package): """This package is used to test conditional variants.""" - homepage = "http://www.example.com/conditional-variant-pkg" - url = "http://www.unit-test-should-replace-this-url/conditional-variant-1.0.tar.gz" - - version('1.0', '0123456789abcdef0123456789abcdef') - version('2.0', 'abcdef0123456789abcdef0123456789') - - variant('version_based', default=True, when='@2.0:', - description="Check that version constraints work") - variant('variant_based', default=False, when='+version_based', - description="Check that variants can depend on variants") - - variant('two_whens', default=False, when='@1.0') - variant('two_whens', default=False, when='+variant_based') + homepage = "http://www.example.com/conditional-variant-pkg" + url = "http://www.unit-test-should-replace-this-url/conditional-variant-1.0.tar.gz" + + version("1.0", "0123456789abcdef0123456789abcdef") + version("2.0", "abcdef0123456789abcdef0123456789") + + variant( + "version_based", + default=True, + when="@2.0:", + description="Check that version constraints work", + ) + + variant( + "variant_based", + default=False, + when="+version_based", + description="Check that variants can depend on variants", + ) + + variant("two_whens", default=False, when="@1.0") + variant("two_whens", default=False, when="+variant_based") def install(self, spec, prefix): assert False diff --git a/var/spack/repos/builtin.mock/packages/conditional-virtual-dependency/package.py b/var/spack/repos/builtin.mock/packages/conditional-virtual-dependency/package.py index 65d13ba634..9d13b968ef 100644 --- a/var/spack/repos/builtin.mock/packages/conditional-virtual-dependency/package.py +++ b/var/spack/repos/builtin.mock/packages/conditional-virtual-dependency/package.py @@ -7,12 +7,13 @@ from spack.package import * class ConditionalVirtualDependency(Package): """Brings in a virtual dependency if certain conditions are met.""" + homepage = "https://dev.null" - version('1.0') + version("1.0") - variant('stuff', default=True, description='nope') - variant('mpi', default=False, description='nope') + variant("stuff", default=True, description="nope") + variant("mpi", default=False, description="nope") - depends_on('stuff', when='+stuff') - depends_on('mpi', when='+mpi') + depends_on("stuff", when="+stuff") + depends_on("mpi", when="+mpi") diff --git a/var/spack/repos/builtin.mock/packages/conditionally-patch-dependency/package.py b/var/spack/repos/builtin.mock/packages/conditionally-patch-dependency/package.py index fddb46d145..57758169d5 100644 --- a/var/spack/repos/builtin.mock/packages/conditionally-patch-dependency/package.py +++ b/var/spack/repos/builtin.mock/packages/conditionally-patch-dependency/package.py @@ -14,6 +14,6 @@ class ConditionallyPatchDependency(Package): homepage = "http://www.example.com" url = "http://www.example.com/patch-a-dependency-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') - variant('jasper', default=False) - depends_on('libelf@0.8.10', patches=[patch('uuid.patch')], when='+jasper') + version("1.0", "0123456789abcdef0123456789abcdef") + variant("jasper", default=False) + depends_on("libelf@0.8.10", patches=[patch("uuid.patch")], when="+jasper") diff --git a/var/spack/repos/builtin.mock/packages/configure-warning/package.py b/var/spack/repos/builtin.mock/packages/configure-warning/package.py index 6c2418fe99..4108b9bd07 100644 --- a/var/spack/repos/builtin.mock/packages/configure-warning/package.py +++ b/var/spack/repos/builtin.mock/packages/configure-warning/package.py @@ -8,12 +8,12 @@ from spack.package import * class ConfigureWarning(AutotoolsPackage): """This package prints output that looks like an error during configure, but - it actually installs successfully.""" + it actually installs successfully.""" homepage = "http://www.example.com" - url = "http://www.example.com/configure-warning-1.0.tar.gz" + url = "http://www.example.com/configure-warning-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") parallel = False @@ -21,7 +21,7 @@ class ConfigureWarning(AutotoolsPackage): pass def configure(self, spec, prefix): - print('foo: No such file or directory') + print("foo: No such file or directory") return 0 def build(self, spec, prefix): diff --git a/var/spack/repos/builtin.mock/packages/conflict-parent/package.py b/var/spack/repos/builtin.mock/packages/conflict-parent/package.py index be70a1dfb8..0430b69816 100644 --- a/var/spack/repos/builtin.mock/packages/conflict-parent/package.py +++ b/var/spack/repos/builtin.mock/packages/conflict-parent/package.py @@ -7,16 +7,16 @@ from spack.package import * class ConflictParent(Package): - homepage = 'https://github.com/tgamblin/callpath' - url = 'http://github.com/tgamblin/callpath-1.0.tar.gz' + homepage = "https://github.com/tgamblin/callpath" + url = "http://github.com/tgamblin/callpath-1.0.tar.gz" - version(0.8, '0123456789abcdef0123456789abcdef') - version(0.9, '0123456789abcdef0123456789abcdef') - version(1.0, '0123456789abcdef0123456789abcdef') + version(0.8, "0123456789abcdef0123456789abcdef") + version(0.9, "0123456789abcdef0123456789abcdef") + version(1.0, "0123456789abcdef0123456789abcdef") - depends_on('conflict') + depends_on("conflict") - conflicts('^conflict~foo', when='@0.9') + conflicts("^conflict~foo", when="@0.9") def install(self, spec, prefix): configure("--prefix=%s" % prefix) @@ -24,4 +24,4 @@ class ConflictParent(Package): make("install") def setup_run_environment(self, env): - env.set('FOOBAR', self.name) + env.set("FOOBAR", self.name) diff --git a/var/spack/repos/builtin.mock/packages/conflict/package.py b/var/spack/repos/builtin.mock/packages/conflict/package.py index 48981b9f65..96295c9ee6 100644 --- a/var/spack/repos/builtin.mock/packages/conflict/package.py +++ b/var/spack/repos/builtin.mock/packages/conflict/package.py @@ -7,16 +7,16 @@ from spack.package import * class Conflict(Package): - homepage = 'https://github.com/tgamblin/callpath' - url = 'http://github.com/tgamblin/callpath-1.0.tar.gz' + homepage = "https://github.com/tgamblin/callpath" + url = "http://github.com/tgamblin/callpath-1.0.tar.gz" - version(0.8, '0123456789abcdef0123456789abcdef') - version(0.9, '0123456789abcdef0123456789abcdef') - version(1.0, '0123456789abcdef0123456789abcdef') + version(0.8, "0123456789abcdef0123456789abcdef") + version(0.9, "0123456789abcdef0123456789abcdef") + version(1.0, "0123456789abcdef0123456789abcdef") - variant('foo', default=True, description='') + variant("foo", default=True, description="") - conflicts('%clang', when='+foo') + conflicts("%clang", when="+foo") def install(self, spec, prefix): configure("--prefix=%s" % prefix) @@ -24,4 +24,4 @@ class Conflict(Package): make("install") def setup_run_environment(self, env): - env.set('FOOBAR', self.name) + env.set("FOOBAR", self.name) diff --git a/var/spack/repos/builtin.mock/packages/conflicting-dependent/package.py b/var/spack/repos/builtin.mock/packages/conflicting-dependent/package.py index d11b599191..6a307ef5e3 100644 --- a/var/spack/repos/builtin.mock/packages/conflicting-dependent/package.py +++ b/var/spack/repos/builtin.mock/packages/conflicting-dependent/package.py @@ -8,12 +8,12 @@ from spack.package import * class ConflictingDependent(Package): """By itself this package does not have conflicts, but it is used to - ensure that if a user tries to build with an installed instance - of dependency-install@2 that there is a failure.""" + ensure that if a user tries to build with an installed instance + of dependency-install@2 that there is a failure.""" homepage = "http://www.example.com" - url = "http://www.example.com/a-1.0.tar.gz" + url = "http://www.example.com/a-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") - depends_on('dependency-install@:1.0') + depends_on("dependency-install@:1.0") diff --git a/var/spack/repos/builtin.mock/packages/corge/package.py b/var/spack/repos/builtin.mock/packages/corge/package.py index 5846ce3985..c2f4d5d8fd 100644 --- a/var/spack/repos/builtin.mock/packages/corge/package.py +++ b/var/spack/repos/builtin.mock/packages/corge/package.py @@ -15,12 +15,12 @@ class Corge(Package): homepage = "https://www.example.com" has_code = False - version('3.0.0') + version("3.0.0") - depends_on('quux') + depends_on("quux") def install(self, spec, prefix): - corge_cc = '''#include <iostream> + corge_cc = """#include <iostream> #include <stdexcept> #include "corge.h" #include "corge_version.h" @@ -56,8 +56,8 @@ Corge::corgegate() const return corge_version; } -''' - corge_h = '''#ifndef CORGE_H_ +""" + corge_h = """#ifndef CORGE_H_ class Corge { @@ -72,12 +72,12 @@ public: }; #endif // CORGE_H_ -''' - corge_version_h = ''' +""" + corge_version_h = """ const int corge_version_major = %s; const int corge_version_minor = %s; -''' - corgegator_cc = ''' +""" + corgegator_cc = """ #include <iostream> #include "corge.h" @@ -100,81 +100,120 @@ main(int argc, char* argv[]) std::cout << "done."<<std::endl; return 0; } -''' - mkdirp('%s/corge' % prefix.include) - mkdirp('%s/corge' % self.stage.source_path) - with open('%s/corge_version.h' % self.stage.source_path, 'w') as f: - f.write(corge_version_h % (self.version[0], self.version[1:])) - with open('%s/corge/corge.cc' % self.stage.source_path, 'w') as f: +""" + mkdirp("%s/corge" % prefix.include) + mkdirp("%s/corge" % self.stage.source_path) + with open("%s/corge_version.h" % self.stage.source_path, "w") as f: + f.write(corge_version_h % (self.version[0], self.version[1:])) + with open("%s/corge/corge.cc" % self.stage.source_path, "w") as f: f.write(corge_cc % prefix.config) - with open('%s/corge/corge.h' % self.stage.source_path, 'w') as f: + with open("%s/corge/corge.h" % self.stage.source_path, "w") as f: f.write(corge_h) - with open('%s/corge/corgegator.cc' % self.stage.source_path, 'w') as f: + with open("%s/corge/corgegator.cc" % self.stage.source_path, "w") as f: f.write(corgegator_cc) - gpp = which('/usr/bin/g++') - if sys.platform == 'darwin': - gpp = which('/usr/bin/clang++') - gpp('-Dcorge_EXPORTS', - '-I%s' % self.stage.source_path, - '-I%s' % spec['quux'].prefix.include, - '-I%s' % spec['garply'].prefix.include, - '-O2', '-g', '-DNDEBUG', '-fPIC', - '-o', 'corge.cc.o', - '-c', 'corge/corge.cc') - gpp('-Dcorge_EXPORTS', - '-I%s' % self.stage.source_path, - '-I%s' % spec['quux'].prefix.include, - '-I%s' % spec['garply'].prefix.include, - '-O2', '-g', '-DNDEBUG', '-fPIC', - '-o', 'corgegator.cc.o', - '-c', 'corge/corgegator.cc') - if sys.platform == 'darwin': - gpp('-fPIC', '-O2', '-g', '-DNDEBUG', '-dynamiclib', - '-install_name', '@rpath/libcorge.dylib', - '-o', 'libcorge.dylib', 'corge.cc.o', - '-Wl,-rpath,%s' % spec['quux'].prefix.lib64, - '-Wl,-rpath,%s' % spec['garply'].prefix.lib64, - '%s/libquux.dylib' % spec['quux'].prefix.lib64, - '%s/libgarply.dylib' % spec['garply'].prefix.lib64) - gpp('-O2', '-g', '-DNDEBUG', '-rdynamic', - 'corgegator.cc.o', '-o', 'corgegator', - '-Wl,-rpath,%s' % prefix.lib64, - '-Wl,-rpath,%s' % spec['quux'].prefix.lib64, - '-Wl,-rpath,%s' % spec['garply'].prefix.lib64, - 'libcorge.dylib', - '%s/libquux.dylib.3.0' % spec['quux'].prefix.lib64, - '%s/libgarply.dylib.3.0' % spec['garply'].prefix.lib64) + gpp = which("/usr/bin/g++") + if sys.platform == "darwin": + gpp = which("/usr/bin/clang++") + gpp( + "-Dcorge_EXPORTS", + "-I%s" % self.stage.source_path, + "-I%s" % spec["quux"].prefix.include, + "-I%s" % spec["garply"].prefix.include, + "-O2", + "-g", + "-DNDEBUG", + "-fPIC", + "-o", + "corge.cc.o", + "-c", + "corge/corge.cc", + ) + gpp( + "-Dcorge_EXPORTS", + "-I%s" % self.stage.source_path, + "-I%s" % spec["quux"].prefix.include, + "-I%s" % spec["garply"].prefix.include, + "-O2", + "-g", + "-DNDEBUG", + "-fPIC", + "-o", + "corgegator.cc.o", + "-c", + "corge/corgegator.cc", + ) + if sys.platform == "darwin": + gpp( + "-fPIC", + "-O2", + "-g", + "-DNDEBUG", + "-dynamiclib", + "-install_name", + "@rpath/libcorge.dylib", + "-o", + "libcorge.dylib", + "corge.cc.o", + "-Wl,-rpath,%s" % spec["quux"].prefix.lib64, + "-Wl,-rpath,%s" % spec["garply"].prefix.lib64, + "%s/libquux.dylib" % spec["quux"].prefix.lib64, + "%s/libgarply.dylib" % spec["garply"].prefix.lib64, + ) + gpp( + "-O2", + "-g", + "-DNDEBUG", + "-rdynamic", + "corgegator.cc.o", + "-o", + "corgegator", + "-Wl,-rpath,%s" % prefix.lib64, + "-Wl,-rpath,%s" % spec["quux"].prefix.lib64, + "-Wl,-rpath,%s" % spec["garply"].prefix.lib64, + "libcorge.dylib", + "%s/libquux.dylib.3.0" % spec["quux"].prefix.lib64, + "%s/libgarply.dylib.3.0" % spec["garply"].prefix.lib64, + ) mkdirp(prefix.lib64) - copy('libcorge.dylib', '%s/libcorge.dylib' % prefix.lib64) - os.link('%s/libcorge.dylib' % prefix.lib64, - '%s/libcorge.dylib.3.0' % prefix.lib64) + copy("libcorge.dylib", "%s/libcorge.dylib" % prefix.lib64) + os.link("%s/libcorge.dylib" % prefix.lib64, "%s/libcorge.dylib.3.0" % prefix.lib64) else: - gpp('-fPIC', '-O2', '-g', '-DNDEBUG', '-shared', - '-Wl,-soname,libcorge.so', '-o', 'libcorge.so', 'corge.cc.o', - '-Wl,-rpath,%s:%s::::' % - (spec['quux'].prefix.lib64, spec['garply'].prefix.lib64), - '%s/libquux.so' % spec['quux'].prefix.lib64, - '%s/libgarply.so' % spec['garply'].prefix.lib64) - gpp('-O2', '-g', '-DNDEBUG', '-rdynamic', - 'corgegator.cc.o', '-o', 'corgegator', - '-Wl,-rpath,%s' % prefix.lib64, - '-Wl,-rpath,%s' % spec['quux'].prefix.lib64, - '-Wl,-rpath,%s' % spec['garply'].prefix.lib64, - 'libcorge.so', - '%s/libquux.so.3.0' % spec['quux'].prefix.lib64, - '%s/libgarply.so.3.0' % spec['garply'].prefix.lib64) + gpp( + "-fPIC", + "-O2", + "-g", + "-DNDEBUG", + "-shared", + "-Wl,-soname,libcorge.so", + "-o", + "libcorge.so", + "corge.cc.o", + "-Wl,-rpath,%s:%s::::" % (spec["quux"].prefix.lib64, spec["garply"].prefix.lib64), + "%s/libquux.so" % spec["quux"].prefix.lib64, + "%s/libgarply.so" % spec["garply"].prefix.lib64, + ) + gpp( + "-O2", + "-g", + "-DNDEBUG", + "-rdynamic", + "corgegator.cc.o", + "-o", + "corgegator", + "-Wl,-rpath,%s" % prefix.lib64, + "-Wl,-rpath,%s" % spec["quux"].prefix.lib64, + "-Wl,-rpath,%s" % spec["garply"].prefix.lib64, + "libcorge.so", + "%s/libquux.so.3.0" % spec["quux"].prefix.lib64, + "%s/libgarply.so.3.0" % spec["garply"].prefix.lib64, + ) mkdirp(prefix.lib64) - copy('libcorge.so', '%s/libcorge.so' % prefix.lib64) - os.link('%s/libcorge.so' % prefix.lib64, - '%s/libcorge.so.3.0' % prefix.lib64) - copy('corgegator', '%s/corgegator' % prefix.lib64) - copy('%s/corge/corge.h' % self.stage.source_path, - '%s/corge/corge.h' % prefix.include) + copy("libcorge.so", "%s/libcorge.so" % prefix.lib64) + os.link("%s/libcorge.so" % prefix.lib64, "%s/libcorge.so.3.0" % prefix.lib64) + copy("corgegator", "%s/corgegator" % prefix.lib64) + copy("%s/corge/corge.h" % self.stage.source_path, "%s/corge/corge.h" % prefix.include) mkdirp(prefix.bin) - copy('corge_version.h', '%s/corge_version.h' % prefix.bin) - os.symlink('%s/corgegator' % prefix.lib64, - '%s/corgegator' % prefix.bin) - os.symlink('%s/quuxifier' % spec['quux'].prefix.lib64, - '%s/quuxifier' % prefix.bin) - os.symlink('%s/garplinator' % spec['garply'].prefix.lib64, - '%s/garplinator' % prefix.bin) + copy("corge_version.h", "%s/corge_version.h" % prefix.bin) + os.symlink("%s/corgegator" % prefix.lib64, "%s/corgegator" % prefix.bin) + os.symlink("%s/quuxifier" % spec["quux"].prefix.lib64, "%s/quuxifier" % prefix.bin) + os.symlink("%s/garplinator" % spec["garply"].prefix.lib64, "%s/garplinator" % prefix.bin) diff --git a/var/spack/repos/builtin.mock/packages/cumulative-vrange-bottom/package.py b/var/spack/repos/builtin.mock/packages/cumulative-vrange-bottom/package.py index c546fbb127..26dbc6d7a6 100644 --- a/var/spack/repos/builtin.mock/packages/cumulative-vrange-bottom/package.py +++ b/var/spack/repos/builtin.mock/packages/cumulative-vrange-bottom/package.py @@ -10,10 +10,11 @@ class CumulativeVrangeBottom(Package): form X.Y:X works and allows for the selection of all the versions >= X.Y with major == X """ - homepage = 'https://www.example.org' - url = 'https://example.org/files/v3.4/cmake-3.4.3.tar.gz' - version('3.0', '4cb3ff35b2472aae70f542116d616e63') - version('2.2', '4cb3ff35b2472aae70f542116d616e63') - version('2.1', '4cb3ff35b2472aae70f542116d616e63') - version('2.0', '4cb3ff35b2472aae70f542116d616e63') + homepage = "https://www.example.org" + url = "https://example.org/files/v3.4/cmake-3.4.3.tar.gz" + + version("3.0", "4cb3ff35b2472aae70f542116d616e63") + version("2.2", "4cb3ff35b2472aae70f542116d616e63") + version("2.1", "4cb3ff35b2472aae70f542116d616e63") + version("2.0", "4cb3ff35b2472aae70f542116d616e63") diff --git a/var/spack/repos/builtin.mock/packages/cumulative-vrange-middle/package.py b/var/spack/repos/builtin.mock/packages/cumulative-vrange-middle/package.py index 1eaeea3c7b..d0b92cffa9 100644 --- a/var/spack/repos/builtin.mock/packages/cumulative-vrange-middle/package.py +++ b/var/spack/repos/builtin.mock/packages/cumulative-vrange-middle/package.py @@ -10,9 +10,10 @@ class CumulativeVrangeMiddle(Package): form X.Y:X works and allows for the selection of all the versions >= X.Y with major == X """ - homepage = 'https://www.example.org' - url = 'https://example.org/files/v3.4/cmake-3.4.3.tar.gz' - version('1.0', '4cb3ff35b2472aae70f542116d616e63') + homepage = "https://www.example.org" + url = "https://example.org/files/v3.4/cmake-3.4.3.tar.gz" - depends_on('cumulative-vrange-bottom@2.1:') + version("1.0", "4cb3ff35b2472aae70f542116d616e63") + + depends_on("cumulative-vrange-bottom@2.1:") diff --git a/var/spack/repos/builtin.mock/packages/cumulative-vrange-root/package.py b/var/spack/repos/builtin.mock/packages/cumulative-vrange-root/package.py index 37e138bf6b..81d1ebdb60 100644 --- a/var/spack/repos/builtin.mock/packages/cumulative-vrange-root/package.py +++ b/var/spack/repos/builtin.mock/packages/cumulative-vrange-root/package.py @@ -10,10 +10,11 @@ class CumulativeVrangeRoot(Package): form X.Y:X works and allows for the selection of all the versions >= X.Y with major == X """ - homepage = 'https://www.example.org' - url = 'https://example.org/files/v3.4/cmake-3.4.3.tar.gz' - version('1.0', '4cb3ff35b2472aae70f542116d616e63') + homepage = "https://www.example.org" + url = "https://example.org/files/v3.4/cmake-3.4.3.tar.gz" - depends_on('cumulative-vrange-middle') - depends_on('cumulative-vrange-bottom@:2') + version("1.0", "4cb3ff35b2472aae70f542116d616e63") + + depends_on("cumulative-vrange-middle") + depends_on("cumulative-vrange-bottom@:2") diff --git a/var/spack/repos/builtin.mock/packages/cvs-test/package.py b/var/spack/repos/builtin.mock/packages/cvs-test/package.py index 85e8a5e888..790e75f586 100644 --- a/var/spack/repos/builtin.mock/packages/cvs-test/package.py +++ b/var/spack/repos/builtin.mock/packages/cvs-test/package.py @@ -8,6 +8,7 @@ from spack.package import * class CvsTest(Package): """Mock package that uses cvs for fetching.""" + homepage = "http://www.cvs-fetch-example.com" - version('cvs', cvs='to-be-filled-in-by-test') + version("cvs", cvs="to-be-filled-in-by-test") diff --git a/var/spack/repos/builtin.mock/packages/dep-diamond-patch-mid1/package.py b/var/spack/repos/builtin.mock/packages/dep-diamond-patch-mid1/package.py index 2639e7aeac..ad2ef6bb27 100644 --- a/var/spack/repos/builtin.mock/packages/dep-diamond-patch-mid1/package.py +++ b/var/spack/repos/builtin.mock/packages/dep-diamond-patch-mid1/package.py @@ -21,7 +21,7 @@ X Y homepage = "http://www.example.com" url = "http://www.example.com/patch-a-dependency-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") # single patch file in repo - depends_on('patch', patches='mid1.patch') + depends_on("patch", patches="mid1.patch") diff --git a/var/spack/repos/builtin.mock/packages/dep-diamond-patch-mid2/package.py b/var/spack/repos/builtin.mock/packages/dep-diamond-patch-mid2/package.py index 148ebd477e..3a4fc2cdf1 100644 --- a/var/spack/repos/builtin.mock/packages/dep-diamond-patch-mid2/package.py +++ b/var/spack/repos/builtin.mock/packages/dep-diamond-patch-mid2/package.py @@ -21,10 +21,15 @@ X Y homepage = "http://www.example.com" url = "http://www.example.com/patch-a-dependency-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") # single patch file in repo - depends_on('patch', patches=[ - patch('http://example.com/urlpatch.patch', - sha256='mid21234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234'), - ]) + depends_on( + "patch", + patches=[ + patch( + "http://example.com/urlpatch.patch", + sha256="mid21234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234", + ), + ], + ) diff --git a/var/spack/repos/builtin.mock/packages/dep-diamond-patch-top/package.py b/var/spack/repos/builtin.mock/packages/dep-diamond-patch-top/package.py index 43de59c8ca..de89121bdb 100644 --- a/var/spack/repos/builtin.mock/packages/dep-diamond-patch-top/package.py +++ b/var/spack/repos/builtin.mock/packages/dep-diamond-patch-top/package.py @@ -21,9 +21,9 @@ X Y homepage = "http://www.example.com" url = "http://www.example.com/patch-a-dependency-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") # single patch file in repo - depends_on('patch', patches='top.patch') - depends_on('dep-diamond-patch-mid1') - depends_on('dep-diamond-patch-mid2') + depends_on("patch", patches="top.patch") + depends_on("dep-diamond-patch-mid1") + depends_on("dep-diamond-patch-mid2") diff --git a/var/spack/repos/builtin.mock/packages/dep-with-variants-if-develop-root/package.py b/var/spack/repos/builtin.mock/packages/dep-with-variants-if-develop-root/package.py index b3d15c2bc0..c4b937dd6e 100644 --- a/var/spack/repos/builtin.mock/packages/dep-with-variants-if-develop-root/package.py +++ b/var/spack/repos/builtin.mock/packages/dep-with-variants-if-develop-root/package.py @@ -7,8 +7,9 @@ from spack.package import * class DepWithVariantsIfDevelopRoot(Package): """Package that adds a dependency with many variants only at @develop""" + homepage = "https://dev.null" - version('1.0') + version("1.0") - depends_on('dep-with-variants-if-develop') + depends_on("dep-with-variants-if-develop") diff --git a/var/spack/repos/builtin.mock/packages/dep-with-variants-if-develop/package.py b/var/spack/repos/builtin.mock/packages/dep-with-variants-if-develop/package.py index 756350dcc1..d5673ad478 100644 --- a/var/spack/repos/builtin.mock/packages/dep-with-variants-if-develop/package.py +++ b/var/spack/repos/builtin.mock/packages/dep-with-variants-if-develop/package.py @@ -7,9 +7,10 @@ from spack.package import * class DepWithVariantsIfDevelop(Package): """Package that adds a dependency with many variants only at @develop""" + homepage = "https://dev.null" - version('develop') - version('1.0') + version("develop") + version("1.0") - depends_on('dep-with-variants', when='@develop') + depends_on("dep-with-variants", when="@develop") diff --git a/var/spack/repos/builtin.mock/packages/dep-with-variants/package.py b/var/spack/repos/builtin.mock/packages/dep-with-variants/package.py index dd28b07eaa..4641e92791 100644 --- a/var/spack/repos/builtin.mock/packages/dep-with-variants/package.py +++ b/var/spack/repos/builtin.mock/packages/dep-with-variants/package.py @@ -9,10 +9,11 @@ class DepWithVariants(Package): """Package that has a variant which adds a dependency forced to use non default values. """ + homepage = "https://dev.null" - version('1.0') + version("1.0") - variant('foo', default=False, description='nope') - variant('bar', default=False, description='nope') - variant('baz', default=False, description='nope') + variant("foo", default=False, description="nope") + variant("bar", default=False, description="nope") + variant("baz", default=False, description="nope") diff --git a/var/spack/repos/builtin.mock/packages/depb/package.py b/var/spack/repos/builtin.mock/packages/depb/package.py index ea361f1f7a..f20780a84c 100644 --- a/var/spack/repos/builtin.mock/packages/depb/package.py +++ b/var/spack/repos/builtin.mock/packages/depb/package.py @@ -10,11 +10,11 @@ class Depb(AutotoolsPackage): """Simple package with one build dependency""" homepage = "http://www.example.com" - url = "http://www.example.com/a-1.0.tar.gz" + url = "http://www.example.com/a-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") - depends_on('b') + depends_on("b") def install(self, spec, prefix): # sanity_check_prefix requires something in the install directory diff --git a/var/spack/repos/builtin.mock/packages/dependency-install/package.py b/var/spack/repos/builtin.mock/packages/dependency-install/package.py index 20c1fcd911..76294ab606 100644 --- a/var/spack/repos/builtin.mock/packages/dependency-install/package.py +++ b/var/spack/repos/builtin.mock/packages/dependency-install/package.py @@ -10,10 +10,10 @@ class DependencyInstall(Package): """Dependency which has a working install method""" homepage = "http://www.example.com" - url = "http://www.example.com/a-1.0.tar.gz" + url = "http://www.example.com/a-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') - version('2.0', 'abcdef0123456789abcdef0123456789') + version("1.0", "0123456789abcdef0123456789abcdef") + version("2.0", "abcdef0123456789abcdef0123456789") def install(self, spec, prefix): - touch(join_path(prefix, 'an_installation_file')) + touch(join_path(prefix, "an_installation_file")) diff --git a/var/spack/repos/builtin.mock/packages/dependent-install/package.py b/var/spack/repos/builtin.mock/packages/dependent-install/package.py index 9c4308cfb8..05c7123e61 100644 --- a/var/spack/repos/builtin.mock/packages/dependent-install/package.py +++ b/var/spack/repos/builtin.mock/packages/dependent-install/package.py @@ -10,13 +10,13 @@ class DependentInstall(Package): """Dependent which has a working install method""" homepage = "http://www.example.com" - url = "http://www.example.com/a-1.0.tar.gz" + url = "http://www.example.com/a-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') - version('2.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") + version("2.0", "0123456789abcdef0123456789abcdef") - depends_on('dependency-install@2.0', when='@2.0') - depends_on('dependency-install@1.0', when='@1.0') + depends_on("dependency-install@2.0", when="@2.0") + depends_on("dependency-install@1.0", when="@1.0") def install(self, spec, prefix): - touch(join_path(prefix, 'an_installation_file')) + touch(join_path(prefix, "an_installation_file")) diff --git a/var/spack/repos/builtin.mock/packages/dependent-of-dev-build/package.py b/var/spack/repos/builtin.mock/packages/dependent-of-dev-build/package.py index 4706d439b8..35c9a1a708 100644 --- a/var/spack/repos/builtin.mock/packages/dependent-of-dev-build/package.py +++ b/var/spack/repos/builtin.mock/packages/dependent-of-dev-build/package.py @@ -11,10 +11,10 @@ class DependentOfDevBuild(Package): homepage = "example.com" url = "fake.com" - version('0.0.0', sha256='0123456789abcdef0123456789abcdef') + version("0.0.0", sha256="0123456789abcdef0123456789abcdef") - depends_on('dev-build-test-install') + depends_on("dev-build-test-install") def install(self, spec, prefix): - with open(prefix.filename, 'w') as f: + with open(prefix.filename, "w") as f: f.write("This file is installed") diff --git a/var/spack/repos/builtin.mock/packages/depends-on-openmpi/package.py b/var/spack/repos/builtin.mock/packages/depends-on-openmpi/package.py index 94cb686cad..150e4b6df0 100644 --- a/var/spack/repos/builtin.mock/packages/depends-on-openmpi/package.py +++ b/var/spack/repos/builtin.mock/packages/depends-on-openmpi/package.py @@ -8,9 +8,9 @@ from spack.package import * class DependsOnOpenmpi(Package): """For testing concretization of packages that use - `spack external read-cray-manifest`""" + `spack external read-cray-manifest`""" - depends_on('openmpi') + depends_on("openmpi") - version('1.0') - version('0.9') + version("1.0") + version("0.9") diff --git a/var/spack/repos/builtin.mock/packages/depends-on-run-env/package.py b/var/spack/repos/builtin.mock/packages/depends-on-run-env/package.py index 0ca9fb2cfa..1433092eb0 100644 --- a/var/spack/repos/builtin.mock/packages/depends-on-run-env/package.py +++ b/var/spack/repos/builtin.mock/packages/depends-on-run-env/package.py @@ -8,15 +8,15 @@ from spack.package import * class DependsOnRunEnv(Package): """This package has a runtime dependency on another package which needs - to perform shell modifications to run. + to perform shell modifications to run. """ homepage = "http://www.example.com" - url = "http://www.example.com/a-1.0.tar.gz" + url = "http://www.example.com/a-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") - depends_on('modifies-run-env', type=('run',)) + depends_on("modifies-run-env", type=("run",)) def install(self, spec, prefix): mkdirp(prefix.bin) diff --git a/var/spack/repos/builtin.mock/packages/deprecated-versions/package.py b/var/spack/repos/builtin.mock/packages/deprecated-versions/package.py index 2480651b2d..bc78301597 100644 --- a/var/spack/repos/builtin.mock/packages/deprecated-versions/package.py +++ b/var/spack/repos/builtin.mock/packages/deprecated-versions/package.py @@ -11,5 +11,5 @@ class DeprecatedVersions(Package): homepage = "http://www.example.com" url = "http://www.example.com/c-1.0.tar.gz" - version('1.1.0', '0123456789abcdef0123456789abcdef', deprecated=True) - version('1.0.0', '0123456789abcdef0123456789abcdef') + version("1.1.0", "0123456789abcdef0123456789abcdef", deprecated=True) + version("1.0.0", "0123456789abcdef0123456789abcdef") diff --git a/var/spack/repos/builtin.mock/packages/dev-build-test-dependent/package.py b/var/spack/repos/builtin.mock/packages/dev-build-test-dependent/package.py index 8260b23362..44374cd1a7 100644 --- a/var/spack/repos/builtin.mock/packages/dev-build-test-dependent/package.py +++ b/var/spack/repos/builtin.mock/packages/dev-build-test-dependent/package.py @@ -11,18 +11,18 @@ class DevBuildTestDependent(Package): homepage = "example.com" url = "fake.com" - version('0.0.0', sha256='0123456789abcdef0123456789abcdef') + version("0.0.0", sha256="0123456789abcdef0123456789abcdef") - phases = ['edit', 'install'] + phases = ["edit", "install"] - filename = 'dev-build-test-file.txt' + filename = "dev-build-test-file.txt" original_string = "This file should be edited" replacement_string = "This file has been edited" - depends_on('dev-build-test-install') + depends_on("dev-build-test-install") def edit(self, spec, prefix): - with open(self.filename, 'r+') as f: + with open(self.filename, "r+") as f: assert f.read() == self.original_string f.seek(0) f.truncate() diff --git a/var/spack/repos/builtin.mock/packages/dev-build-test-install-phases/package.py b/var/spack/repos/builtin.mock/packages/dev-build-test-install-phases/package.py index 4d5b731415..fa0f6b794e 100644 --- a/var/spack/repos/builtin.mock/packages/dev-build-test-install-phases/package.py +++ b/var/spack/repos/builtin.mock/packages/dev-build-test-install-phases/package.py @@ -12,9 +12,9 @@ class DevBuildTestInstallPhases(Package): homepage = "example.com" url = "fake.com" - version('0.0.0', sha256='0123456789abcdef0123456789abcdef') + version("0.0.0", sha256="0123456789abcdef0123456789abcdef") - phases = ['one', 'two', 'three', 'install'] + phases = ["one", "two", "three", "install"] def one(self, spec, prefix): sleep(1) diff --git a/var/spack/repos/builtin.mock/packages/dev-build-test-install/package.py b/var/spack/repos/builtin.mock/packages/dev-build-test-install/package.py index f21c5ca085..185fe5552c 100644 --- a/var/spack/repos/builtin.mock/packages/dev-build-test-install/package.py +++ b/var/spack/repos/builtin.mock/packages/dev-build-test-install/package.py @@ -11,16 +11,16 @@ class DevBuildTestInstall(Package): homepage = "example.com" url = "fake.com" - version('0.0.0', sha256='0123456789abcdef0123456789abcdef') + version("0.0.0", sha256="0123456789abcdef0123456789abcdef") - phases = ['edit', 'install'] + phases = ["edit", "install"] - filename = 'dev-build-test-file.txt' + filename = "dev-build-test-file.txt" original_string = "This file should be edited" replacement_string = "This file has been edited" def edit(self, spec, prefix): - with open(self.filename, 'r+') as f: + with open(self.filename, "r+") as f: assert f.read() == self.original_string f.seek(0) f.truncate() diff --git a/var/spack/repos/builtin.mock/packages/develop-test/package.py b/var/spack/repos/builtin.mock/packages/develop-test/package.py index 2067b9a22f..2ce2ed742d 100644 --- a/var/spack/repos/builtin.mock/packages/develop-test/package.py +++ b/var/spack/repos/builtin.mock/packages/develop-test/package.py @@ -8,8 +8,9 @@ from spack.package import * class DevelopTest(Package): """Dummy package with develop version""" + homepage = "http://www.openblas.net" - url = "http://github.com/xianyi/OpenBLAS/archive/v0.2.15.tar.gz" + url = "http://github.com/xianyi/OpenBLAS/archive/v0.2.15.tar.gz" - version('develop', git='https://github.com/dummy/repo.git') - version('0.2.15', 'b1190f3d3471685f17cfd1ec1d252ac9') + version("develop", git="https://github.com/dummy/repo.git") + version("0.2.15", "b1190f3d3471685f17cfd1ec1d252ac9") diff --git a/var/spack/repos/builtin.mock/packages/develop-test2/package.py b/var/spack/repos/builtin.mock/packages/develop-test2/package.py index 33d604ab7f..40fd7fde44 100644 --- a/var/spack/repos/builtin.mock/packages/develop-test2/package.py +++ b/var/spack/repos/builtin.mock/packages/develop-test2/package.py @@ -8,8 +8,9 @@ from spack.package import * class DevelopTest2(Package): """Dummy package with develop version""" + homepage = "http://www.openblas.net" - url = "http://github.com/xianyi/OpenBLAS/archive/v0.2.15.tar.gz" + url = "http://github.com/xianyi/OpenBLAS/archive/v0.2.15.tar.gz" - version('0.2.15.develop', git='https://github.com/dummy/repo.git') - version('0.2.15', 'b1190f3d3471685f17cfd1ec1d252ac9') + version("0.2.15.develop", git="https://github.com/dummy/repo.git") + version("0.2.15", "b1190f3d3471685f17cfd1ec1d252ac9") diff --git a/var/spack/repos/builtin.mock/packages/direct-mpich/package.py b/var/spack/repos/builtin.mock/packages/direct-mpich/package.py index 7b5964fb43..9c0b89eea5 100644 --- a/var/spack/repos/builtin.mock/packages/direct-mpich/package.py +++ b/var/spack/repos/builtin.mock/packages/direct-mpich/package.py @@ -8,8 +8,8 @@ from spack.package import * class DirectMpich(Package): homepage = "http://www.example.com" - url = "http://www.example.com/direct_mpich-1.0.tar.gz" + url = "http://www.example.com/direct_mpich-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") - depends_on('mpich') + depends_on("mpich") diff --git a/var/spack/repos/builtin.mock/packages/dt-diamond-bottom/package.py b/var/spack/repos/builtin.mock/packages/dt-diamond-bottom/package.py index 7f04f20d5e..9f0a4a486f 100644 --- a/var/spack/repos/builtin.mock/packages/dt-diamond-bottom/package.py +++ b/var/spack/repos/builtin.mock/packages/dt-diamond-bottom/package.py @@ -8,7 +8,8 @@ from spack.package import * class DtDiamondBottom(Package): """This package has an indirect diamond dependency on dt-diamond-bottom""" + homepage = "http://www.example.com" url = "http://www.example.com/dt-diamond-bottom-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") diff --git a/var/spack/repos/builtin.mock/packages/dt-diamond-left/package.py b/var/spack/repos/builtin.mock/packages/dt-diamond-left/package.py index 3c3ec9401e..2e1e0ae2fa 100644 --- a/var/spack/repos/builtin.mock/packages/dt-diamond-left/package.py +++ b/var/spack/repos/builtin.mock/packages/dt-diamond-left/package.py @@ -8,9 +8,10 @@ from spack.package import * class DtDiamondLeft(Package): """This package has an indirect diamond dependency on dt-diamond-bottom""" + homepage = "http://www.example.com" url = "http://www.example.com/dt-diamond-left-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") - depends_on('dt-diamond-bottom', type='build') + depends_on("dt-diamond-bottom", type="build") diff --git a/var/spack/repos/builtin.mock/packages/dt-diamond-right/package.py b/var/spack/repos/builtin.mock/packages/dt-diamond-right/package.py index 8fe65f0219..de7a692cda 100644 --- a/var/spack/repos/builtin.mock/packages/dt-diamond-right/package.py +++ b/var/spack/repos/builtin.mock/packages/dt-diamond-right/package.py @@ -8,9 +8,10 @@ from spack.package import * class DtDiamondRight(Package): """This package has an indirect diamond dependency on dt-diamond-bottom""" + homepage = "http://www.example.com" url = "http://www.example.com/dt-diamond-right-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") - depends_on('dt-diamond-bottom', type=('build', 'link', 'run')) + depends_on("dt-diamond-bottom", type=("build", "link", "run")) diff --git a/var/spack/repos/builtin.mock/packages/dt-diamond/package.py b/var/spack/repos/builtin.mock/packages/dt-diamond/package.py index ef7287bc6a..b4324fc38f 100644 --- a/var/spack/repos/builtin.mock/packages/dt-diamond/package.py +++ b/var/spack/repos/builtin.mock/packages/dt-diamond/package.py @@ -8,10 +8,11 @@ from spack.package import * class DtDiamond(Package): """This package has an indirect diamond dependency on dt-diamond-bottom""" + homepage = "http://www.example.com" url = "http://www.example.com/dt-diamond-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") - depends_on('dt-diamond-left') - depends_on('dt-diamond-right') + depends_on("dt-diamond-left") + depends_on("dt-diamond-right") diff --git a/var/spack/repos/builtin.mock/packages/dtbuild1/package.py b/var/spack/repos/builtin.mock/packages/dtbuild1/package.py index c08a9accc4..ab77a38440 100644 --- a/var/spack/repos/builtin.mock/packages/dtbuild1/package.py +++ b/var/spack/repos/builtin.mock/packages/dtbuild1/package.py @@ -13,9 +13,9 @@ class Dtbuild1(Package): homepage = "http://www.example.com" url = "http://www.example.com/dtbuild1-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') - version('0.5', 'fedcba9876543210fedcba9876543210') + version("1.0", "0123456789abcdef0123456789abcdef") + version("0.5", "fedcba9876543210fedcba9876543210") - depends_on('dtbuild2', type='build') - depends_on('dtlink2') - depends_on('dtrun2', type='run') + depends_on("dtbuild2", type="build") + depends_on("dtlink2") + depends_on("dtrun2", type="run") diff --git a/var/spack/repos/builtin.mock/packages/dtbuild2/package.py b/var/spack/repos/builtin.mock/packages/dtbuild2/package.py index 4991861202..192ea92abc 100644 --- a/var/spack/repos/builtin.mock/packages/dtbuild2/package.py +++ b/var/spack/repos/builtin.mock/packages/dtbuild2/package.py @@ -12,4 +12,4 @@ class Dtbuild2(Package): homepage = "http://www.example.com" url = "http://www.example.com/dtbuild2-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") diff --git a/var/spack/repos/builtin.mock/packages/dtbuild3/package.py b/var/spack/repos/builtin.mock/packages/dtbuild3/package.py index 31c7a739af..155d411bc4 100644 --- a/var/spack/repos/builtin.mock/packages/dtbuild3/package.py +++ b/var/spack/repos/builtin.mock/packages/dtbuild3/package.py @@ -12,4 +12,4 @@ class Dtbuild3(Package): homepage = "http://www.example.com" url = "http://www.example.com/dtbuild3-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") diff --git a/var/spack/repos/builtin.mock/packages/dtlink1/package.py b/var/spack/repos/builtin.mock/packages/dtlink1/package.py index 2b0be1ebdc..64164e45f5 100644 --- a/var/spack/repos/builtin.mock/packages/dtlink1/package.py +++ b/var/spack/repos/builtin.mock/packages/dtlink1/package.py @@ -12,6 +12,6 @@ class Dtlink1(Package): homepage = "http://www.example.com" url = "http://www.example.com/dtlink1-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") - depends_on('dtlink3') + depends_on("dtlink3") diff --git a/var/spack/repos/builtin.mock/packages/dtlink2/package.py b/var/spack/repos/builtin.mock/packages/dtlink2/package.py index 116b0f4fbd..1debd73a1a 100644 --- a/var/spack/repos/builtin.mock/packages/dtlink2/package.py +++ b/var/spack/repos/builtin.mock/packages/dtlink2/package.py @@ -12,4 +12,4 @@ class Dtlink2(Package): homepage = "http://www.example.com" url = "http://www.example.com/dtlink2-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") diff --git a/var/spack/repos/builtin.mock/packages/dtlink3/package.py b/var/spack/repos/builtin.mock/packages/dtlink3/package.py index 2784ee04b9..e971ba4fdb 100644 --- a/var/spack/repos/builtin.mock/packages/dtlink3/package.py +++ b/var/spack/repos/builtin.mock/packages/dtlink3/package.py @@ -12,7 +12,7 @@ class Dtlink3(Package): homepage = "http://www.example.com" url = "http://www.example.com/dtlink3-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") - depends_on('dtbuild2', type='build') - depends_on('dtlink4') + depends_on("dtbuild2", type="build") + depends_on("dtlink4") diff --git a/var/spack/repos/builtin.mock/packages/dtlink4/package.py b/var/spack/repos/builtin.mock/packages/dtlink4/package.py index ee3d94de82..68d0e8dec2 100644 --- a/var/spack/repos/builtin.mock/packages/dtlink4/package.py +++ b/var/spack/repos/builtin.mock/packages/dtlink4/package.py @@ -12,4 +12,4 @@ class Dtlink4(Package): homepage = "http://www.example.com" url = "http://www.example.com/dtlink4-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") diff --git a/var/spack/repos/builtin.mock/packages/dtlink5/package.py b/var/spack/repos/builtin.mock/packages/dtlink5/package.py index 7ceaeb9a9c..95222e8a55 100644 --- a/var/spack/repos/builtin.mock/packages/dtlink5/package.py +++ b/var/spack/repos/builtin.mock/packages/dtlink5/package.py @@ -12,4 +12,4 @@ class Dtlink5(Package): homepage = "http://www.example.com" url = "http://www.example.com/dtlink5-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") diff --git a/var/spack/repos/builtin.mock/packages/dtrun1/package.py b/var/spack/repos/builtin.mock/packages/dtrun1/package.py index 2ac34a7b90..10ab104537 100644 --- a/var/spack/repos/builtin.mock/packages/dtrun1/package.py +++ b/var/spack/repos/builtin.mock/packages/dtrun1/package.py @@ -12,7 +12,7 @@ class Dtrun1(Package): homepage = "http://www.example.com" url = "http://www.example.com/dtrun1-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") - depends_on('dtlink5') - depends_on('dtrun3', type='run') + depends_on("dtlink5") + depends_on("dtrun3", type="run") diff --git a/var/spack/repos/builtin.mock/packages/dtrun2/package.py b/var/spack/repos/builtin.mock/packages/dtrun2/package.py index 4b8698fe92..e7c2ac72a5 100644 --- a/var/spack/repos/builtin.mock/packages/dtrun2/package.py +++ b/var/spack/repos/builtin.mock/packages/dtrun2/package.py @@ -12,4 +12,4 @@ class Dtrun2(Package): homepage = "http://www.example.com" url = "http://www.example.com/dtrun2-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") diff --git a/var/spack/repos/builtin.mock/packages/dtrun3/package.py b/var/spack/repos/builtin.mock/packages/dtrun3/package.py index 99a6121376..69c5fe2cb3 100644 --- a/var/spack/repos/builtin.mock/packages/dtrun3/package.py +++ b/var/spack/repos/builtin.mock/packages/dtrun3/package.py @@ -12,6 +12,6 @@ class Dtrun3(Package): homepage = "http://www.example.com" url = "http://www.example.com/dtrun3-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") - depends_on('dtbuild3', type='build') + depends_on("dtbuild3", type="build") diff --git a/var/spack/repos/builtin.mock/packages/dttop/package.py b/var/spack/repos/builtin.mock/packages/dttop/package.py index a238d17b6a..482bb3222f 100644 --- a/var/spack/repos/builtin.mock/packages/dttop/package.py +++ b/var/spack/repos/builtin.mock/packages/dttop/package.py @@ -12,8 +12,8 @@ class Dttop(Package): homepage = "http://www.example.com" url = "http://www.example.com/dttop-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") - depends_on('dtbuild1', type='build') - depends_on('dtlink1') - depends_on('dtrun1', type='run') + depends_on("dtbuild1", type="build") + depends_on("dtlink1") + depends_on("dtrun1", type="run") diff --git a/var/spack/repos/builtin.mock/packages/dtuse/package.py b/var/spack/repos/builtin.mock/packages/dtuse/package.py index 847d4dfff9..63b2df52e9 100644 --- a/var/spack/repos/builtin.mock/packages/dtuse/package.py +++ b/var/spack/repos/builtin.mock/packages/dtuse/package.py @@ -12,6 +12,6 @@ class Dtuse(Package): homepage = "http://www.example.com" url = "http://www.example.com/dtuse-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") - depends_on('dttop') + depends_on("dttop") diff --git a/var/spack/repos/builtin.mock/packages/dyninst/package.py b/var/spack/repos/builtin.mock/packages/dyninst/package.py index 70bc106c3c..a8a75e9b23 100644 --- a/var/spack/repos/builtin.mock/packages/dyninst/package.py +++ b/var/spack/repos/builtin.mock/packages/dyninst/package.py @@ -8,14 +8,23 @@ from spack.package import * class Dyninst(Package): homepage = "https://paradyn.org" - url = "http://www.paradyn.org/release8.1/DyninstAPI-8.1.1.tgz" + url = "http://www.paradyn.org/release8.1/DyninstAPI-8.1.1.tgz" - version('8.2', '0123456789abcdef0123456789abcdef', - url='http://www.paradyn.org/release8.2/DyninstAPI-8.2.tgz') - version('8.1.2', 'fedcba9876543210fedcba9876543210', - url='http://www.paradyn.org/release8.1.2/DyninstAPI-8.1.2.tgz') - version('8.1.1', '123456789abcdef0123456789abcdef0', - url='http://www.paradyn.org/release8.1/DyninstAPI-8.1.1.tgz') + version( + "8.2", + "0123456789abcdef0123456789abcdef", + url="http://www.paradyn.org/release8.2/DyninstAPI-8.2.tgz", + ) + version( + "8.1.2", + "fedcba9876543210fedcba9876543210", + url="http://www.paradyn.org/release8.1.2/DyninstAPI-8.1.2.tgz", + ) + version( + "8.1.1", + "123456789abcdef0123456789abcdef0", + url="http://www.paradyn.org/release8.1/DyninstAPI-8.1.1.tgz", + ) depends_on("libelf") depends_on("libdwarf") diff --git a/var/spack/repos/builtin.mock/packages/e/package.py b/var/spack/repos/builtin.mock/packages/e/package.py index 36d7cf1b4c..d3fc99e651 100644 --- a/var/spack/repos/builtin.mock/packages/e/package.py +++ b/var/spack/repos/builtin.mock/packages/e/package.py @@ -10,6 +10,6 @@ class E(Package): """Simple package with no dependencies""" homepage = "http://www.example.com" - url = "http://www.example.com/e-1.0.tar.gz" + url = "http://www.example.com/e-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") diff --git a/var/spack/repos/builtin.mock/packages/ecp-viz-sdk/package.py b/var/spack/repos/builtin.mock/packages/ecp-viz-sdk/package.py index 72ef2afd8b..ac51898582 100644 --- a/var/spack/repos/builtin.mock/packages/ecp-viz-sdk/package.py +++ b/var/spack/repos/builtin.mock/packages/ecp-viz-sdk/package.py @@ -10,8 +10,9 @@ class EcpVizSdk(Package): adds a transitive dependency forced to use non default values. """ + homepage = "https://dev.null" - version('1.0') + version("1.0") - depends_on('conditional-constrained-dependencies') + depends_on("conditional-constrained-dependencies") diff --git a/var/spack/repos/builtin.mock/packages/extendee/package.py b/var/spack/repos/builtin.mock/packages/extendee/package.py index 9d0ab197de..d5d7beec87 100644 --- a/var/spack/repos/builtin.mock/packages/extendee/package.py +++ b/var/spack/repos/builtin.mock/packages/extendee/package.py @@ -10,11 +10,11 @@ class Extendee(Package): """A package with extensions""" homepage = "http://www.example.com" - url = "http://www.example.com/extendee-1.0.tar.gz" + url = "http://www.example.com/extendee-1.0.tar.gz" extendable = True - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") def install(self, spec, prefix): mkdirp(prefix.bin) diff --git a/var/spack/repos/builtin.mock/packages/extends-spec/package.py b/var/spack/repos/builtin.mock/packages/extends-spec/package.py index bd443cba4c..bba5b6c512 100644 --- a/var/spack/repos/builtin.mock/packages/extends-spec/package.py +++ b/var/spack/repos/builtin.mock/packages/extends-spec/package.py @@ -12,6 +12,6 @@ class ExtendsSpec(Package): homepage = "http://www.example.com" url = "http://www.example.com/example-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") - extends('extendee@1:') + extends("extendee@1:") diff --git a/var/spack/repos/builtin.mock/packages/extension1/package.py b/var/spack/repos/builtin.mock/packages/extension1/package.py index c5c08eb32d..5b8ea74afe 100644 --- a/var/spack/repos/builtin.mock/packages/extension1/package.py +++ b/var/spack/repos/builtin.mock/packages/extension1/package.py @@ -12,14 +12,14 @@ class Extension1(Package): """A package which extends another package""" homepage = "http://www.example.com" - url = "http://www.example.com/extension1-1.0.tar.gz" + url = "http://www.example.com/extension1-1.0.tar.gz" - extends('extendee') + extends("extendee") - version('1.0', '0123456789abcdef0123456789abcdef') - version('2.0', 'abcdef0123456789abcdef0123456789') + version("1.0", "0123456789abcdef0123456789abcdef") + version("2.0", "abcdef0123456789abcdef0123456789") def install(self, spec, prefix): mkdirp(prefix.bin) - with open(os.path.join(prefix.bin, 'extension1'), 'w+') as fout: + with open(os.path.join(prefix.bin, "extension1"), "w+") as fout: fout.write(str(spec.version)) diff --git a/var/spack/repos/builtin.mock/packages/extension2/package.py b/var/spack/repos/builtin.mock/packages/extension2/package.py index 43e14b6ce0..ec34a4db0f 100644 --- a/var/spack/repos/builtin.mock/packages/extension2/package.py +++ b/var/spack/repos/builtin.mock/packages/extension2/package.py @@ -10,17 +10,17 @@ from spack.package import * class Extension2(Package): """A package which extends another package. It also depends on another - package which extends the same package.""" + package which extends the same package.""" homepage = "http://www.example.com" - url = "http://www.example.com/extension2-1.0.tar.gz" + url = "http://www.example.com/extension2-1.0.tar.gz" - extends('extendee') - depends_on('extension1', type=('build', 'run')) + extends("extendee") + depends_on("extension1", type=("build", "run")) - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") def install(self, spec, prefix): mkdirp(prefix.bin) - with open(os.path.join(prefix.bin, 'extension2'), 'w+') as fout: + with open(os.path.join(prefix.bin, "extension2"), "w+") as fout: fout.write(str(spec.version)) diff --git a/var/spack/repos/builtin.mock/packages/external-buildable-with-variant/package.py b/var/spack/repos/builtin.mock/packages/external-buildable-with-variant/package.py index eecf3b975e..66a35cba0d 100644 --- a/var/spack/repos/builtin.mock/packages/external-buildable-with-variant/package.py +++ b/var/spack/repos/builtin.mock/packages/external-buildable-with-variant/package.py @@ -10,9 +10,9 @@ class ExternalBuildableWithVariant(Package): homepage = "http://somewhere.com" url = "http://somewhere.com/module-1.0.tar.gz" - version('1.0', '1234567890abcdef1234567890abcdef') - version('0.9', '1234567890abcdef1234567890abcdef') + version("1.0", "1234567890abcdef1234567890abcdef") + version("0.9", "1234567890abcdef1234567890abcdef") - variant('baz', default=False, description='nope') + variant("baz", default=False, description="nope") - depends_on('c@1.0', when='@0.9') + depends_on("c@1.0", when="@0.9") diff --git a/var/spack/repos/builtin.mock/packages/external-common-gdbm/package.py b/var/spack/repos/builtin.mock/packages/external-common-gdbm/package.py index ae67a75b8a..a14ea6fd89 100644 --- a/var/spack/repos/builtin.mock/packages/external-common-gdbm/package.py +++ b/var/spack/repos/builtin.mock/packages/external-common-gdbm/package.py @@ -8,6 +8,6 @@ from spack.package import * class ExternalCommonGdbm(Package): homepage = "http://www.gnu.org.ua/software/gdbm/gdbm.html" - url = "https://ftpmirror.gnu.org/gdbm/gdbm-1.18.1.tar.gz" + url = "https://ftpmirror.gnu.org/gdbm/gdbm-1.18.1.tar.gz" - version('1.18.1', 'be78e48cdfc1a7ad90efff146dce6cfe') + version("1.18.1", "be78e48cdfc1a7ad90efff146dce6cfe") diff --git a/var/spack/repos/builtin.mock/packages/external-common-openssl/package.py b/var/spack/repos/builtin.mock/packages/external-common-openssl/package.py index cd63be42a0..f4ac3d8c7f 100644 --- a/var/spack/repos/builtin.mock/packages/external-common-openssl/package.py +++ b/var/spack/repos/builtin.mock/packages/external-common-openssl/package.py @@ -8,7 +8,7 @@ from spack.package import * class ExternalCommonOpenssl(Package): homepage = "http://www.openssl.org" - url = "http://www.openssl.org/source/openssl-1.1.1i.tar.gz" + url = "http://www.openssl.org/source/openssl-1.1.1i.tar.gz" - version('1.1.1i', 'be78e48cdfc1a7ad90efff146dce6cfe') - depends_on('external-common-perl') + version("1.1.1i", "be78e48cdfc1a7ad90efff146dce6cfe") + depends_on("external-common-perl") diff --git a/var/spack/repos/builtin.mock/packages/external-common-perl/package.py b/var/spack/repos/builtin.mock/packages/external-common-perl/package.py index fe8e664bfd..9189a2d8a2 100644 --- a/var/spack/repos/builtin.mock/packages/external-common-perl/package.py +++ b/var/spack/repos/builtin.mock/packages/external-common-perl/package.py @@ -8,7 +8,7 @@ from spack.package import * class ExternalCommonPerl(Package): homepage = "http://www.perl.org" - url = "http://www.cpan.org/src/5.0/perl-5.32.0.tar.gz" + url = "http://www.cpan.org/src/5.0/perl-5.32.0.tar.gz" - version('5.32.0', 'be78e48cdfc1a7ad90efff146dce6cfe') - depends_on('external-common-gdbm') + version("5.32.0", "be78e48cdfc1a7ad90efff146dce6cfe") + depends_on("external-common-gdbm") diff --git a/var/spack/repos/builtin.mock/packages/external-common-python/package.py b/var/spack/repos/builtin.mock/packages/external-common-python/package.py index 643a50825a..e02fc07c51 100644 --- a/var/spack/repos/builtin.mock/packages/external-common-python/package.py +++ b/var/spack/repos/builtin.mock/packages/external-common-python/package.py @@ -8,8 +8,8 @@ from spack.package import * class ExternalCommonPython(Package): homepage = "http://www.python.org" - url = "http://www.python.org/ftp/python/3.8.7/Python-3.8.7.tgz" + url = "http://www.python.org/ftp/python/3.8.7/Python-3.8.7.tgz" - version('3.8.7', 'be78e48cdfc1a7ad90efff146dce6cfe') - depends_on('external-common-openssl') - depends_on('external-common-gdbm') + version("3.8.7", "be78e48cdfc1a7ad90efff146dce6cfe") + depends_on("external-common-openssl") + depends_on("external-common-gdbm") diff --git a/var/spack/repos/builtin.mock/packages/external-non-default-variant/package.py b/var/spack/repos/builtin.mock/packages/external-non-default-variant/package.py index 8995498d84..0fcff8c5cd 100644 --- a/var/spack/repos/builtin.mock/packages/external-non-default-variant/package.py +++ b/var/spack/repos/builtin.mock/packages/external-non-default-variant/package.py @@ -7,10 +7,11 @@ from spack.package import * class ExternalNonDefaultVariant(Package): """An external that is registered with a non-default value""" + homepage = "http://www.python.org" url = "http://www.python.org/ftp/python/3.8.7/Python-3.8.7.tgz" - version('3.8.7', 'be78e48cdfc1a7ad90efff146dce6cfe') + version("3.8.7", "be78e48cdfc1a7ad90efff146dce6cfe") - variant('foo', default=True, description='just a variant') - variant('bar', default=True, description='just a variant') + variant("foo", default=True, description="just a variant") + variant("bar", default=True, description="just a variant") diff --git a/var/spack/repos/builtin.mock/packages/externalmodule/package.py b/var/spack/repos/builtin.mock/packages/externalmodule/package.py index 4a38bbb083..b9b64f558d 100644 --- a/var/spack/repos/builtin.mock/packages/externalmodule/package.py +++ b/var/spack/repos/builtin.mock/packages/externalmodule/package.py @@ -8,8 +8,8 @@ from spack.package import * class Externalmodule(Package): homepage = "http://somewhere.com" - url = "http://somewhere.com/module-1.0.tar.gz" + url = "http://somewhere.com/module-1.0.tar.gz" - version('1.0', '1234567890abcdef1234567890abcdef') + version("1.0", "1234567890abcdef1234567890abcdef") - depends_on('externalprereq') + depends_on("externalprereq") diff --git a/var/spack/repos/builtin.mock/packages/externalprereq/package.py b/var/spack/repos/builtin.mock/packages/externalprereq/package.py index 3d36bbd82e..ff98abd214 100644 --- a/var/spack/repos/builtin.mock/packages/externalprereq/package.py +++ b/var/spack/repos/builtin.mock/packages/externalprereq/package.py @@ -8,6 +8,6 @@ from spack.package import * class Externalprereq(Package): homepage = "http://somewhere.com" - url = "http://somewhere.com/prereq-1.0.tar.gz" + url = "http://somewhere.com/prereq-1.0.tar.gz" - version('1.4', 'f1234567890abcdef1234567890abcde') + version("1.4", "f1234567890abcdef1234567890abcde") diff --git a/var/spack/repos/builtin.mock/packages/externaltest/package.py b/var/spack/repos/builtin.mock/packages/externaltest/package.py index eb9da8b196..3bb7ef9712 100644 --- a/var/spack/repos/builtin.mock/packages/externaltest/package.py +++ b/var/spack/repos/builtin.mock/packages/externaltest/package.py @@ -8,12 +8,12 @@ from spack.package import * class Externaltest(Package): homepage = "http://somewhere.com" - url = "http://somewhere.com/test-1.0.tar.gz" + url = "http://somewhere.com/test-1.0.tar.gz" - version('1.0', '1234567890abcdef1234567890abcdef') + version("1.0", "1234567890abcdef1234567890abcdef") - depends_on('stuff') - depends_on('externaltool') + depends_on("stuff") + depends_on("externaltool") def install(self, spec, prefix): - touch(join_path(prefix, 'an_installation_file')) + touch(join_path(prefix, "an_installation_file")) diff --git a/var/spack/repos/builtin.mock/packages/externaltool/package.py b/var/spack/repos/builtin.mock/packages/externaltool/package.py index 0be498ab12..123c347fc9 100644 --- a/var/spack/repos/builtin.mock/packages/externaltool/package.py +++ b/var/spack/repos/builtin.mock/packages/externaltool/package.py @@ -8,10 +8,10 @@ from spack.package import * class Externaltool(Package): homepage = "http://somewhere.com" - url = "http://somewhere.com/tool-1.0.tar.gz" + url = "http://somewhere.com/tool-1.0.tar.gz" - version('1.0', '1234567890abcdef1234567890abcdef') - version('0.9', '1234567890abcdef1234567890abcdef') - version('0.8.1', '1234567890abcdef1234567890abcdef') + version("1.0", "1234567890abcdef1234567890abcdef") + version("0.9", "1234567890abcdef1234567890abcdef") + version("0.8.1", "1234567890abcdef1234567890abcdef") - depends_on('externalprereq') + depends_on("externalprereq") diff --git a/var/spack/repos/builtin.mock/packages/externalvirtual/package.py b/var/spack/repos/builtin.mock/packages/externalvirtual/package.py index ab36db92ce..603c6c8d4f 100644 --- a/var/spack/repos/builtin.mock/packages/externalvirtual/package.py +++ b/var/spack/repos/builtin.mock/packages/externalvirtual/package.py @@ -8,11 +8,11 @@ from spack.package import * class Externalvirtual(Package): homepage = "http://somewhere.com" - url = "http://somewhere.com/stuff-1.0.tar.gz" + url = "http://somewhere.com/stuff-1.0.tar.gz" - version('1.0', '1234567890abcdef1234567890abcdef') - version('2.0', '234567890abcdef1234567890abcdef1') - version('2.1', '34567890abcdef1234567890abcdef12') - version('2.2', '4567890abcdef1234567890abcdef123') + version("1.0", "1234567890abcdef1234567890abcdef") + version("2.0", "234567890abcdef1234567890abcdef1") + version("2.1", "34567890abcdef1234567890abcdef12") + version("2.2", "4567890abcdef1234567890abcdef123") - provides('stuff', when='@1.0:') + provides("stuff", when="@1.0:") diff --git a/var/spack/repos/builtin.mock/packages/failing-build/package.py b/var/spack/repos/builtin.mock/packages/failing-build/package.py index 3ac8fb5210..2352488c61 100644 --- a/var/spack/repos/builtin.mock/packages/failing-build/package.py +++ b/var/spack/repos/builtin.mock/packages/failing-build/package.py @@ -10,9 +10,9 @@ class FailingBuild(Package): """This package has a trivial install method that fails.""" homepage = "http://www.example.com/trivial_install" - url = "http://www.unit-test-should-replace-this-url/trivial_install-1.0.tar.gz" + url = "http://www.unit-test-should-replace-this-url/trivial_install-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") def install(self, spec, prefix): raise InstallError("Expected failure.") diff --git a/var/spack/repos/builtin.mock/packages/failing-empty-install/package.py b/var/spack/repos/builtin.mock/packages/failing-empty-install/package.py index f068b64499..0e575aaa9e 100644 --- a/var/spack/repos/builtin.mock/packages/failing-empty-install/package.py +++ b/var/spack/repos/builtin.mock/packages/failing-empty-install/package.py @@ -7,10 +7,11 @@ from spack.package import * class FailingEmptyInstall(Package): """This package installs nothing, install should fail.""" + homepage = "http://www.example.com/trivial_install" - url = "http://www.unit-test-should-replace-this-url/trivial_install-1.0.tar.gz" + url = "http://www.unit-test-should-replace-this-url/trivial_install-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") def install(self, spec, prefix): pass diff --git a/var/spack/repos/builtin.mock/packages/fake/package.py b/var/spack/repos/builtin.mock/packages/fake/package.py index a51b02f129..e4cb5121d6 100644 --- a/var/spack/repos/builtin.mock/packages/fake/package.py +++ b/var/spack/repos/builtin.mock/packages/fake/package.py @@ -8,6 +8,6 @@ from spack.package import * class Fake(Package): homepage = "http://www.fake-spack-example.org" - url = "http://www.fake-spack-example.org/downloads/fake-1.0.tar.gz" + url = "http://www.fake-spack-example.org/downloads/fake-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") diff --git a/var/spack/repos/builtin.mock/packages/fetch-options/package.py b/var/spack/repos/builtin.mock/packages/fetch-options/package.py index 7f6e7d137e..62bf896e5f 100644 --- a/var/spack/repos/builtin.mock/packages/fetch-options/package.py +++ b/var/spack/repos/builtin.mock/packages/fetch-options/package.py @@ -11,12 +11,12 @@ class FetchOptions(Package): homepage = "http://www.fetch-options-example.com" - url = 'https://example.com/some/tarball-1.0.tar.gz' + url = "https://example.com/some/tarball-1.0.tar.gz" - fetch_options = {'timeout': 42, 'cookie': 'foobar'} - timeout = {'timeout': 65} - cookie = {'cookie': 'baz'} + fetch_options = {"timeout": 42, "cookie": "foobar"} + timeout = {"timeout": 65} + cookie = {"cookie": "baz"} - version('1.2', '00000000000000000000000000000012', fetch_options=cookie) - version('1.1', '00000000000000000000000000000011', fetch_options=timeout) - version('1.0', '00000000000000000000000000000010') + version("1.2", "00000000000000000000000000000012", fetch_options=cookie) + version("1.1", "00000000000000000000000000000011", fetch_options=timeout) + version("1.0", "00000000000000000000000000000010") diff --git a/var/spack/repos/builtin.mock/packages/fftw/package.py b/var/spack/repos/builtin.mock/packages/fftw/package.py index 237c725b2a..ff42370fe5 100644 --- a/var/spack/repos/builtin.mock/packages/fftw/package.py +++ b/var/spack/repos/builtin.mock/packages/fftw/package.py @@ -10,12 +10,13 @@ class Fftw(Package): cases with the old concretizer have been solved by the new ones. """ + homepage = "http://www.example.com" url = "http://www.example.com/fftw-1.0.tar.gz" - version(2.0, 'abcdef1234567890abcdef1234567890') - version(1.0, '1234567890abcdef1234567890abcdef') + version(2.0, "abcdef1234567890abcdef1234567890") + version(1.0, "1234567890abcdef1234567890abcdef") - variant('mpi', default=False, description='Enable MPI') + variant("mpi", default=False, description="Enable MPI") - depends_on('mpi', when='+mpi') + depends_on("mpi", when="+mpi") diff --git a/var/spack/repos/builtin.mock/packages/find-externals1/package.py b/var/spack/repos/builtin.mock/packages/find-externals1/package.py index 0b626d4f52..5d7ec0921b 100644 --- a/var/spack/repos/builtin.mock/packages/find-externals1/package.py +++ b/var/spack/repos/builtin.mock/packages/find-externals1/package.py @@ -10,27 +10,22 @@ from spack.package import * class FindExternals1(AutotoolsPackage): - executables = ['find-externals1-exe'] + executables = ["find-externals1-exe"] url = "http://www.example.com/find-externals-1.0.tar.gz" - version('1.0', 'abcdef1234567890abcdef1234567890') + version("1.0", "abcdef1234567890abcdef1234567890") @classmethod def determine_spec_details(cls, prefix, exes_in_prefix): - exe_to_path = dict( - (os.path.basename(p), p) for p in exes_in_prefix - ) - exes = [x for x in exe_to_path.keys() if 'find-externals1-exe' in x] + exe_to_path = dict((os.path.basename(p), p) for p in exes_in_prefix) + exes = [x for x in exe_to_path.keys() if "find-externals1-exe" in x] if not exes: return - exe = spack.util.executable.Executable( - exe_to_path[exes[0]]) - output = exe('--version', output=str) + exe = spack.util.executable.Executable(exe_to_path[exes[0]]) + output = exe("--version", output=str) if output: - match = re.search(r'find-externals1.*version\s+(\S+)', output) + match = re.search(r"find-externals1.*version\s+(\S+)", output) if match: version_str = match.group(1) - return Spec.from_detection( - 'find-externals1@{0}'.format(version_str) - ) + return Spec.from_detection("find-externals1@{0}".format(version_str)) diff --git a/var/spack/repos/builtin.mock/packages/flatten-deps/package.py b/var/spack/repos/builtin.mock/packages/flatten-deps/package.py index 4dacf0b14d..5e1ea4b63a 100644 --- a/var/spack/repos/builtin.mock/packages/flatten-deps/package.py +++ b/var/spack/repos/builtin.mock/packages/flatten-deps/package.py @@ -10,10 +10,10 @@ class FlattenDeps(Package): """Example install that flattens dependencies.""" homepage = "http://www.example.com" - url = "http://www.example.com/a-1.0.tar.gz" + url = "http://www.example.com/a-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") - depends_on('dependency-install') + depends_on("dependency-install") install = install_dependency_symlinks diff --git a/var/spack/repos/builtin.mock/packages/garply/package.py b/var/spack/repos/builtin.mock/packages/garply/package.py index 9efa93b98b..819da45286 100644 --- a/var/spack/repos/builtin.mock/packages/garply/package.py +++ b/var/spack/repos/builtin.mock/packages/garply/package.py @@ -15,10 +15,10 @@ class Garply(Package): homepage = "https://www.example.com" has_code = False - version('3.0.0') + version("3.0.0") def install(self, spec, prefix): - garply_h = '''#ifndef GARPLY_H_ + garply_h = """#ifndef GARPLY_H_ class Garply { @@ -33,8 +33,8 @@ public: }; #endif // GARPLY_H_ -''' - garply_cc = '''#include "garply.h" +""" + garply_cc = """#include "garply.h" #include "garply_version.h" #include <iostream> @@ -57,8 +57,8 @@ Garply::garplinate() const std::cout << "Garply config dir = %s" << std::endl; return get_version(); } -''' - garplinator_cc = '''#include "garply.h" +""" + garplinator_cc = """#include "garply.h" #include <iostream> int @@ -69,64 +69,104 @@ main() return 0; } -''' - garply_version_h = '''const int garply_version_major = %s; +""" + garply_version_h = """const int garply_version_major = %s; const int garply_version_minor = %s; -''' - mkdirp('%s/garply' % prefix.include) - mkdirp('%s/garply' % self.stage.source_path) - with open('%s/garply_version.h' % self.stage.source_path, 'w') as f: +""" + mkdirp("%s/garply" % prefix.include) + mkdirp("%s/garply" % self.stage.source_path) + with open("%s/garply_version.h" % self.stage.source_path, "w") as f: f.write(garply_version_h % (self.version[0], self.version[1:])) - with open('%s/garply/garply.h' % self.stage.source_path, 'w') as f: + with open("%s/garply/garply.h" % self.stage.source_path, "w") as f: f.write(garply_h) - with open('%s/garply/garply.cc' % self.stage.source_path, 'w') as f: + with open("%s/garply/garply.cc" % self.stage.source_path, "w") as f: f.write(garply_cc % prefix.config) - with open('%s/garply/garplinator.cc' % - self.stage.source_path, 'w') as f: + with open("%s/garply/garplinator.cc" % self.stage.source_path, "w") as f: f.write(garplinator_cc) - gpp = which('/usr/bin/g++') - if sys.platform == 'darwin': - gpp = which('/usr/bin/clang++') - gpp('-Dgarply_EXPORTS', - '-I%s' % self.stage.source_path, - '-O2', '-g', '-DNDEBUG', '-fPIC', - '-o', 'garply.cc.o', - '-c', '%s/garply/garply.cc' % self.stage.source_path) - gpp('-Dgarply_EXPORTS', - '-I%s' % self.stage.source_path, - '-O2', '-g', '-DNDEBUG', '-fPIC', - '-o', 'garplinator.cc.o', - '-c', '%s/garply/garplinator.cc' % self.stage.source_path) - if sys.platform == 'darwin': - gpp('-fPIC', '-O2', '-g', '-DNDEBUG', '-dynamiclib', - '-Wl,-headerpad_max_install_names', '-o', 'libgarply.dylib', - '-install_name', '@rpath/libgarply.dylib', - 'garply.cc.o') - gpp('-O2', '-g', '-DNDEBUG', '-Wl,-search_paths_first', - '-Wl,-headerpad_max_install_names', - 'garplinator.cc.o', '-o', 'garplinator', - '-Wl,-rpath,%s' % prefix.lib64, - 'libgarply.dylib') + gpp = which("/usr/bin/g++") + if sys.platform == "darwin": + gpp = which("/usr/bin/clang++") + gpp( + "-Dgarply_EXPORTS", + "-I%s" % self.stage.source_path, + "-O2", + "-g", + "-DNDEBUG", + "-fPIC", + "-o", + "garply.cc.o", + "-c", + "%s/garply/garply.cc" % self.stage.source_path, + ) + gpp( + "-Dgarply_EXPORTS", + "-I%s" % self.stage.source_path, + "-O2", + "-g", + "-DNDEBUG", + "-fPIC", + "-o", + "garplinator.cc.o", + "-c", + "%s/garply/garplinator.cc" % self.stage.source_path, + ) + if sys.platform == "darwin": + gpp( + "-fPIC", + "-O2", + "-g", + "-DNDEBUG", + "-dynamiclib", + "-Wl,-headerpad_max_install_names", + "-o", + "libgarply.dylib", + "-install_name", + "@rpath/libgarply.dylib", + "garply.cc.o", + ) + gpp( + "-O2", + "-g", + "-DNDEBUG", + "-Wl,-search_paths_first", + "-Wl,-headerpad_max_install_names", + "garplinator.cc.o", + "-o", + "garplinator", + "-Wl,-rpath,%s" % prefix.lib64, + "libgarply.dylib", + ) mkdirp(prefix.lib64) - copy('libgarply.dylib', '%s/libgarply.dylib' % prefix.lib64) - os.link('%s/libgarply.dylib' % prefix.lib64, - '%s/libgarply.dylib.3.0' % prefix.lib64) + copy("libgarply.dylib", "%s/libgarply.dylib" % prefix.lib64) + os.link("%s/libgarply.dylib" % prefix.lib64, "%s/libgarply.dylib.3.0" % prefix.lib64) else: - gpp('-fPIC', '-O2', '-g', '-DNDEBUG', '-shared', - '-Wl,-soname,libgarply.so', - '-o', 'libgarply.so', 'garply.cc.o') - gpp('-O2', '-g', '-DNDEBUG', '-rdynamic', - 'garplinator.cc.o', '-o', 'garplinator', - '-Wl,-rpath,%s' % prefix.lib64, - 'libgarply.so') + gpp( + "-fPIC", + "-O2", + "-g", + "-DNDEBUG", + "-shared", + "-Wl,-soname,libgarply.so", + "-o", + "libgarply.so", + "garply.cc.o", + ) + gpp( + "-O2", + "-g", + "-DNDEBUG", + "-rdynamic", + "garplinator.cc.o", + "-o", + "garplinator", + "-Wl,-rpath,%s" % prefix.lib64, + "libgarply.so", + ) mkdirp(prefix.lib64) - copy('libgarply.so', '%s/libgarply.so' % prefix.lib64) - os.link('%s/libgarply.so' % prefix.lib64, - '%s/libgarply.so.3.0' % prefix.lib64) - copy('garplinator', '%s/garplinator' % prefix.lib64) - copy('%s/garply/garply.h' % self.stage.source_path, - '%s/garply/garply.h' % prefix.include) + copy("libgarply.so", "%s/libgarply.so" % prefix.lib64) + os.link("%s/libgarply.so" % prefix.lib64, "%s/libgarply.so.3.0" % prefix.lib64) + copy("garplinator", "%s/garplinator" % prefix.lib64) + copy("%s/garply/garply.h" % self.stage.source_path, "%s/garply/garply.h" % prefix.include) mkdirp(prefix.bin) - copy('garply_version.h', '%s/garply_version.h' % prefix.bin) - os.symlink('%s/garplinator' % prefix.lib64, - '%s/garplinator' % prefix.bin) + copy("garply_version.h", "%s/garply_version.h" % prefix.bin) + os.symlink("%s/garplinator" % prefix.lib64, "%s/garplinator" % prefix.bin) diff --git a/var/spack/repos/builtin.mock/packages/gcc/package.py b/var/spack/repos/builtin.mock/packages/gcc/package.py index 0908431cb6..70dc78fe5e 100644 --- a/var/spack/repos/builtin.mock/packages/gcc/package.py +++ b/var/spack/repos/builtin.mock/packages/gcc/package.py @@ -10,17 +10,17 @@ class Gcc(Package): """Simple compiler package.""" homepage = "http://www.example.com" - url = "http://www.example.com/gcc-1.0.tar.gz" + url = "http://www.example.com/gcc-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') - version('2.0', 'abcdef0123456789abcdef0123456789') - version('3.0', 'def0123456789abcdef0123456789abc') + version("1.0", "0123456789abcdef0123456789abcdef") + version("2.0", "abcdef0123456789abcdef0123456789") + version("3.0", "def0123456789abcdef0123456789abc") - depends_on('conflict', when='@3.0') + depends_on("conflict", when="@3.0") def install(self, spec, prefix): # Create the minimal compiler that will fool `spack compiler find` mkdirp(prefix.bin) - with open(prefix.bin.gcc, 'w') as f: + with open(prefix.bin.gcc, "w") as f: f.write('#!/bin/bash\necho "%s"' % str(spec.version)) set_executable(prefix.bin.gcc) diff --git a/var/spack/repos/builtin.mock/packages/git-svn-top-level/package.py b/var/spack/repos/builtin.mock/packages/git-svn-top-level/package.py index e19b9bc7c7..d7a50ca289 100644 --- a/var/spack/repos/builtin.mock/packages/git-svn-top-level/package.py +++ b/var/spack/repos/builtin.mock/packages/git-svn-top-level/package.py @@ -8,10 +8,11 @@ from spack.package import * class GitSvnTopLevel(Package): """Mock package that uses git for fetching.""" + homepage = "http://www.git-fetch-example.com" # can't have two VCS fetchers. - git = 'https://example.com/some/git/repo' - svn = 'https://example.com/some/svn/repo' + git = "https://example.com/some/git/repo" + svn = "https://example.com/some/svn/repo" - version('2.0') + version("2.0") diff --git a/var/spack/repos/builtin.mock/packages/git-test-commit/package.py b/var/spack/repos/builtin.mock/packages/git-test-commit/package.py index 8a5c1e7eb7..1f49a08aaa 100644 --- a/var/spack/repos/builtin.mock/packages/git-test-commit/package.py +++ b/var/spack/repos/builtin.mock/packages/git-test-commit/package.py @@ -8,19 +8,20 @@ from spack.package import * class GitTestCommit(Package): """Mock package that tests installing specific commit""" + homepage = "http://www.git-fetch-example.com" # git='to-be-filled-in-by-test' - version('1.0', tag='v1.0') - version('1.1', tag='v1.1') - version('1.2', tag='1.2') # not a typo - version('2.0', tag='v2.0') + version("1.0", tag="v1.0") + version("1.1", tag="v1.1") + version("1.2", tag="1.2") # not a typo + version("2.0", tag="v2.0") def install(self, spec, prefix): # It is assumed for the test which installs this package, that it will # be using the earliest commit, which is contained in the range @:0 - assert spec.satisfies('@:0') + assert spec.satisfies("@:0") mkdir(prefix.bin) # This will only exist for some second commit - install('file.txt', prefix.bin) + install("file.txt", prefix.bin) diff --git a/var/spack/repos/builtin.mock/packages/git-test/package.py b/var/spack/repos/builtin.mock/packages/git-test/package.py index d46ac339f7..cc64d3c459 100644 --- a/var/spack/repos/builtin.mock/packages/git-test/package.py +++ b/var/spack/repos/builtin.mock/packages/git-test/package.py @@ -8,10 +8,11 @@ from spack.package import * class GitTest(Package): """Mock package that uses git for fetching.""" + homepage = "http://www.git-fetch-example.com" # To be set by test git = None submodules = True - version('git', git='to-be-filled-in-by-test') + version("git", git="to-be-filled-in-by-test") diff --git a/var/spack/repos/builtin.mock/packages/git-top-level/package.py b/var/spack/repos/builtin.mock/packages/git-top-level/package.py index ffdfd96797..03dcf43cb8 100644 --- a/var/spack/repos/builtin.mock/packages/git-top-level/package.py +++ b/var/spack/repos/builtin.mock/packages/git-top-level/package.py @@ -8,7 +8,8 @@ from spack.package import * class GitTopLevel(Package): """Mock package that uses git for fetching.""" + homepage = "http://www.git-fetch-example.com" - git = 'https://example.com/some/git/repo' - version('1.0') + git = "https://example.com/some/git/repo" + version("1.0") diff --git a/var/spack/repos/builtin.mock/packages/git-url-svn-top-level/package.py b/var/spack/repos/builtin.mock/packages/git-url-svn-top-level/package.py index d3f03eedf4..ce906927ab 100644 --- a/var/spack/repos/builtin.mock/packages/git-url-svn-top-level/package.py +++ b/var/spack/repos/builtin.mock/packages/git-url-svn-top-level/package.py @@ -8,11 +8,12 @@ from spack.package import * class GitUrlSvnTopLevel(Package): """Mock package that uses git for fetching.""" + homepage = "http://www.git-fetch-example.com" # can't have two VCS fetchers. - url = 'https://example.com/some/tarball-1.0.tar.gz' - git = 'https://example.com/some/git/repo' - svn = 'https://example.com/some/svn/repo' + url = "https://example.com/some/tarball-1.0.tar.gz" + git = "https://example.com/some/git/repo" + svn = "https://example.com/some/svn/repo" - version('2.0') + version("2.0") diff --git a/var/spack/repos/builtin.mock/packages/git-url-top-level/package.py b/var/spack/repos/builtin.mock/packages/git-url-top-level/package.py index 2798bad9f7..748483f3ad 100644 --- a/var/spack/repos/builtin.mock/packages/git-url-top-level/package.py +++ b/var/spack/repos/builtin.mock/packages/git-url-top-level/package.py @@ -13,50 +13,52 @@ class GitUrlTopLevel(Package): to the ``version`` directive. """ + homepage = "http://www.git-fetch-example.com" - git = 'https://example.com/some/git/repo' - url = 'https://example.com/some/tarball-1.0.tar.gz' + git = "https://example.com/some/git/repo" + url = "https://example.com/some/tarball-1.0.tar.gz" # These resolve to git fetchers - version('develop', branch='develop') - version('submodules', submodules=True) - version('3.4', commit='abc34') - version('3.3', branch='releases/v3.3', commit='abc33') - version('3.2', branch='releases/v3.2') - version('3.1', tag='v3.1', commit='abc31') - version('3.0', tag='v3.0') + version("develop", branch="develop") + version("submodules", submodules=True) + version("3.4", commit="abc34") + version("3.3", branch="releases/v3.3", commit="abc33") + version("3.2", branch="releases/v3.2") + version("3.1", tag="v3.1", commit="abc31") + version("3.0", tag="v3.0") # These resolve to URL fetchers version( - '2.3', '0000000000000000000000000000000000000000000000000000000000000023', - url='https://www.example.com/foo2.3.tar.gz', + "2.3", + "0000000000000000000000000000000000000000000000000000000000000023", + url="https://www.example.com/foo2.3.tar.gz", ) version( - '2.2', - sha256='0000000000000000000000000000000000000000000000000000000000000022', - url='https://www.example.com/foo2.2.tar.gz', + "2.2", + sha256="0000000000000000000000000000000000000000000000000000000000000022", + url="https://www.example.com/foo2.2.tar.gz", ) version( - '2.1', - sha256='0000000000000000000000000000000000000000000000000000000000000021', + "2.1", + sha256="0000000000000000000000000000000000000000000000000000000000000021", ) version( - '2.0', - '0000000000000000000000000000000000000000000000000000000000000020', + "2.0", + "0000000000000000000000000000000000000000000000000000000000000020", ) # These result in a FetcherConflict b/c we can't tell what to use version( - '1.3', - sha256='f66bbef3ccb8b06542c57d69804c5b0aba72051f693c17761ad8525786d259fa', - commit='abc13' + "1.3", + sha256="f66bbef3ccb8b06542c57d69804c5b0aba72051f693c17761ad8525786d259fa", + commit="abc13", ) version( - '1.2', - sha512='f66bbef3ccb8b06542c57d69804c5b0aba72051f693c17761ad8525786d259fa' - '9ed8f2e950a4fb8a4b936f33e689187784699357bc16e49f33dfcda8ab8b00e4', - branch='releases/v1.2' + "1.2", + sha512="f66bbef3ccb8b06542c57d69804c5b0aba72051f693c17761ad8525786d259fa" + "9ed8f2e950a4fb8a4b936f33e689187784699357bc16e49f33dfcda8ab8b00e4", + branch="releases/v1.2", ) - version('1.1', md5='00000000000000000000000000000011', tag='v1.1') - version('1.0', '00000000000000000000000000000011', tag='abc123') + version("1.1", md5="00000000000000000000000000000011", tag="v1.1") + version("1.0", "00000000000000000000000000000011", tag="abc123") diff --git a/var/spack/repos/builtin.mock/packages/gmt/package.py b/var/spack/repos/builtin.mock/packages/gmt/package.py index 74c28fb86a..54c0b06417 100644 --- a/var/spack/repos/builtin.mock/packages/gmt/package.py +++ b/var/spack/repos/builtin.mock/packages/gmt/package.py @@ -9,7 +9,7 @@ class Gmt(Package): url = "http://www.example.com/" url = "http://www.example.com/2.0.tar.gz" - version('2.0', 'abcdef1234567890abcdef1234567890') - version('1.0', 'abcdef1234567890abcdef1234567890') + version("2.0", "abcdef1234567890abcdef1234567890") + version("1.0", "abcdef1234567890abcdef1234567890") - depends_on('mvdefaults', when='@1.0') + depends_on("mvdefaults", when="@1.0") diff --git a/var/spack/repos/builtin.mock/packages/gnuconfig/package.py b/var/spack/repos/builtin.mock/packages/gnuconfig/package.py index 40465e4dbb..46530454c3 100644 --- a/var/spack/repos/builtin.mock/packages/gnuconfig/package.py +++ b/var/spack/repos/builtin.mock/packages/gnuconfig/package.py @@ -17,17 +17,17 @@ class Gnuconfig(Package): has_code = False - version('2021-08-14') + version("2021-08-14") def install(self, spec, prefix): - config_sub = join_path(prefix, 'config.sub') - config_guess = join_path(prefix, 'config.guess') + config_sub = join_path(prefix, "config.sub") + config_guess = join_path(prefix, "config.guess") # Create files - with open(config_sub, 'w') as f: + with open(config_sub, "w") as f: f.write("#!/bin/sh\necho gnuconfig version of config.sub") - with open(config_guess, 'w') as f: + with open(config_guess, "w") as f: f.write("#!/bin/sh\necho gnuconfig version of config.guess") # Make executable diff --git a/var/spack/repos/builtin.mock/packages/hash-test1/package.py b/var/spack/repos/builtin.mock/packages/hash-test1/package.py index 14d125a3e0..0f717006f0 100644 --- a/var/spack/repos/builtin.mock/packages/hash-test1/package.py +++ b/var/spack/repos/builtin.mock/packages/hash-test1/package.py @@ -9,30 +9,29 @@ from spack.package import * class HashTest1(Package): - """Used to test package hashing - """ + """Used to test package hashing""" homepage = "http://www.hashtest1.org" url = "http://www.hashtest1.org/downloads/hashtest1-1.1.tar.bz2" - version('1.1', 'a' * 32) - version('1.2', 'b' * 32) - version('1.3', 'c' * 32) - version('1.4', 'd' * 32) - version('1.5', 'd' * 32) - version('1.6', 'e' * 32) - version('1.7', 'f' * 32) + version("1.1", "a" * 32) + version("1.2", "b" * 32) + version("1.3", "c" * 32) + version("1.4", "d" * 32) + version("1.5", "d" * 32) + version("1.6", "e" * 32) + version("1.7", "f" * 32) - patch('patch1.patch', when="@1.1") - patch('patch2.patch', when="@1.4") + patch("patch1.patch", when="@1.1") + patch("patch2.patch", when="@1.4") - variant('variantx', default=False, description='Test variant X') - variant('varianty', default=False, description='Test variant Y') + variant("variantx", default=False, description="Test variant X") + variant("varianty", default=False, description="Test variant Y") def setup_dependent_build_environment(self, env, dependent_spec): pass - @when('@:1.4') + @when("@:1.4") def install(self, spec, prefix): print("install 1") os.listdir(os.getcwd()) @@ -40,13 +39,13 @@ class HashTest1(Package): # sanity_check_prefix requires something in the install directory mkdirp(prefix.bin) - @when('@1.5:') + @when("@1.5:") def install(self, spec, prefix): os.listdir(os.getcwd()) # sanity_check_prefix requires something in the install directory mkdirp(prefix.bin) - @when('@1.5,1.6') + @when("@1.5,1.6") def extra_phase(self, spec, prefix): pass diff --git a/var/spack/repos/builtin.mock/packages/hash-test2/package.py b/var/spack/repos/builtin.mock/packages/hash-test2/package.py index ef9b9f70ce..8081da49be 100644 --- a/var/spack/repos/builtin.mock/packages/hash-test2/package.py +++ b/var/spack/repos/builtin.mock/packages/hash-test2/package.py @@ -9,21 +9,20 @@ from spack.package import * class HashTest2(Package): - """Used to test package hashing - """ + """Used to test package hashing""" homepage = "http://www.hashtest2.org" url = "http://www.hashtest1.org/downloads/hashtest2-1.1.tar.bz2" - version('1.1', 'a' * 32) - version('1.2', 'b' * 32) - version('1.3', 'c' * 31 + 'x') # Source hash differs from hash-test1@1.3 - version('1.4', 'd' * 32) + version("1.1", "a" * 32) + version("1.2", "b" * 32) + version("1.3", "c" * 31 + "x") # Source hash differs from hash-test1@1.3 + version("1.4", "d" * 32) - patch('patch1.patch', when="@1.1") + patch("patch1.patch", when="@1.1") - variant('variantx', default=False, description='Test variant X') - variant('varianty', default=False, description='Test variant Y') + variant("variantx", default=False, description="Test variant X") + variant("varianty", default=False, description="Test variant Y") def setup_dependent_build_environment(self, env, dependent_spec): pass diff --git a/var/spack/repos/builtin.mock/packages/hash-test3/package.py b/var/spack/repos/builtin.mock/packages/hash-test3/package.py index 8a98522975..8e871e5319 100644 --- a/var/spack/repos/builtin.mock/packages/hash-test3/package.py +++ b/var/spack/repos/builtin.mock/packages/hash-test3/package.py @@ -9,25 +9,24 @@ from spack.package import * class HashTest3(Package): - """Used to test package hashing - """ + """Used to test package hashing""" homepage = "http://www.hashtest3.org" url = "http://www.hashtest1.org/downloads/hashtest3-1.1.tar.bz2" - version('1.2', 'b' * 32) - version('1.3', 'c' * 32) - version('1.5', 'd' * 32) - version('1.6', 'e' * 32) - version('1.7', 'f' * 32) + version("1.2", "b" * 32) + version("1.3", "c" * 32) + version("1.5", "d" * 32) + version("1.6", "e" * 32) + version("1.7", "f" * 32) - variant('variantx', default=False, description='Test variant X') - variant('varianty', default=False, description='Test variant Y') + variant("variantx", default=False, description="Test variant X") + variant("varianty", default=False, description="Test variant Y") def setup_dependent_build_environment(self, env, dependent_spec): pass - @when('@:1.4') + @when("@:1.4") def install(self, spec, prefix): print("install 1") os.listdir(os.getcwd()) @@ -35,14 +34,15 @@ class HashTest3(Package): # sanity_check_prefix requires something in the install directory mkdirp(prefix.bin) - @when('@1.5:') + @when("@1.5:") def install(self, spec, prefix): os.listdir(os.getcwd()) # sanity_check_prefix requires something in the install directory mkdirp(prefix.bin) - for _version_constraint in ['@1.5', '@1.6']: + for _version_constraint in ["@1.5", "@1.6"]: + @when(_version_constraint) def extra_phase(self, spec, prefix): pass diff --git a/var/spack/repos/builtin.mock/packages/hash-test4/package.py b/var/spack/repos/builtin.mock/packages/hash-test4/package.py index cd00d8f892..d73d493b18 100644 --- a/var/spack/repos/builtin.mock/packages/hash-test4/package.py +++ b/var/spack/repos/builtin.mock/packages/hash-test4/package.py @@ -8,13 +8,13 @@ from spack.package import * class HashTest4(Package): """This package isn't compared with others, but it contains constructs - that package hashing logic has tripped over in the past. + that package hashing logic has tripped over in the past. """ homepage = "http://www.hashtest4.org" url = "http://www.hashtest1.org/downloads/hashtest4-1.1.tar.bz2" - version('1.1', 'a' * 32) + version("1.1", "a" * 32) def install(self, spec, prefix): pass @@ -23,5 +23,4 @@ class HashTest4(Package): def examine_prefix(pkg): pass - run_after('install')( - examine_prefix) + run_after("install")(examine_prefix) diff --git a/var/spack/repos/builtin.mock/packages/hdf5/package.py b/var/spack/repos/builtin.mock/packages/hdf5/package.py index 1019340e6a..12d96d001f 100644 --- a/var/spack/repos/builtin.mock/packages/hdf5/package.py +++ b/var/spack/repos/builtin.mock/packages/hdf5/package.py @@ -9,10 +9,10 @@ from spack.package import * class Hdf5(Package): homepage = "http://www.llnl.gov" - url = "http://www.llnl.gov/hdf5-1.0.tar.gz" + url = "http://www.llnl.gov/hdf5-1.0.tar.gz" - version(2.3, '0123456789abcdef0123456789abcdef') + version(2.3, "0123456789abcdef0123456789abcdef") - variant('mpi', default=True, description='Enable mpi') + variant("mpi", default=True, description="Enable mpi") - depends_on('mpi', when='+mpi') + depends_on("mpi", when="+mpi") diff --git a/var/spack/repos/builtin.mock/packages/hg-test/package.py b/var/spack/repos/builtin.mock/packages/hg-test/package.py index 2afa5b7bb0..85806f7d6e 100644 --- a/var/spack/repos/builtin.mock/packages/hg-test/package.py +++ b/var/spack/repos/builtin.mock/packages/hg-test/package.py @@ -8,6 +8,7 @@ from spack.package import * class HgTest(Package): """Test package that does fetching with mercurial.""" + homepage = "http://www.hg-fetch-example.com" - version('hg', hg='to-be-filled-in-by-test') + version("hg", hg="to-be-filled-in-by-test") diff --git a/var/spack/repos/builtin.mock/packages/hg-top-level/package.py b/var/spack/repos/builtin.mock/packages/hg-top-level/package.py index 0ab5bb94d9..eaff260118 100644 --- a/var/spack/repos/builtin.mock/packages/hg-top-level/package.py +++ b/var/spack/repos/builtin.mock/packages/hg-top-level/package.py @@ -8,7 +8,8 @@ from spack.package import * class HgTopLevel(Package): """Test package that does fetching with mercurial.""" + homepage = "http://www.hg-fetch-example.com" - hg = 'https://example.com/some/hg/repo' - version('1.0') + hg = "https://example.com/some/hg/repo" + version("1.0") diff --git a/var/spack/repos/builtin.mock/packages/hpcviewer/package.py b/var/spack/repos/builtin.mock/packages/hpcviewer/package.py index 867e186fcc..573e15aee3 100644 --- a/var/spack/repos/builtin.mock/packages/hpcviewer/package.py +++ b/var/spack/repos/builtin.mock/packages/hpcviewer/package.py @@ -7,10 +7,11 @@ from spack.package import * class Hpcviewer(AutotoolsPackage): """Uses version-test-pkg, as a build dependency""" + homepage = "http://www.spack.org" url = "http://www.spack.org/downloads/aml-1.0.tar.gz" - version('2019.02', '0123456789abcdef0123456789abcdef') + version("2019.02", "0123456789abcdef0123456789abcdef") - depends_on('java@11:', type=('build', 'run'), when='@2021.0:') - depends_on('java@8', type=('build', 'run'), when='@:2020') + depends_on("java@11:", type=("build", "run"), when="@2021.0:") + depends_on("java@8", type=("build", "run"), when="@:2020") diff --git a/var/spack/repos/builtin.mock/packages/hwloc/package.py b/var/spack/repos/builtin.mock/packages/hwloc/package.py index bc15bbbf8a..5a6f0beb15 100644 --- a/var/spack/repos/builtin.mock/packages/hwloc/package.py +++ b/var/spack/repos/builtin.mock/packages/hwloc/package.py @@ -7,4 +7,4 @@ from spack.package import * class Hwloc(Package): - version('2.0.3') + version("2.0.3") diff --git a/var/spack/repos/builtin.mock/packages/hypre/package.py b/var/spack/repos/builtin.mock/packages/hypre/package.py index dba7a0cd7a..fe077f067d 100644 --- a/var/spack/repos/builtin.mock/packages/hypre/package.py +++ b/var/spack/repos/builtin.mock/packages/hypre/package.py @@ -8,11 +8,12 @@ from spack.package import * class Hypre(Package): """Hypre is included here as an example of a package that depends on - both LAPACK and BLAS.""" + both LAPACK and BLAS.""" + homepage = "http://www.openblas.net" - url = "http://github.com/xianyi/OpenBLAS/archive/v0.2.15.tar.gz" + url = "http://github.com/xianyi/OpenBLAS/archive/v0.2.15.tar.gz" - version('0.2.15', 'b1190f3d3471685f17cfd1ec1d252ac9') + version("0.2.15", "b1190f3d3471685f17cfd1ec1d252ac9") - depends_on('lapack') - depends_on('blas') + depends_on("lapack") + depends_on("blas") diff --git a/var/spack/repos/builtin.mock/packages/impossible-concretization/package.py b/var/spack/repos/builtin.mock/packages/impossible-concretization/package.py index 4bdfa8c3aa..c0f2ce8641 100644 --- a/var/spack/repos/builtin.mock/packages/impossible-concretization/package.py +++ b/var/spack/repos/builtin.mock/packages/impossible-concretization/package.py @@ -13,6 +13,6 @@ class ImpossibleConcretization(Package): homepage = "http://www.example.com" url = "http://www.example.com/example-1.0.tar.gz" - version(1.0, '0123456789abcdef0123456789abcdef') + version(1.0, "0123456789abcdef0123456789abcdef") - conflicts('target=x86_64:') + conflicts("target=x86_64:") diff --git a/var/spack/repos/builtin.mock/packages/indirect-mpich/package.py b/var/spack/repos/builtin.mock/packages/indirect-mpich/package.py index 1c38bcecf5..f9895fa837 100644 --- a/var/spack/repos/builtin.mock/packages/indirect-mpich/package.py +++ b/var/spack/repos/builtin.mock/packages/indirect-mpich/package.py @@ -8,13 +8,13 @@ from spack.package import * class IndirectMpich(Package): """Test case for a package that depends on MPI and one of its - dependencies requires a *particular version* of MPI. + dependencies requires a *particular version* of MPI. """ homepage = "http://www.example.com" - url = "http://www.example.com/indirect_mpich-1.0.tar.gz" + url = "http://www.example.com/indirect_mpich-1.0.tar.gz" - version(1.0, '0123456789abcdef0123456789abcdef') + version(1.0, "0123456789abcdef0123456789abcdef") - depends_on('mpi') - depends_on('direct-mpich') + depends_on("mpi") + depends_on("direct-mpich") diff --git a/var/spack/repos/builtin.mock/packages/installed-deps-a/package.py b/var/spack/repos/builtin.mock/packages/installed-deps-a/package.py index 281275a141..0a1b94d02a 100644 --- a/var/spack/repos/builtin.mock/packages/installed-deps-a/package.py +++ b/var/spack/repos/builtin.mock/packages/installed-deps-a/package.py @@ -8,6 +8,7 @@ from spack.package import * class InstalledDepsA(Package): """Used by test_installed_deps test case.""" + # a # / \ # b c b --> d build/link @@ -16,7 +17,7 @@ class InstalledDepsA(Package): # d e c --> e build/link homepage = "http://www.example.com" - url = "http://www.example.com/a-1.0.tar.gz" + url = "http://www.example.com/a-1.0.tar.gz" version("1", "0123456789abcdef0123456789abcdef") version("2", "abcdef0123456789abcdef0123456789") diff --git a/var/spack/repos/builtin.mock/packages/installed-deps-b/package.py b/var/spack/repos/builtin.mock/packages/installed-deps-b/package.py index de24108c08..f5990d46d3 100644 --- a/var/spack/repos/builtin.mock/packages/installed-deps-b/package.py +++ b/var/spack/repos/builtin.mock/packages/installed-deps-b/package.py @@ -8,6 +8,7 @@ from spack.package import * class InstalledDepsB(Package): """Used by test_installed_deps test case.""" + # a # / \ # b c b --> d build/link @@ -16,7 +17,7 @@ class InstalledDepsB(Package): # d e c --> e build/link homepage = "http://www.example.com" - url = "http://www.example.com/b-1.0.tar.gz" + url = "http://www.example.com/b-1.0.tar.gz" version("1", "0123456789abcdef0123456789abcdef") version("2", "abcdef0123456789abcdef0123456789") diff --git a/var/spack/repos/builtin.mock/packages/installed-deps-c/package.py b/var/spack/repos/builtin.mock/packages/installed-deps-c/package.py index 6d5ce3a5b5..5e4d05b135 100644 --- a/var/spack/repos/builtin.mock/packages/installed-deps-c/package.py +++ b/var/spack/repos/builtin.mock/packages/installed-deps-c/package.py @@ -8,6 +8,7 @@ from spack.package import * class InstalledDepsC(Package): """Used by test_installed_deps test case.""" + # a # / \ # b c b --> d build/link @@ -16,7 +17,7 @@ class InstalledDepsC(Package): # d e c --> e build/link homepage = "http://www.example.com" - url = "http://www.example.com/c-1.0.tar.gz" + url = "http://www.example.com/c-1.0.tar.gz" version("1", "0123456789abcdef0123456789abcdef") version("2", "abcdef0123456789abcdef0123456789") diff --git a/var/spack/repos/builtin.mock/packages/installed-deps-d/package.py b/var/spack/repos/builtin.mock/packages/installed-deps-d/package.py index 76eacab2b0..7dbb2feddd 100644 --- a/var/spack/repos/builtin.mock/packages/installed-deps-d/package.py +++ b/var/spack/repos/builtin.mock/packages/installed-deps-d/package.py @@ -8,6 +8,7 @@ from spack.package import * class InstalledDepsD(Package): """Used by test_installed_deps test case.""" + # a # / \ # b c b --> d build/link @@ -16,7 +17,7 @@ class InstalledDepsD(Package): # d e c --> e build/link homepage = "http://www.example.com" - url = "http://www.example.com/d-1.0.tar.gz" + url = "http://www.example.com/d-1.0.tar.gz" version("1", "0123456789abcdef0123456789abcdef") version("2", "abcdef0123456789abcdef0123456789") diff --git a/var/spack/repos/builtin.mock/packages/installed-deps-e/package.py b/var/spack/repos/builtin.mock/packages/installed-deps-e/package.py index a3dfb90d6a..a148d83395 100644 --- a/var/spack/repos/builtin.mock/packages/installed-deps-e/package.py +++ b/var/spack/repos/builtin.mock/packages/installed-deps-e/package.py @@ -8,6 +8,7 @@ from spack.package import * class InstalledDepsE(Package): """Used by test_installed_deps test case.""" + # a # / \ # b c b --> d build/link @@ -16,7 +17,7 @@ class InstalledDepsE(Package): # d e c --> e build/link homepage = "http://www.example.com" - url = "http://www.example.com/e-1.0.tar.gz" + url = "http://www.example.com/e-1.0.tar.gz" version("1", "0123456789abcdef0123456789abcdef") version("2", "abcdef0123456789abcdef0123456789") diff --git a/var/spack/repos/builtin.mock/packages/invalid-github-patch-url/package.py b/var/spack/repos/builtin.mock/packages/invalid-github-patch-url/package.py index 216ba023ba..932910513c 100644 --- a/var/spack/repos/builtin.mock/packages/invalid-github-patch-url/package.py +++ b/var/spack/repos/builtin.mock/packages/invalid-github-patch-url/package.py @@ -12,9 +12,9 @@ class InvalidGithubPatchUrl(Package): homepage = "http://www.example.com" url = "http://www.example.com/patch-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") patch( - 'https://github.com/spack/spack/commit/cc76c0f5f9f8021cfb7423a226bd431c00d791ce.patch', - sha256='6057c3a8d50a23e93e5642be5a78df1e45d7de85446c2d7a63e3d0d88712b369', + "https://github.com/spack/spack/commit/cc76c0f5f9f8021cfb7423a226bd431c00d791ce.patch", + sha256="6057c3a8d50a23e93e5642be5a78df1e45d7de85446c2d7a63e3d0d88712b369", ) diff --git a/var/spack/repos/builtin.mock/packages/leaf-adds-virtual/package.py b/var/spack/repos/builtin.mock/packages/leaf-adds-virtual/package.py index ee9397f5e8..a5526351c7 100644 --- a/var/spack/repos/builtin.mock/packages/leaf-adds-virtual/package.py +++ b/var/spack/repos/builtin.mock/packages/leaf-adds-virtual/package.py @@ -9,7 +9,7 @@ class LeafAddsVirtual(Package): url = "http://www.example.com/" url = "http://www.example.com/2.0.tar.gz" - version('2.0', 'abcdef1234567890abcdef1234567890') - version('1.0', 'abcdef1234567890abcdef1234567890') + version("2.0", "abcdef1234567890abcdef1234567890") + version("1.0", "abcdef1234567890abcdef1234567890") - depends_on('blas', when='@2.0') + depends_on("blas", when="@2.0") diff --git a/var/spack/repos/builtin.mock/packages/libdwarf/package.py b/var/spack/repos/builtin.mock/packages/libdwarf/package.py index 6888229653..3071463589 100644 --- a/var/spack/repos/builtin.mock/packages/libdwarf/package.py +++ b/var/spack/repos/builtin.mock/packages/libdwarf/package.py @@ -6,18 +6,18 @@ from spack.package import * # Only build certain parts of dwarf because the other ones break. -dwarf_dirs = ['libdwarf', 'dwarfdump2'] +dwarf_dirs = ["libdwarf", "dwarfdump2"] class Libdwarf(Package): homepage = "http://www.prevanders.net/dwarf.html" - url = "http://www.prevanders.net/libdwarf-20130729.tar.gz" + url = "http://www.prevanders.net/libdwarf-20130729.tar.gz" list_url = homepage version(20130729, "64b42692e947d5180e162e46c689dfbf") - version(20130207, '0123456789abcdef0123456789abcdef') - version(20111030, '0123456789abcdef0123456789abcdef') - version(20070703, '0123456789abcdef0123456789abcdef') + version(20130207, "0123456789abcdef0123456789abcdef") + version(20111030, "0123456789abcdef0123456789abcdef") + version(20070703, "0123456789abcdef0123456789abcdef") depends_on("libelf") diff --git a/var/spack/repos/builtin.mock/packages/libelf/package.py b/var/spack/repos/builtin.mock/packages/libelf/package.py index 59a670079b..aab43e80f0 100644 --- a/var/spack/repos/builtin.mock/packages/libelf/package.py +++ b/var/spack/repos/builtin.mock/packages/libelf/package.py @@ -8,13 +8,13 @@ from spack.package import * class Libelf(Package): homepage = "http://www.mr511.de/software/english.html" - url = "http://www.mr511.de/software/libelf-0.8.13.tar.gz" + url = "http://www.mr511.de/software/libelf-0.8.13.tar.gz" - version('0.8.13', '4136d7b4c04df68b686570afa26988ac') - version('0.8.12', 'e21f8273d9f5f6d43a59878dc274fec7') - version('0.8.10', '9db4d36c283d9790d8fa7df1f4d7b4d9') + version("0.8.13", "4136d7b4c04df68b686570afa26988ac") + version("0.8.12", "e21f8273d9f5f6d43a59878dc274fec7") + version("0.8.10", "9db4d36c283d9790d8fa7df1f4d7b4d9") - patch('local.patch', when='@0.8.10') + patch("local.patch", when="@0.8.10") def install(self, spec, prefix): touch(prefix.libelf) diff --git a/var/spack/repos/builtin.mock/packages/libtool-deletion/package.py b/var/spack/repos/builtin.mock/packages/libtool-deletion/package.py index 1c7e2afbd8..a169a78d2e 100644 --- a/var/spack/repos/builtin.mock/packages/libtool-deletion/package.py +++ b/var/spack/repos/builtin.mock/packages/libtool-deletion/package.py @@ -11,9 +11,10 @@ class LibtoolDeletion(AutotoolsPackage): """Mock AutotoolsPackage to check proper deletion of libtool archives. """ + homepage = "https://www.gnu.org/software/make/" url = "http://www.example.com/libtool-deletion-1.0.tar.gz" - version('4.2.1', sha256='e40b8f018c1da64edd1cc9a6fce5fa63b2e707e404e20cad91fbae337c98a5b7') + version("4.2.1", sha256="e40b8f018c1da64edd1cc9a6fce5fa63b2e707e404e20cad91fbae337c98a5b7") def do_stage(self): mkdirp(self.stage.source_path) @@ -34,4 +35,4 @@ class LibtoolDeletion(AutotoolsPackage): @property def libtool_archive_file(self): - return os.path.join(str(self.prefix.lib), 'libfoo.la') + return os.path.join(str(self.prefix.lib), "libfoo.la") diff --git a/var/spack/repos/builtin.mock/packages/low-priority-provider/package.py b/var/spack/repos/builtin.mock/packages/low-priority-provider/package.py index 62d2e98d65..83e9be98e7 100644 --- a/var/spack/repos/builtin.mock/packages/low-priority-provider/package.py +++ b/var/spack/repos/builtin.mock/packages/low-priority-provider/package.py @@ -12,7 +12,7 @@ class LowPriorityProvider(Package): homepage = "http://www.example.com" url = "http://www.example.com/a-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") - provides('lapack') - provides('mpi') + provides("lapack") + provides("mpi") diff --git a/var/spack/repos/builtin.mock/packages/maintainers-1/package.py b/var/spack/repos/builtin.mock/packages/maintainers-1/package.py index 9a36d3b052..06d8694278 100644 --- a/var/spack/repos/builtin.mock/packages/maintainers-1/package.py +++ b/var/spack/repos/builtin.mock/packages/maintainers-1/package.py @@ -10,8 +10,8 @@ class Maintainers1(Package): """Package with a maintainers field.""" homepage = "http://www.example.com" - url = "http://www.example.com/maintainers-1.0.tar.gz" + url = "http://www.example.com/maintainers-1.0.tar.gz" - maintainers = ['user1', 'user2'] + maintainers = ["user1", "user2"] - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") diff --git a/var/spack/repos/builtin.mock/packages/maintainers-2/package.py b/var/spack/repos/builtin.mock/packages/maintainers-2/package.py index b5c78d9ccc..181306d414 100644 --- a/var/spack/repos/builtin.mock/packages/maintainers-2/package.py +++ b/var/spack/repos/builtin.mock/packages/maintainers-2/package.py @@ -10,8 +10,8 @@ class Maintainers2(Package): """A second package with a maintainers field.""" homepage = "http://www.example.com" - url = "http://www.example.com/maintainers2-1.0.tar.gz" + url = "http://www.example.com/maintainers2-1.0.tar.gz" - maintainers = ['user2', 'user3'] + maintainers = ["user2", "user3"] - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") diff --git a/var/spack/repos/builtin.mock/packages/many-virtual-consumer/package.py b/var/spack/repos/builtin.mock/packages/many-virtual-consumer/package.py index f056c9a65e..74d7cc6514 100644 --- a/var/spack/repos/builtin.mock/packages/many-virtual-consumer/package.py +++ b/var/spack/repos/builtin.mock/packages/many-virtual-consumer/package.py @@ -7,15 +7,16 @@ from spack.package import * class ManyVirtualConsumer(Package): """PAckage that depends on many virtual packages""" + url = "http://www.example.com/" url = "http://www.example.com/2.0.tar.gz" - version('1.0', 'abcdef1234567890abcdef1234567890') + version("1.0", "abcdef1234567890abcdef1234567890") - depends_on('mpi') - depends_on('lapack') + depends_on("mpi") + depends_on("lapack") # This directive is an example of imposing a constraint on a # dependency is that dependency is in the DAG. This pattern # is mainly used with virtual providers. - depends_on('low-priority-provider@1.0', when='^low-priority-provider') + depends_on("low-priority-provider@1.0", when="^low-priority-provider") diff --git a/var/spack/repos/builtin.mock/packages/middle-adds-virtual/package.py b/var/spack/repos/builtin.mock/packages/middle-adds-virtual/package.py index 990e0807f8..1eb9c75420 100644 --- a/var/spack/repos/builtin.mock/packages/middle-adds-virtual/package.py +++ b/var/spack/repos/builtin.mock/packages/middle-adds-virtual/package.py @@ -9,6 +9,6 @@ class MiddleAddsVirtual(Package): url = "http://www.example.com/" url = "http://www.example.com/2.0.tar.gz" - version('1.0', 'abcdef1234567890abcdef1234567890') + version("1.0", "abcdef1234567890abcdef1234567890") - depends_on('leaf-adds-virtual') + depends_on("leaf-adds-virtual") diff --git a/var/spack/repos/builtin.mock/packages/mirror-gnu-broken/package.py b/var/spack/repos/builtin.mock/packages/mirror-gnu-broken/package.py index 619d432c04..a9f46edac3 100644 --- a/var/spack/repos/builtin.mock/packages/mirror-gnu-broken/package.py +++ b/var/spack/repos/builtin.mock/packages/mirror-gnu-broken/package.py @@ -10,6 +10,6 @@ class MirrorGnuBroken(AutotoolsPackage, GNUMirrorPackage): """Simple GNU package""" homepage = "https://www.gnu.org/software/make/" - url = "https://ftpmirror.gnu.org/make/make-4.2.1.tar.gz" + url = "https://ftpmirror.gnu.org/make/make-4.2.1.tar.gz" - version('4.2.1', sha256='e40b8f018c1da64edd1cc9a6fce5fa63b2e707e404e20cad91fbae337c98a5b7') + version("4.2.1", sha256="e40b8f018c1da64edd1cc9a6fce5fa63b2e707e404e20cad91fbae337c98a5b7") diff --git a/var/spack/repos/builtin.mock/packages/mirror-gnu/package.py b/var/spack/repos/builtin.mock/packages/mirror-gnu/package.py index 89b58ecec3..00e2a4ecab 100644 --- a/var/spack/repos/builtin.mock/packages/mirror-gnu/package.py +++ b/var/spack/repos/builtin.mock/packages/mirror-gnu/package.py @@ -12,4 +12,4 @@ class MirrorGnu(AutotoolsPackage, GNUMirrorPackage): homepage = "https://www.gnu.org/software/make/" gnu_mirror_path = "make/make-4.2.1.tar.gz" - version('4.2.1', sha256='e40b8f018c1da64edd1cc9a6fce5fa63b2e707e404e20cad91fbae337c98a5b7') + version("4.2.1", sha256="e40b8f018c1da64edd1cc9a6fce5fa63b2e707e404e20cad91fbae337c98a5b7") diff --git a/var/spack/repos/builtin.mock/packages/mirror-sourceforge-broken/package.py b/var/spack/repos/builtin.mock/packages/mirror-sourceforge-broken/package.py index 558e329ed8..fd1e59b5e2 100644 --- a/var/spack/repos/builtin.mock/packages/mirror-sourceforge-broken/package.py +++ b/var/spack/repos/builtin.mock/packages/mirror-sourceforge-broken/package.py @@ -10,6 +10,6 @@ class MirrorSourceforgeBroken(AutotoolsPackage, SourceforgePackage): """Simple sourceforge.net package""" homepage = "http://www.tcl.tk" - url = "http://prdownloads.sourceforge.net/tcl/tcl8.6.5-src.tar.gz" + url = "http://prdownloads.sourceforge.net/tcl/tcl8.6.5-src.tar.gz" - version('8.6.8', sha256='c43cb0c1518ce42b00e7c8f6eaddd5195c53a98f94adc717234a65cbcfd3f96a') + version("8.6.8", sha256="c43cb0c1518ce42b00e7c8f6eaddd5195c53a98f94adc717234a65cbcfd3f96a") diff --git a/var/spack/repos/builtin.mock/packages/mirror-sourceforge/package.py b/var/spack/repos/builtin.mock/packages/mirror-sourceforge/package.py index a012be1477..b465e09ec7 100644 --- a/var/spack/repos/builtin.mock/packages/mirror-sourceforge/package.py +++ b/var/spack/repos/builtin.mock/packages/mirror-sourceforge/package.py @@ -12,4 +12,4 @@ class MirrorSourceforge(AutotoolsPackage, SourceforgePackage): homepage = "http://www.tcl.tk" sourceforge_mirror_path = "tcl/tcl8.6.5-src.tar.gz" - version('8.6.8', sha256='c43cb0c1518ce42b00e7c8f6eaddd5195c53a98f94adc717234a65cbcfd3f96a') + version("8.6.8", sha256="c43cb0c1518ce42b00e7c8f6eaddd5195c53a98f94adc717234a65cbcfd3f96a") diff --git a/var/spack/repos/builtin.mock/packages/mirror-sourceware-broken/mirror-gnu-broken/package.py b/var/spack/repos/builtin.mock/packages/mirror-sourceware-broken/mirror-gnu-broken/package.py index 619d432c04..a9f46edac3 100644 --- a/var/spack/repos/builtin.mock/packages/mirror-sourceware-broken/mirror-gnu-broken/package.py +++ b/var/spack/repos/builtin.mock/packages/mirror-sourceware-broken/mirror-gnu-broken/package.py @@ -10,6 +10,6 @@ class MirrorGnuBroken(AutotoolsPackage, GNUMirrorPackage): """Simple GNU package""" homepage = "https://www.gnu.org/software/make/" - url = "https://ftpmirror.gnu.org/make/make-4.2.1.tar.gz" + url = "https://ftpmirror.gnu.org/make/make-4.2.1.tar.gz" - version('4.2.1', sha256='e40b8f018c1da64edd1cc9a6fce5fa63b2e707e404e20cad91fbae337c98a5b7') + version("4.2.1", sha256="e40b8f018c1da64edd1cc9a6fce5fa63b2e707e404e20cad91fbae337c98a5b7") diff --git a/var/spack/repos/builtin.mock/packages/mirror-sourceware-broken/package.py b/var/spack/repos/builtin.mock/packages/mirror-sourceware-broken/package.py index c2a63e3ab4..2c5f344b92 100644 --- a/var/spack/repos/builtin.mock/packages/mirror-sourceware-broken/package.py +++ b/var/spack/repos/builtin.mock/packages/mirror-sourceware-broken/package.py @@ -10,6 +10,6 @@ class MirrorSourcewareBroken(AutotoolsPackage, SourcewarePackage): """Simple sourceware.org package""" homepage = "https://sourceware.org/bzip2/" - url = "https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz" + url = "https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz" - version('1.0.8', sha256='ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269') + version("1.0.8", sha256="ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269") diff --git a/var/spack/repos/builtin.mock/packages/mirror-sourceware/package.py b/var/spack/repos/builtin.mock/packages/mirror-sourceware/package.py index 5c314119d8..5a45ac4d0a 100644 --- a/var/spack/repos/builtin.mock/packages/mirror-sourceware/package.py +++ b/var/spack/repos/builtin.mock/packages/mirror-sourceware/package.py @@ -12,4 +12,4 @@ class MirrorSourceware(AutotoolsPackage, SourcewarePackage): homepage = "https://sourceware.org/bzip2/" sourceware_mirror_path = "bzip2/bzip2-1.0.8.tar.gz" - version('1.0.8', sha256='ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269') + version("1.0.8", sha256="ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269") diff --git a/var/spack/repos/builtin.mock/packages/mirror-xorg-broken/package.py b/var/spack/repos/builtin.mock/packages/mirror-xorg-broken/package.py index ebc25fb5c8..dc181eb50c 100644 --- a/var/spack/repos/builtin.mock/packages/mirror-xorg-broken/package.py +++ b/var/spack/repos/builtin.mock/packages/mirror-xorg-broken/package.py @@ -10,6 +10,6 @@ class MirrorXorgBroken(AutotoolsPackage, XorgPackage): """Simple x.org package""" homepage = "http://cgit.freedesktop.org/xorg/util/macros/" - url = "https://www.x.org/archive/individual/util/util-macros-1.19.1.tar.bz2" + url = "https://www.x.org/archive/individual/util/util-macros-1.19.1.tar.bz2" - version('1.19.1', sha256='18d459400558f4ea99527bc9786c033965a3db45bf4c6a32eefdc07aa9e306a6') + version("1.19.1", sha256="18d459400558f4ea99527bc9786c033965a3db45bf4c6a32eefdc07aa9e306a6") diff --git a/var/spack/repos/builtin.mock/packages/mirror-xorg/package.py b/var/spack/repos/builtin.mock/packages/mirror-xorg/package.py index c48e1a8cf4..f75a0d0dff 100644 --- a/var/spack/repos/builtin.mock/packages/mirror-xorg/package.py +++ b/var/spack/repos/builtin.mock/packages/mirror-xorg/package.py @@ -12,4 +12,4 @@ class MirrorXorg(AutotoolsPackage, XorgPackage): homepage = "http://cgit.freedesktop.org/xorg/util/macros/" xorg_mirror_path = "util/util-macros-1.19.1.tar.bz2" - version('1.19.1', sha256='18d459400558f4ea99527bc9786c033965a3db45bf4c6a32eefdc07aa9e306a6') + version("1.19.1", sha256="18d459400558f4ea99527bc9786c033965a3db45bf4c6a32eefdc07aa9e306a6") diff --git a/var/spack/repos/builtin.mock/packages/missing-dependency/package.py b/var/spack/repos/builtin.mock/packages/missing-dependency/package.py index a3361a51b3..78a5e2acf0 100644 --- a/var/spack/repos/builtin.mock/packages/missing-dependency/package.py +++ b/var/spack/repos/builtin.mock/packages/missing-dependency/package.py @@ -10,9 +10,9 @@ class MissingDependency(Package): """Package with a dependency that does not exist.""" homepage = "http://www.example.com" - url = "http://www.example.com/missing-dependency-1.0.tar.gz" + url = "http://www.example.com/missing-dependency-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") # intentionally missing to test possible_dependencies() depends_on("this-is-a-missing-dependency") diff --git a/var/spack/repos/builtin.mock/packages/mixedversions/package.py b/var/spack/repos/builtin.mock/packages/mixedversions/package.py index 91a8ed8120..4529b807ef 100644 --- a/var/spack/repos/builtin.mock/packages/mixedversions/package.py +++ b/var/spack/repos/builtin.mock/packages/mixedversions/package.py @@ -9,6 +9,6 @@ from spack.package import * class Mixedversions(Package): url = "http://www.fake-mixedversions.org/downloads/mixedversions-1.0.tar.gz" - version('2.0.1', '0000000000000000000000000000000c') - version('2.0', '0000000000000000000000000000000b') - version('1.0.1', '0000000000000000000000000000000a') + version("2.0.1", "0000000000000000000000000000000c") + version("2.0", "0000000000000000000000000000000b") + version("1.0.1", "0000000000000000000000000000000a") diff --git a/var/spack/repos/builtin.mock/packages/modifies-run-env/package.py b/var/spack/repos/builtin.mock/packages/modifies-run-env/package.py index fa7fe0e134..09270eafb8 100644 --- a/var/spack/repos/builtin.mock/packages/modifies-run-env/package.py +++ b/var/spack/repos/builtin.mock/packages/modifies-run-env/package.py @@ -10,12 +10,12 @@ class ModifiesRunEnv(Package): """Dependency package which needs to make shell modifications to run""" homepage = "http://www.example.com" - url = "http://www.example.com/a-1.0.tar.gz" + url = "http://www.example.com/a-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") def setup_run_environment(self, env): - env.set('DEPENDENCY_ENV_VAR', '1') + env.set("DEPENDENCY_ENV_VAR", "1") def install(self, spec, prefix): mkdirp(prefix.bin) diff --git a/var/spack/repos/builtin.mock/packages/module-path-separator/package.py b/var/spack/repos/builtin.mock/packages/module-path-separator/package.py index a45fb7f5d0..5a3ad1169a 100644 --- a/var/spack/repos/builtin.mock/packages/module-path-separator/package.py +++ b/var/spack/repos/builtin.mock/packages/module-path-separator/package.py @@ -8,9 +8,9 @@ from spack.package import * class ModulePathSeparator(Package): homepage = "http://www.llnl.gov" - url = "http://www.llnl.gov/module-path-separator-1.0.tar.gz" + url = "http://www.llnl.gov/module-path-separator-1.0.tar.gz" - version(1.0, '0123456789abcdef0123456789abcdef') + version(1.0, "0123456789abcdef0123456789abcdef") def setup_run_environment(self, env): env.append_path("COLON", "foo") diff --git a/var/spack/repos/builtin.mock/packages/mpich/package.py b/var/spack/repos/builtin.mock/packages/mpich/package.py index 4a6897572e..285bd7bf94 100644 --- a/var/spack/repos/builtin.mock/packages/mpich/package.py +++ b/var/spack/repos/builtin.mock/packages/mpich/package.py @@ -7,25 +7,24 @@ from spack.package import * class Mpich(Package): - homepage = "http://www.mpich.org" - url = "http://www.mpich.org/static/downloads/3.0.4/mpich-3.0.4.tar.gz" - list_url = "http://www.mpich.org/static/downloads/" + homepage = "http://www.mpich.org" + url = "http://www.mpich.org/static/downloads/3.0.4/mpich-3.0.4.tar.gz" + list_url = "http://www.mpich.org/static/downloads/" list_depth = 2 - tags = ['tag1', 'tag2'] + tags = ["tag1", "tag2"] - variant('debug', default=False, - description="Compile MPICH with debug flags.") + variant("debug", default=False, description="Compile MPICH with debug flags.") - version('3.0.4', '9c5d5d4fe1e17dd12153f40bc5b6dbc0') - version('3.0.3', '0123456789abcdef0123456789abcdef') - version('3.0.2', '0123456789abcdef0123456789abcdef') - version('3.0.1', '0123456789abcdef0123456789abcdef') - version('3.0', '0123456789abcdef0123456789abcdef') - version('1.0', '0123456789abcdef0123456789abcdef') + version("3.0.4", "9c5d5d4fe1e17dd12153f40bc5b6dbc0") + version("3.0.3", "0123456789abcdef0123456789abcdef") + version("3.0.2", "0123456789abcdef0123456789abcdef") + version("3.0.1", "0123456789abcdef0123456789abcdef") + version("3.0", "0123456789abcdef0123456789abcdef") + version("1.0", "0123456789abcdef0123456789abcdef") - provides('mpi@:3', when='@3:') - provides('mpi@:1', when='@:1') + provides("mpi@:3", when="@3:") + provides("mpi@:1", when="@:1") def install(self, spec, prefix): touch(prefix.mpich) diff --git a/var/spack/repos/builtin.mock/packages/mpich2/package.py b/var/spack/repos/builtin.mock/packages/mpich2/package.py index 7517c11284..049f956e57 100644 --- a/var/spack/repos/builtin.mock/packages/mpich2/package.py +++ b/var/spack/repos/builtin.mock/packages/mpich2/package.py @@ -7,23 +7,23 @@ from spack.package import * class Mpich2(Package): - homepage = "http://www.mpich.org" - url = "http://www.mpich.org/static/downloads/1.5/mpich2-1.5.tar.gz" - list_url = "http://www.mpich.org/static/downloads/" + homepage = "http://www.mpich.org" + url = "http://www.mpich.org/static/downloads/1.5/mpich2-1.5.tar.gz" + list_url = "http://www.mpich.org/static/downloads/" list_depth = 2 - tags = ['tag1', 'tag3'] + tags = ["tag1", "tag3"] - version('1.5', '9c5d5d4fe1e17dd12153f40bc5b6dbc0') - version('1.4', '0123456789abcdef0123456789abcdef') - version('1.3', '0123456789abcdef0123456789abcdef') - version('1.2', '0123456789abcdef0123456789abcdef') - version('1.1', '0123456789abcdef0123456789abcdef') - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.5", "9c5d5d4fe1e17dd12153f40bc5b6dbc0") + version("1.4", "0123456789abcdef0123456789abcdef") + version("1.3", "0123456789abcdef0123456789abcdef") + version("1.2", "0123456789abcdef0123456789abcdef") + version("1.1", "0123456789abcdef0123456789abcdef") + version("1.0", "0123456789abcdef0123456789abcdef") - provides('mpi@:2.0') - provides('mpi@:2.1', when='@1.1:') - provides('mpi@:2.2', when='@1.2:') + provides("mpi@:2.0") + provides("mpi@:2.1", when="@1.1:") + provides("mpi@:2.2", when="@1.2:") def install(self, spec, prefix): configure("--prefix=%s" % prefix) diff --git a/var/spack/repos/builtin.mock/packages/mpileaks/package.py b/var/spack/repos/builtin.mock/packages/mpileaks/package.py index 21e6a4f1c9..2cb2e376a9 100644 --- a/var/spack/repos/builtin.mock/packages/mpileaks/package.py +++ b/var/spack/repos/builtin.mock/packages/mpileaks/package.py @@ -8,17 +8,17 @@ from spack.package import * class Mpileaks(Package): homepage = "http://www.llnl.gov" - url = "http://www.llnl.gov/mpileaks-1.0.tar.gz" + url = "http://www.llnl.gov/mpileaks-1.0.tar.gz" - version(1.0, '0123456789abcdef0123456789abcdef') - version(2.1, '0123456789abcdef0123456789abcdef') - version(2.2, '0123456789abcdef0123456789abcdef') - version(2.3, '0123456789abcdef0123456789abcdef') + version(1.0, "0123456789abcdef0123456789abcdef") + version(2.1, "0123456789abcdef0123456789abcdef") + version(2.2, "0123456789abcdef0123456789abcdef") + version(2.3, "0123456789abcdef0123456789abcdef") - variant('debug', default=False, description='Debug variant') - variant('opt', default=False, description='Optimized variant') - variant('shared', default=True, description='Build shared library') - variant('static', default=True, description='Build static library') + variant("debug", default=False, description="Debug variant") + variant("opt", default=False, description="Optimized variant") + variant("shared", default=True, description="Build shared library") + variant("static", default=True, description="Build static library") depends_on("mpi") depends_on("callpath") @@ -31,4 +31,4 @@ class Mpileaks(Package): mkdirp(prefix.man) def setup_run_environment(self, env): - env.set('FOOBAR', self.name) + env.set("FOOBAR", self.name) diff --git a/var/spack/repos/builtin.mock/packages/multi-provider-mpi/package.py b/var/spack/repos/builtin.mock/packages/multi-provider-mpi/package.py index 33c1091983..a486118793 100644 --- a/var/spack/repos/builtin.mock/packages/multi-provider-mpi/package.py +++ b/var/spack/repos/builtin.mock/packages/multi-provider-mpi/package.py @@ -8,22 +8,23 @@ from spack.package import * class MultiProviderMpi(Package): """This is a fake MPI package used to test packages providing multiple - virtuals at the same version.""" + virtuals at the same version.""" + homepage = "http://www.spack-fake-mpi.org" - url = "http://www.spack-fake-mpi.org/downloads/multi-mpi-1.0.tar.gz" + url = "http://www.spack-fake-mpi.org/downloads/multi-mpi-1.0.tar.gz" - version('2.0.0', '0123456789abcdef0123456789abcdef') - version('1.10.3', '0123456789abcdef0123456789abcdef') - version('1.10.2', '0123456789abcdef0123456789abcdef') - version('1.10.1', '0123456789abcdef0123456789abcdef') - version('1.10.0', '0123456789abcdef0123456789abcdef') - version('1.8.8', '0123456789abcdef0123456789abcdef') - version('1.6.5', '0123456789abcdef0123456789abcdef') + version("2.0.0", "0123456789abcdef0123456789abcdef") + version("1.10.3", "0123456789abcdef0123456789abcdef") + version("1.10.2", "0123456789abcdef0123456789abcdef") + version("1.10.1", "0123456789abcdef0123456789abcdef") + version("1.10.0", "0123456789abcdef0123456789abcdef") + version("1.8.8", "0123456789abcdef0123456789abcdef") + version("1.6.5", "0123456789abcdef0123456789abcdef") - provides('mpi@3.1', when='@2.0.0') - provides('mpi@3.0', when='@1.10.3') - provides('mpi@3.0', when='@1.10.2') - provides('mpi@3.0', when='@1.10.1') - provides('mpi@3.0', when='@1.10.0') - provides('mpi@3.0', when='@1.8.8') - provides('mpi@2.2', when='@1.6.5') + provides("mpi@3.1", when="@2.0.0") + provides("mpi@3.0", when="@1.10.3") + provides("mpi@3.0", when="@1.10.2") + provides("mpi@3.0", when="@1.10.1") + provides("mpi@3.0", when="@1.10.0") + provides("mpi@3.0", when="@1.8.8") + provides("mpi@2.2", when="@1.6.5") diff --git a/var/spack/repos/builtin.mock/packages/multimethod-base/package.py b/var/spack/repos/builtin.mock/packages/multimethod-base/package.py index 8afd85b345..bafde6b909 100644 --- a/var/spack/repos/builtin.mock/packages/multimethod-base/package.py +++ b/var/spack/repos/builtin.mock/packages/multimethod-base/package.py @@ -14,8 +14,8 @@ class MultimethodBase(Package): """ - homepage = 'http://www.example.com/' - url = 'http://www.example.com/example-1.0.tar.gz' + homepage = "http://www.example.com/" + url = "http://www.example.com/example-1.0.tar.gz" def base_method(self): return "base_method" diff --git a/var/spack/repos/builtin.mock/packages/multimethod-diamond-parent/package.py b/var/spack/repos/builtin.mock/packages/multimethod-diamond-parent/package.py index 426fa5094b..19a25976a9 100644 --- a/var/spack/repos/builtin.mock/packages/multimethod-diamond-parent/package.py +++ b/var/spack/repos/builtin.mock/packages/multimethod-diamond-parent/package.py @@ -9,14 +9,14 @@ from spack.pkg.builtin.mock.multimethod_base import MultimethodBase class MultimethodDiamondParent(MultimethodBase): """This package is designed for use with Spack's multimethod test. - It has a bunch of test cases for the @when decorator that the - test uses. + It has a bunch of test cases for the @when decorator that the + test uses. """ - @when('@3.0') + @when("@3.0") def diamond_inheritance(self): return "second_parent" - @when('@4.0, 2.0') + @when("@4.0, 2.0") def diamond_inheritance(self): return "should never be reached by diamond inheritance test" diff --git a/var/spack/repos/builtin.mock/packages/multimethod-diamond/package.py b/var/spack/repos/builtin.mock/packages/multimethod-diamond/package.py index fe89d871f7..110f9a6250 100644 --- a/var/spack/repos/builtin.mock/packages/multimethod-diamond/package.py +++ b/var/spack/repos/builtin.mock/packages/multimethod-diamond/package.py @@ -10,10 +10,10 @@ from spack.package import * class MultimethodDiamond(mi.MultimethodInheritor, mp.MultimethodDiamondParent): """This package is designed for use with Spack's multimethod test. - It has a bunch of test cases for the @when decorator that the - test uses. + It has a bunch of test cases for the @when decorator that the + test uses. """ - @when('@4.0') + @when("@4.0") def diamond_inheritance(self): - return 'subclass' + return "subclass" diff --git a/var/spack/repos/builtin.mock/packages/multimethod-inheritor/package.py b/var/spack/repos/builtin.mock/packages/multimethod-inheritor/package.py index fef83f6887..a35a04ec78 100644 --- a/var/spack/repos/builtin.mock/packages/multimethod-inheritor/package.py +++ b/var/spack/repos/builtin.mock/packages/multimethod-inheritor/package.py @@ -9,17 +9,17 @@ from spack.pkg.builtin.mock.multimethod import Multimethod class MultimethodInheritor(Multimethod): """This package is designed for use with Spack's multimethod test. - It has a bunch of test cases for the @when decorator that the - test uses. + It has a bunch of test cases for the @when decorator that the + test uses. """ - @when('@1.0') + @when("@1.0") def inherited_and_overridden(self): return "inheritor@1.0" # # Test multi-level inheritance # - @when('@2:') + @when("@2:") def base_method(self): - return 'multimethod-inheritor' + return "multimethod-inheritor" diff --git a/var/spack/repos/builtin.mock/packages/multimethod/package.py b/var/spack/repos/builtin.mock/packages/multimethod/package.py index 16af9198a0..5c559eab83 100644 --- a/var/spack/repos/builtin.mock/packages/multimethod/package.py +++ b/var/spack/repos/builtin.mock/packages/multimethod/package.py @@ -12,35 +12,35 @@ from spack.pkg.builtin.mock.multimethod_base import MultimethodBase class Multimethod(MultimethodBase): """This package is designed for use with Spack's multimethod test. - It has a bunch of test cases for the @when decorator that the - test uses. + It has a bunch of test cases for the @when decorator that the + test uses. """ - homepage = 'http://www.example.com/' - url = 'http://www.example.com/example-1.0.tar.gz' + homepage = "http://www.example.com/" + url = "http://www.example.com/example-1.0.tar.gz" - version('5.0', '0123456789abcdef0123456789abcdef') - version('4.0', '0123456789abcdef0123456789abcdef') - version('3.0', '0123456789abcdef0123456789abcdef') - version('2.0', '0123456789abcdef0123456789abcdef') - version('1.0', '0123456789abcdef0123456789abcdef') + version("5.0", "0123456789abcdef0123456789abcdef") + version("4.0", "0123456789abcdef0123456789abcdef") + version("3.0", "0123456789abcdef0123456789abcdef") + version("2.0", "0123456789abcdef0123456789abcdef") + version("1.0", "0123456789abcdef0123456789abcdef") - variant('mpi', default=False, description='') + variant("mpi", default=False, description="") - depends_on('mpi', when='+mpi') + depends_on("mpi", when="+mpi") # # These functions are only valid for versions 1, 3, and 4. # - @when('@1.0') + @when("@1.0") def no_version_2(self): return 1 - @when('@3.0') + @when("@3.0") def no_version_2(self): return 3 - @when('@4.0') + @when("@4.0") def no_version_2(self): return 4 @@ -48,11 +48,11 @@ class Multimethod(MultimethodBase): # These functions overlap, so there is ambiguity, but we'll take # the first one. # - @when('@:4') + @when("@:4") def version_overlap(self): return 1 - @when('@2:') + @when("@2:") def version_overlap(self): return 2 @@ -62,15 +62,15 @@ class Multimethod(MultimethodBase): def mpi_version(self): return 0 - @when('^mpi@3:') + @when("^mpi@3:") def mpi_version(self): return 3 - @when('^mpi@2:') + @when("^mpi@2:") def mpi_version(self): return 2 - @when('^mpi@1:') + @when("^mpi@1:") def mpi_version(self): return 1 @@ -80,15 +80,15 @@ class Multimethod(MultimethodBase): # on compilers # def has_a_default(self): - return 'default' + return "default" - @when('%gcc') + @when("%gcc") def has_a_default(self): - return 'gcc' + return "gcc" - @when('%clang') + @when("%clang") def has_a_default(self): - return 'clang' + return "clang" # # Make sure we can switch methods on different target @@ -99,23 +99,25 @@ class Multimethod(MultimethodBase): targets = targets[:-1] for target in targets: - @when('target=' + target.name) + + @when("target=" + target.name) def different_by_target(self): if isinstance(self.spec.architecture.target, string_types): return self.spec.architecture.target else: return self.spec.architecture.target.name + # # Make sure we can switch methods on different dependencies # - @when('^mpich') + @when("^mpich") def different_by_dep(self): - return 'mpich' + return "mpich" - @when('^zmpi') + @when("^zmpi") def different_by_dep(self): - return 'zmpi' + return "zmpi" # # Make sure we can switch on virtual dependencies @@ -123,7 +125,7 @@ class Multimethod(MultimethodBase): def different_by_virtual_dep(self): return 1 - @when('^mpi@2:') + @when("^mpi@2:") def different_by_virtual_dep(self): return 2 @@ -133,7 +135,7 @@ class Multimethod(MultimethodBase): # @when("@2:") def base_method(self): - return 'multimethod' + return "multimethod" # # Make sure methods with non-default implementations in a superclass @@ -151,11 +153,11 @@ class Multimethod(MultimethodBase): # # Make sure that multimethods follow MRO properly with diamond inheritance # - @when('@2.0') + @when("@2.0") def diamond_inheritance(self): - return 'first_parent' + return "first_parent" - @when('@4.0') + @when("@4.0") def diamond_inheritance(self): return "should_not_be_reached by diamond inheritance test" @@ -164,16 +166,16 @@ class Multimethod(MultimethodBase): # @when(True) def boolean_true_first(self): - return 'True' + return "True" @when(False) def boolean_true_first(self): - return 'False' + return "False" @when(False) def boolean_false_first(self): - return 'False' + return "False" @when(True) def boolean_false_first(self): - return 'True' + return "True" diff --git a/var/spack/repos/builtin.mock/packages/multimodule-inheritance/package.py b/var/spack/repos/builtin.mock/packages/multimodule-inheritance/package.py index bfe00fad59..79faf2598d 100644 --- a/var/spack/repos/builtin.mock/packages/multimodule-inheritance/package.py +++ b/var/spack/repos/builtin.mock/packages/multimodule-inheritance/package.py @@ -13,6 +13,6 @@ class MultimoduleInheritance(si.BaseWithDirectives): homepage = "http://www.example.com" url = "http://www.example.com/multimodule-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") - depends_on('openblas', when='+openblas') + depends_on("openblas", when="+openblas") diff --git a/var/spack/repos/builtin.mock/packages/multivalue-variant/package.py b/var/spack/repos/builtin.mock/packages/multivalue-variant/package.py index 147e2c84da..4fca7a6c87 100644 --- a/var/spack/repos/builtin.mock/packages/multivalue-variant/package.py +++ b/var/spack/repos/builtin.mock/packages/multivalue-variant/package.py @@ -10,31 +10,35 @@ class MultivalueVariant(Package): homepage = "http://www.llnl.gov" url = "http://www.llnl.gov/mpileaks-1.0.tar.gz" - version(1.0, '0123456789abcdef0123456789abcdef') - version(2.1, '0123456789abcdef0123456789abcdef') - version(2.2, '0123456789abcdef0123456789abcdef') - version(2.3, '0123456789abcdef0123456789abcdef') + version(1.0, "0123456789abcdef0123456789abcdef") + version(2.1, "0123456789abcdef0123456789abcdef") + version(2.2, "0123456789abcdef0123456789abcdef") + version(2.3, "0123456789abcdef0123456789abcdef") - variant('debug', default=False, description='Debug variant') + variant("debug", default=False, description="Debug variant") variant( - 'foo', description='Multi-valued variant', - values=any_combination_of('bar', 'baz', 'barbaz'), + "foo", + description="Multi-valued variant", + values=any_combination_of("bar", "baz", "barbaz"), ) variant( - 'fee', - description='Single-valued variant', - default='bar', - values=('bar', 'baz', 'barbaz'), - multi=False + "fee", + description="Single-valued variant", + default="bar", + values=("bar", "baz", "barbaz"), + multi=False, ) variant( - 'libs', default='shared', values=('shared', 'static'), multi=True, - description='Type of libraries to install' + "libs", + default="shared", + values=("shared", "static"), + multi=True, + description="Type of libraries to install", ) - depends_on('mpi') - depends_on('callpath') - depends_on('a') - depends_on('a@1.0', when='fee=barbaz') + depends_on("mpi") + depends_on("callpath") + depends_on("a") + depends_on("a@1.0", when="fee=barbaz") diff --git a/var/spack/repos/builtin.mock/packages/mvapich2/package.py b/var/spack/repos/builtin.mock/packages/mvapich2/package.py index e45a493342..4f63c32422 100644 --- a/var/spack/repos/builtin.mock/packages/mvapich2/package.py +++ b/var/spack/repos/builtin.mock/packages/mvapich2/package.py @@ -9,10 +9,10 @@ class Mvapich2(Package): homepage = "http://www.homepage.org" url = "http://www.someurl" - version('1.5', '9c5d5d4fe1e17dd12153f40bc5b6dbc0') + version("1.5", "9c5d5d4fe1e17dd12153f40bc5b6dbc0") variant( - 'file_systems', - description='List of the ROMIO file systems to activate', - values=auto_or_any_combination_of('lustre', 'gpfs', 'nfs', 'ufs'), + "file_systems", + description="List of the ROMIO file systems to activate", + values=auto_or_any_combination_of("lustre", "gpfs", "nfs", "ufs"), ) diff --git a/var/spack/repos/builtin.mock/packages/mvdefaults/package.py b/var/spack/repos/builtin.mock/packages/mvdefaults/package.py index 6d7e3c479c..84a5100c53 100644 --- a/var/spack/repos/builtin.mock/packages/mvdefaults/package.py +++ b/var/spack/repos/builtin.mock/packages/mvdefaults/package.py @@ -7,9 +7,8 @@ from spack.package import * class Mvdefaults(Package): homepage = "http://www.example.com" - url = "http://www.example.com/mvdefaults-1.0.tar.gz" + url = "http://www.example.com/mvdefaults-1.0.tar.gz" - version('1.0', 'abcdef1234567890abcdef1234567890') + version("1.0", "abcdef1234567890abcdef1234567890") - variant('foo', values=('a', 'b', 'c'), default=('a', 'b', 'c'), - multi=True, description='') + variant("foo", values=("a", "b", "c"), default=("a", "b", "c"), multi=True, description="") diff --git a/var/spack/repos/builtin.mock/packages/needs-relocation/package.py b/var/spack/repos/builtin.mock/packages/needs-relocation/package.py index 46f9e39df5..7f8d6f852d 100644 --- a/var/spack/repos/builtin.mock/packages/needs-relocation/package.py +++ b/var/spack/repos/builtin.mock/packages/needs-relocation/package.py @@ -14,15 +14,16 @@ def check(condition, msg): class NeedsRelocation(Package): """A dumy package that encodes its prefix.""" - homepage = 'https://www.cmake.org' - url = 'https://cmake.org/files/v3.4/cmake-3.4.3.tar.gz' - version('0.0.0', '12345678qwertyuiasdfghjkzxcvbnm0') + homepage = "https://www.cmake.org" + url = "https://cmake.org/files/v3.4/cmake-3.4.3.tar.gz" + + version("0.0.0", "12345678qwertyuiasdfghjkzxcvbnm0") def install(self, spec, prefix): mkdirp(prefix.bin) - exe = join_path(prefix.bin, 'exe') - with open(exe, 'w') as f: + exe = join_path(prefix.bin, "exe") + with open(exe, "w") as f: f.write(prefix) set_executable(exe) diff --git a/var/spack/repos/builtin.mock/packages/netlib-blas/package.py b/var/spack/repos/builtin.mock/packages/netlib-blas/package.py index 455c539d33..d59b790090 100644 --- a/var/spack/repos/builtin.mock/packages/netlib-blas/package.py +++ b/var/spack/repos/builtin.mock/packages/netlib-blas/package.py @@ -8,8 +8,8 @@ from spack.package import * class NetlibBlas(Package): homepage = "http://www.netlib.org/lapack/" - url = "http://www.netlib.org/lapack/lapack-3.5.0.tgz" + url = "http://www.netlib.org/lapack/lapack-3.5.0.tgz" - version('3.5.0', 'b1d3e3e425b2e44a06760ff173104bdf') + version("3.5.0", "b1d3e3e425b2e44a06760ff173104bdf") - provides('blas') + provides("blas") diff --git a/var/spack/repos/builtin.mock/packages/netlib-lapack/package.py b/var/spack/repos/builtin.mock/packages/netlib-lapack/package.py index 4d4c8f05c6..925553dfb4 100644 --- a/var/spack/repos/builtin.mock/packages/netlib-lapack/package.py +++ b/var/spack/repos/builtin.mock/packages/netlib-lapack/package.py @@ -8,9 +8,9 @@ from spack.package import * class NetlibLapack(Package): homepage = "http://www.netlib.org/lapack/" - url = "http://www.netlib.org/lapack/lapack-3.5.0.tgz" + url = "http://www.netlib.org/lapack/lapack-3.5.0.tgz" - version('3.5.0', 'b1d3e3e425b2e44a06760ff173104bdf') + version("3.5.0", "b1d3e3e425b2e44a06760ff173104bdf") - provides('lapack') - depends_on('blas') + provides("lapack") + depends_on("blas") diff --git a/var/spack/repos/builtin.mock/packages/ninja/package.py b/var/spack/repos/builtin.mock/packages/ninja/package.py index e90c0569f7..864c58ea10 100644 --- a/var/spack/repos/builtin.mock/packages/ninja/package.py +++ b/var/spack/repos/builtin.mock/packages/ninja/package.py @@ -10,6 +10,6 @@ class Ninja(Package): """Dummy Ninja Package""" homepage = "https://ninja-build.org/" - url = "https://github.com/ninja-build/ninja/archive/v1.7.2.tar.gz" + url = "https://github.com/ninja-build/ninja/archive/v1.7.2.tar.gz" - version('1.10.2', sha256='ce35865411f0490368a8fc383f29071de6690cbadc27704734978221f25e2bed') + version("1.10.2", sha256="ce35865411f0490368a8fc383f29071de6690cbadc27704734978221f25e2bed") diff --git a/var/spack/repos/builtin.mock/packages/non-existing-conditional-dep/package.py b/var/spack/repos/builtin.mock/packages/non-existing-conditional-dep/package.py index 2b964948c0..253f996f06 100644 --- a/var/spack/repos/builtin.mock/packages/non-existing-conditional-dep/package.py +++ b/var/spack/repos/builtin.mock/packages/non-existing-conditional-dep/package.py @@ -10,7 +10,7 @@ class NonExistingConditionalDep(Package): homepage = "http://www.example.com" - version('2.0') - version('1.0') + version("2.0") + version("1.0") - depends_on('dep-with-variants@999', when='@2.0') + depends_on("dep-with-variants@999", when="@2.0") diff --git a/var/spack/repos/builtin.mock/packages/nosource-bundle/package.py b/var/spack/repos/builtin.mock/packages/nosource-bundle/package.py index 801900b0be..28b22df5fe 100644 --- a/var/spack/repos/builtin.mock/packages/nosource-bundle/package.py +++ b/var/spack/repos/builtin.mock/packages/nosource-bundle/package.py @@ -12,6 +12,6 @@ class NosourceBundle(BundlePackage): homepage = "http://www.example.com" - version('1.0') + version("1.0") - depends_on('dependency-install') + depends_on("dependency-install") diff --git a/var/spack/repos/builtin.mock/packages/nosource-install/package.py b/var/spack/repos/builtin.mock/packages/nosource-install/package.py index 2e4b6f2795..a1ca724448 100644 --- a/var/spack/repos/builtin.mock/packages/nosource-install/package.py +++ b/var/spack/repos/builtin.mock/packages/nosource-install/package.py @@ -11,18 +11,18 @@ class NosourceInstall(BundlePackage): homepage = "http://www.example.com" - version('2.0') - version('1.0') + version("2.0") + version("1.0") - depends_on('dependency-install') + depends_on("dependency-install") # The install phase must be specified. - phases = ['install'] + phases = ["install"] # The install method must also be present. def install(self, spec, prefix): - touch(join_path(self.prefix, 'install.txt')) + touch(join_path(self.prefix, "install.txt")) - @run_after('install') + @run_after("install") def post_install(self): - touch(join_path(self.prefix, 'post-install.txt')) + touch(join_path(self.prefix, "post-install.txt")) diff --git a/var/spack/repos/builtin.mock/packages/nosource/package.py b/var/spack/repos/builtin.mock/packages/nosource/package.py index 5d08ffa3a1..8653125075 100644 --- a/var/spack/repos/builtin.mock/packages/nosource/package.py +++ b/var/spack/repos/builtin.mock/packages/nosource/package.py @@ -12,6 +12,6 @@ class Nosource(Package): homepage = "http://www.example.com" - version('1.0') + version("1.0") - depends_on('dependency-install') + depends_on("dependency-install") diff --git a/var/spack/repos/builtin.mock/packages/noversion-bundle/package.py b/var/spack/repos/builtin.mock/packages/noversion-bundle/package.py index 2f612a63a1..cde758c953 100644 --- a/var/spack/repos/builtin.mock/packages/noversion-bundle/package.py +++ b/var/spack/repos/builtin.mock/packages/noversion-bundle/package.py @@ -15,4 +15,4 @@ class NoversionBundle(BundlePackage): homepage = "http://www.example.com" url = "http://www.example.com/a-1.0.tar.gz" - depends_on('dependency-install') + depends_on("dependency-install") diff --git a/var/spack/repos/builtin.mock/packages/noversion/package.py b/var/spack/repos/builtin.mock/packages/noversion/package.py index d2d987cac0..00f34c0c54 100644 --- a/var/spack/repos/builtin.mock/packages/noversion/package.py +++ b/var/spack/repos/builtin.mock/packages/noversion/package.py @@ -13,7 +13,7 @@ class Noversion(Package): """ homepage = "http://www.example.com" - url = "http://www.example.com/a-1.0.tar.gz" + url = "http://www.example.com/a-1.0.tar.gz" def install(self, spec, prefix): - touch(join_path(prefix, 'an_installation_file')) + touch(join_path(prefix, "an_installation_file")) diff --git a/var/spack/repos/builtin.mock/packages/old-external/package.py b/var/spack/repos/builtin.mock/packages/old-external/package.py index 656c4f9db3..23bd506262 100644 --- a/var/spack/repos/builtin.mock/packages/old-external/package.py +++ b/var/spack/repos/builtin.mock/packages/old-external/package.py @@ -11,10 +11,10 @@ class OldExternal(Package): homepage = "https://www.example.com" url = "https://www.example.com/old-external.tar.gz" - version('1.2.0', '0123456789abcdef0123456789abcdef') - version('1.1.4', '0123456789abcdef0123456789abcdef') - version('1.1.3', '0123456789abcdef0123456789abcdef') - version('1.1.2', '0123456789abcdef0123456789abcdef') - version('1.1.1', '0123456789abcdef0123456789abcdef') - version('1.1.0', '0123456789abcdef0123456789abcdef') - version('1.0.0', '0123456789abcdef0123456789abcdef') + version("1.2.0", "0123456789abcdef0123456789abcdef") + version("1.1.4", "0123456789abcdef0123456789abcdef") + version("1.1.3", "0123456789abcdef0123456789abcdef") + version("1.1.2", "0123456789abcdef0123456789abcdef") + version("1.1.1", "0123456789abcdef0123456789abcdef") + version("1.1.0", "0123456789abcdef0123456789abcdef") + version("1.0.0", "0123456789abcdef0123456789abcdef") diff --git a/var/spack/repos/builtin.mock/packages/old-sbang/package.py b/var/spack/repos/builtin.mock/packages/old-sbang/package.py index 9c65f692d7..e153dbe97c 100644 --- a/var/spack/repos/builtin.mock/packages/old-sbang/package.py +++ b/var/spack/repos/builtin.mock/packages/old-sbang/package.py @@ -11,25 +11,29 @@ class OldSbang(Package): """Toy package for testing the old sbang replacement problem""" homepage = "https://www.example.com" - url = "https://www.example.com/old-sbang.tar.gz" + url = "https://www.example.com/old-sbang.tar.gz" - version('1.0.0', '0123456789abcdef0123456789abcdef') + version("1.0.0", "0123456789abcdef0123456789abcdef") def install(self, spec, prefix): mkdirp(prefix.bin) - sbang_style_1 = '''#!/bin/bash {0}/bin/sbang + sbang_style_1 = """#!/bin/bash {0}/bin/sbang #!/usr/bin/env python {1} -'''.format(spack.paths.prefix, prefix.bin) - sbang_style_2 = '''#!/bin/sh {0}/bin/sbang +""".format( + spack.paths.prefix, prefix.bin + ) + sbang_style_2 = """#!/bin/sh {0}/bin/sbang #!/usr/bin/env python {1} -'''.format(spack.store.unpadded_root, prefix.bin) - with open('%s/sbang-style-1.sh' % self.prefix.bin, 'w') as f: +""".format( + spack.store.unpadded_root, prefix.bin + ) + with open("%s/sbang-style-1.sh" % self.prefix.bin, "w") as f: f.write(sbang_style_1) - with open('%s/sbang-style-2.sh' % self.prefix.bin, 'w') as f: + with open("%s/sbang-style-2.sh" % self.prefix.bin, "w") as f: f.write(sbang_style_2) diff --git a/var/spack/repos/builtin.mock/packages/openblas-with-lapack/package.py b/var/spack/repos/builtin.mock/packages/openblas-with-lapack/package.py index 59036e8091..78c1eaf93c 100644 --- a/var/spack/repos/builtin.mock/packages/openblas-with-lapack/package.py +++ b/var/spack/repos/builtin.mock/packages/openblas-with-lapack/package.py @@ -8,10 +8,11 @@ from spack.package import * class OpenblasWithLapack(Package): """Dummy version of OpenBLAS that also provides LAPACK, for testing.""" + homepage = "http://www.openblas.net" - url = "http://github.com/xianyi/OpenBLAS/archive/v0.2.15.tar.gz" + url = "http://github.com/xianyi/OpenBLAS/archive/v0.2.15.tar.gz" - version('0.2.15', 'b1190f3d3471685f17cfd1ec1d252ac9') + version("0.2.15", "b1190f3d3471685f17cfd1ec1d252ac9") - provides('lapack') - provides('blas') + provides("lapack") + provides("blas") diff --git a/var/spack/repos/builtin.mock/packages/openblas/package.py b/var/spack/repos/builtin.mock/packages/openblas/package.py index 2bcbece25e..5b8637aca2 100644 --- a/var/spack/repos/builtin.mock/packages/openblas/package.py +++ b/var/spack/repos/builtin.mock/packages/openblas/package.py @@ -8,14 +8,15 @@ from spack.package import * class Openblas(Package): """OpenBLAS: An optimized BLAS library""" + homepage = "http://www.openblas.net" - url = "http://github.com/xianyi/OpenBLAS/archive/v0.2.15.tar.gz" + url = "http://github.com/xianyi/OpenBLAS/archive/v0.2.15.tar.gz" - version('0.2.15', 'b1190f3d3471685f17cfd1ec1d252ac9') - version('0.2.14', 'b1190f3d3471685f17cfd1ec1d252ac9') - version('0.2.13', 'b1190f3d3471685f17cfd1ec1d252ac9') + version("0.2.15", "b1190f3d3471685f17cfd1ec1d252ac9") + version("0.2.14", "b1190f3d3471685f17cfd1ec1d252ac9") + version("0.2.13", "b1190f3d3471685f17cfd1ec1d252ac9") # See #20019 for this conflict - conflicts('%gcc@:4.4', when='@0.2.14:') + conflicts("%gcc@:4.4", when="@0.2.14:") - provides('blas') + provides("blas") diff --git a/var/spack/repos/builtin.mock/packages/openmpi/package.py b/var/spack/repos/builtin.mock/packages/openmpi/package.py index 38e1f8b24b..be5690fc97 100644 --- a/var/spack/repos/builtin.mock/packages/openmpi/package.py +++ b/var/spack/repos/builtin.mock/packages/openmpi/package.py @@ -7,9 +7,9 @@ from spack.package import * class Openmpi(Package): - version('4.1.1') + version("4.1.1") - variant('internal-hwloc', default=False) - variant('fabrics', values=any_combination_of('psm', 'mxm')) + variant("internal-hwloc", default=False) + variant("fabrics", values=any_combination_of("psm", "mxm")) - depends_on('hwloc', when="~internal-hwloc") + depends_on("hwloc", when="~internal-hwloc") diff --git a/var/spack/repos/builtin.mock/packages/optional-dep-test-2/package.py b/var/spack/repos/builtin.mock/packages/optional-dep-test-2/package.py index e864967d67..493eac0595 100644 --- a/var/spack/repos/builtin.mock/packages/optional-dep-test-2/package.py +++ b/var/spack/repos/builtin.mock/packages/optional-dep-test-2/package.py @@ -10,12 +10,12 @@ class OptionalDepTest2(Package): """Depends on the optional-dep-test package""" homepage = "http://www.example.com" - url = "http://www.example.com/optional-dep-test-2-1.0.tar.gz" + url = "http://www.example.com/optional-dep-test-2-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") - variant('odt', default=False) - variant('mpi', default=False) + variant("odt", default=False) + variant("mpi", default=False) - depends_on('optional-dep-test', when='+odt') - depends_on('optional-dep-test+mpi', when='+mpi') + depends_on("optional-dep-test", when="+odt") + depends_on("optional-dep-test+mpi", when="+mpi") diff --git a/var/spack/repos/builtin.mock/packages/optional-dep-test-3/package.py b/var/spack/repos/builtin.mock/packages/optional-dep-test-3/package.py index c41cfa8cf8..fffc594563 100644 --- a/var/spack/repos/builtin.mock/packages/optional-dep-test-3/package.py +++ b/var/spack/repos/builtin.mock/packages/optional-dep-test-3/package.py @@ -10,11 +10,11 @@ class OptionalDepTest3(Package): """Depends on the optional-dep-test package""" homepage = "http://www.example.com" - url = "http://www.example.com/optional-dep-test-3-1.0.tar.gz" + url = "http://www.example.com/optional-dep-test-3-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") - variant('var', default=False) + variant("var", default=False) - depends_on('a', when='~var') - depends_on('b', when='+var') + depends_on("a", when="~var") + depends_on("b", when="+var") diff --git a/var/spack/repos/builtin.mock/packages/optional-dep-test/package.py b/var/spack/repos/builtin.mock/packages/optional-dep-test/package.py index 5fb92bb23a..a9c5df82eb 100644 --- a/var/spack/repos/builtin.mock/packages/optional-dep-test/package.py +++ b/var/spack/repos/builtin.mock/packages/optional-dep-test/package.py @@ -10,23 +10,23 @@ class OptionalDepTest(Package): """Description""" homepage = "http://www.example.com" - url = "http://www.example.com/optional_dep_test-1.0.tar.gz" + url = "http://www.example.com/optional_dep_test-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') - version('1.1', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") + version("1.1", "0123456789abcdef0123456789abcdef") - variant('a', default=False) - variant('f', default=False) - variant('mpi', default=False) + variant("a", default=False) + variant("f", default=False) + variant("mpi", default=False) - depends_on('a', when='+a') - depends_on('b', when='@1.1') - depends_on('c', when='%intel') - depends_on('d', when='%intel@64.1') - depends_on('e', when='%clang@34:40') + depends_on("a", when="+a") + depends_on("b", when="@1.1") + depends_on("c", when="%intel") + depends_on("d", when="%intel@64.1") + depends_on("e", when="%clang@34:40") - depends_on('f', when='+f') - depends_on('g', when='^f') - depends_on('mpi', when='^g') + depends_on("f", when="+f") + depends_on("g", when="^f") + depends_on("mpi", when="^g") - depends_on('mpi', when='+mpi') + depends_on("mpi", when="+mpi") diff --git a/var/spack/repos/builtin.mock/packages/othervirtual/package.py b/var/spack/repos/builtin.mock/packages/othervirtual/package.py index d47e4efeda..41d9cb695d 100644 --- a/var/spack/repos/builtin.mock/packages/othervirtual/package.py +++ b/var/spack/repos/builtin.mock/packages/othervirtual/package.py @@ -8,8 +8,8 @@ from spack.package import * class Othervirtual(Package): homepage = "http://somewhere.com" - url = "http://somewhere.com/stuff-1.0.tar.gz" + url = "http://somewhere.com/stuff-1.0.tar.gz" - version('1.0', '67890abcdef1234567890abcdef12345') + version("1.0", "67890abcdef1234567890abcdef12345") - provides('stuff') + provides("stuff") diff --git a/var/spack/repos/builtin.mock/packages/override-context-templates/package.py b/var/spack/repos/builtin.mock/packages/override-context-templates/package.py index 8cd53e4b0a..6ab4816a78 100644 --- a/var/spack/repos/builtin.mock/packages/override-context-templates/package.py +++ b/var/spack/repos/builtin.mock/packages/override-context-templates/package.py @@ -11,10 +11,11 @@ class OverrideContextTemplates(Package): And additional lines that shouldn't be in the short description. """ + homepage = "http://www.fake-spack-example.org" - url = "http://www.fake-spack-example.org/downloads/fake-1.0.tar.gz" + url = "http://www.fake-spack-example.org/downloads/fake-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") - tcl_template = 'extension.tcl' - tcl_context = {'sentence': "sentence from package"} + tcl_template = "extension.tcl" + tcl_context = {"sentence": "sentence from package"} diff --git a/var/spack/repos/builtin.mock/packages/override-module-templates/package.py b/var/spack/repos/builtin.mock/packages/override-module-templates/package.py index d4e3ae9494..3970e82928 100644 --- a/var/spack/repos/builtin.mock/packages/override-module-templates/package.py +++ b/var/spack/repos/builtin.mock/packages/override-module-templates/package.py @@ -8,9 +8,9 @@ from spack.package import * class OverrideModuleTemplates(Package): homepage = "http://www.fake-spack-example.org" - url = "http://www.fake-spack-example.org/downloads/fake-1.0.tar.gz" + url = "http://www.fake-spack-example.org/downloads/fake-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") - tcl_template = 'override.txt' - lmod_template = 'override.txt' + tcl_template = "override.txt" + lmod_template = "override.txt" diff --git a/var/spack/repos/builtin.mock/packages/patch-a-dependency/package.py b/var/spack/repos/builtin.mock/packages/patch-a-dependency/package.py index c347355b0e..f71e779a49 100644 --- a/var/spack/repos/builtin.mock/packages/patch-a-dependency/package.py +++ b/var/spack/repos/builtin.mock/packages/patch-a-dependency/package.py @@ -12,6 +12,6 @@ class PatchADependency(Package): homepage = "http://www.example.com" url = "http://www.example.com/patch-a-dependency-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") - depends_on('libelf', patches=patch('libelf.patch')) + depends_on("libelf", patches=patch("libelf.patch")) diff --git a/var/spack/repos/builtin.mock/packages/patch-several-dependencies/package.py b/var/spack/repos/builtin.mock/packages/patch-several-dependencies/package.py index cb987a112b..41c3971c9a 100644 --- a/var/spack/repos/builtin.mock/packages/patch-several-dependencies/package.py +++ b/var/spack/repos/builtin.mock/packages/patch-several-dependencies/package.py @@ -12,31 +12,41 @@ class PatchSeveralDependencies(Package): homepage = "http://www.example.com" url = "http://www.example.com/patch-a-dependency-1.0.tar.gz" - version('2.0', '0123456789abcdef0123456789abcdef') - version('1.0', '0123456789abcdef0123456789abcdef') + version("2.0", "0123456789abcdef0123456789abcdef") + version("1.0", "0123456789abcdef0123456789abcdef") - variant('foo', default=False, - description='Forces a version on libelf') + variant("foo", default=False, description="Forces a version on libelf") # demonstrate all the different ways to patch things # single patch file in repo - depends_on('libelf', patches='foo.patch') - depends_on('libelf@0.8.10', patches='foo.patch', when='+foo') + depends_on("libelf", patches="foo.patch") + depends_on("libelf@0.8.10", patches="foo.patch", when="+foo") # using a list of patches in one depends_on - depends_on('libdwarf', patches=[ - patch('bar.patch'), # nested patch directive - patch('baz.patch', when='@20111030') # and with a conditional - ], when='@1.0') # with a depends_on conditional + depends_on( + "libdwarf", + patches=[ + patch("bar.patch"), # nested patch directive + patch("baz.patch", when="@20111030"), # and with a conditional + ], + when="@1.0", + ) # with a depends_on conditional # URL patches - depends_on('fake', patches=[ - # uncompressed URL patch - patch('http://example.com/urlpatch.patch', - sha256='abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234'), - # compressed URL patch requires separate archive sha - patch('http://example.com/urlpatch2.patch.gz', - archive_sha256='abcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcd', - sha256='1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd') - ]) + depends_on( + "fake", + patches=[ + # uncompressed URL patch + patch( + "http://example.com/urlpatch.patch", + sha256="abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234", + ), + # compressed URL patch requires separate archive sha + patch( + "http://example.com/urlpatch2.patch.gz", + archive_sha256="abcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcd", + sha256="1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd", + ), + ], + ) diff --git a/var/spack/repos/builtin.mock/packages/patch/package.py b/var/spack/repos/builtin.mock/packages/patch/package.py index 433a53e1f9..c132dd8037 100644 --- a/var/spack/repos/builtin.mock/packages/patch/package.py +++ b/var/spack/repos/builtin.mock/packages/patch/package.py @@ -12,12 +12,12 @@ class Patch(Package): homepage = "http://www.example.com" url = "http://www.example.com/patch-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') - version('1.0.1') - version('1.0.2') - version('2.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") + version("1.0.1") + version("1.0.2") + version("2.0", "0123456789abcdef0123456789abcdef") - patch('foo.patch') - patch('bar.patch', when='@2:') - patch('baz.patch') - patch('biz.patch', when='@1.0.1:1.0.2') + patch("foo.patch") + patch("bar.patch", when="@2:") + patch("baz.patch") + patch("biz.patch", when="@1.0.1:1.0.2") diff --git a/var/spack/repos/builtin.mock/packages/patchelf/package.py b/var/spack/repos/builtin.mock/packages/patchelf/package.py index b42a65bff8..123d5700fd 100644 --- a/var/spack/repos/builtin.mock/packages/patchelf/package.py +++ b/var/spack/repos/builtin.mock/packages/patchelf/package.py @@ -8,16 +8,16 @@ from spack.package import * class Patchelf(AutotoolsPackage): """PatchELF is a small utility to modify the dynamic linker and RPATH of - ELF executables.""" + ELF executables.""" homepage = "https://nixos.org/patchelf.html" - url = "https://nixos.org/releases/patchelf/patchelf-0.10/patchelf-0.10.tar.gz" + url = "https://nixos.org/releases/patchelf/patchelf-0.10/patchelf-0.10.tar.gz" list_url = "https://nixos.org/releases/patchelf/" list_depth = 1 - version('0.10', sha256='b2deabce05c34ce98558c0efb965f209de592197b2c88e930298d740ead09019') - version('0.9', sha256='f2aa40a6148cb3b0ca807a1bf836b081793e55ec9e5540a5356d800132be7e0a') - version('0.8', sha256='14af06a2da688d577d64ff8dac065bb8903bbffbe01d30c62df7af9bf4ce72fe') + version("0.10", sha256="b2deabce05c34ce98558c0efb965f209de592197b2c88e930298d740ead09019") + version("0.9", sha256="f2aa40a6148cb3b0ca807a1bf836b081793e55ec9e5540a5356d800132be7e0a") + version("0.8", sha256="14af06a2da688d577d64ff8dac065bb8903bbffbe01d30c62df7af9bf4ce72fe") def install(self, spec, prefix): install_tree(self.stage.source_path, prefix) diff --git a/var/spack/repos/builtin.mock/packages/perl-extension/package.py b/var/spack/repos/builtin.mock/packages/perl-extension/package.py index a0a21b4d52..132bbaa0b0 100644 --- a/var/spack/repos/builtin.mock/packages/perl-extension/package.py +++ b/var/spack/repos/builtin.mock/packages/perl-extension/package.py @@ -11,14 +11,14 @@ class PerlExtension(PerlPackage): """A package which extends perl""" homepage = "http://www.example.com" - url = "http://www.example.com/extension1-1.0.tar.gz" + url = "http://www.example.com/extension1-1.0.tar.gz" - version('1.0', '00000000000000000000000000000010') - version('2.0', '00000000000000000000000000000020') + version("1.0", "00000000000000000000000000000010") + version("2.0", "00000000000000000000000000000020") extends("perl") def install(self, spec, prefix): mkdirp(prefix.bin) - with open(os.path.join(prefix.bin, 'perl-extension'), 'w+') as fout: + with open(os.path.join(prefix.bin, "perl-extension"), "w+") as fout: fout.write(str(spec.version)) diff --git a/var/spack/repos/builtin.mock/packages/perl/package.py b/var/spack/repos/builtin.mock/packages/perl/package.py index c1dc0a8576..ad4110a1d3 100644 --- a/var/spack/repos/builtin.mock/packages/perl/package.py +++ b/var/spack/repos/builtin.mock/packages/perl/package.py @@ -7,9 +7,10 @@ from spack.package import * class Perl(Package): """Dummy Perl package to allow a dummy perl-extension in repo.""" + homepage = "http://www.python.org" - url = "http://www.python.org/ftp/python/2.7.8/Python-2.7.8.tgz" + url = "http://www.python.org/ftp/python/2.7.8/Python-2.7.8.tgz" extendable = True - version('0.0.0', 'abcdef1234567890abcdef1234567890') + version("0.0.0", "abcdef1234567890abcdef1234567890") diff --git a/var/spack/repos/builtin.mock/packages/preferred-test/package.py b/var/spack/repos/builtin.mock/packages/preferred-test/package.py index 5e9fedf7ae..96d51ee312 100644 --- a/var/spack/repos/builtin.mock/packages/preferred-test/package.py +++ b/var/spack/repos/builtin.mock/packages/preferred-test/package.py @@ -8,8 +8,13 @@ from spack.package import * class PreferredTest(Package): """Dummy package with develop version and preferred version""" + homepage = "https://github.com/LLNL/mpileaks" - url = "https://github.com/LLNL/mpileaks/releases/download/v1.0/mpileaks-1.0.tar.gz" + url = "https://github.com/LLNL/mpileaks/releases/download/v1.0/mpileaks-1.0.tar.gz" - version('develop', git='https://github.com/LLNL/mpileaks.git') - version('1.0', sha256='2e34cc4505556d1c1f085758e26f2f8eea0972db9382f051b2dcfb1d7d9e1825', preferred=True) + version("develop", git="https://github.com/LLNL/mpileaks.git") + version( + "1.0", + sha256="2e34cc4505556d1c1f085758e26f2f8eea0972db9382f051b2dcfb1d7d9e1825", + preferred=True, + ) diff --git a/var/spack/repos/builtin.mock/packages/printing-package/package.py b/var/spack/repos/builtin.mock/packages/printing-package/package.py index 84de889817..b811c0398a 100644 --- a/var/spack/repos/builtin.mock/packages/printing-package/package.py +++ b/var/spack/repos/builtin.mock/packages/printing-package/package.py @@ -11,21 +11,22 @@ class PrintingPackage(Package): We use this to test whether that output is properly logged. """ + homepage = "http://www.example.com/printing_package" - url = "http://www.unit-test-should-replace-this-url/trivial_install-1.0.tar.gz" + url = "http://www.unit-test-should-replace-this-url/trivial_install-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") def install(self, spec, prefix): print("BEFORE INSTALL") - configure('--prefix=%s' % prefix) + configure("--prefix=%s" % prefix) make() - make('install') + make("install") print("AFTER INSTALL") def test(self): print("BEFORE TEST") - self.run_test('true') # run /bin/true + self.run_test("true") # run /bin/true print("AFTER TEST") diff --git a/var/spack/repos/builtin.mock/packages/py-extension1/package.py b/var/spack/repos/builtin.mock/packages/py-extension1/package.py index afd644b9bb..cd8755691e 100644 --- a/var/spack/repos/builtin.mock/packages/py-extension1/package.py +++ b/var/spack/repos/builtin.mock/packages/py-extension1/package.py @@ -11,17 +11,17 @@ class PyExtension1(PythonPackage): """A package which extends python""" homepage = "http://www.example.com" - url = "http://www.example.com/extension1-1.0.tar.gz" + url = "http://www.example.com/extension1-1.0.tar.gz" # Override settings in base class maintainers = [] - version('1.0', '00000000000000000000000000000110') - version('2.0', '00000000000000000000000000000120') + version("1.0", "00000000000000000000000000000110") + version("2.0", "00000000000000000000000000000120") def install(self, spec, prefix): mkdirp(prefix.bin) - with open(os.path.join(prefix.bin, 'py-extension1'), 'w+') as fout: + with open(os.path.join(prefix.bin, "py-extension1"), "w+") as fout: fout.write(str(spec.version)) - extends('python') + extends("python") diff --git a/var/spack/repos/builtin.mock/packages/py-extension2/package.py b/var/spack/repos/builtin.mock/packages/py-extension2/package.py index eb9fe7c776..6aef13257c 100644 --- a/var/spack/repos/builtin.mock/packages/py-extension2/package.py +++ b/var/spack/repos/builtin.mock/packages/py-extension2/package.py @@ -9,20 +9,20 @@ from spack.package import * class PyExtension2(PythonPackage): """A package which extends python. It also depends on another - package which extends the same package.""" + package which extends the same package.""" homepage = "http://www.example.com" - url = "http://www.example.com/extension2-1.0.tar.gz" + url = "http://www.example.com/extension2-1.0.tar.gz" # Override settings in base class maintainers = [] extends("python") - depends_on('py-extension1', type=('build', 'run')) + depends_on("py-extension1", type=("build", "run")) - version('1.0', '00000000000000000000000000000210') + version("1.0", "00000000000000000000000000000210") def install(self, spec, prefix): mkdirp(prefix.bin) - with open(os.path.join(prefix.bin, 'py-extension2'), 'w+') as fout: + with open(os.path.join(prefix.bin, "py-extension2"), "w+") as fout: fout.write(str(spec.version)) diff --git a/var/spack/repos/builtin.mock/packages/py-extension3/package.py b/var/spack/repos/builtin.mock/packages/py-extension3/package.py index 89c404899c..a6e0d801ef 100644 --- a/var/spack/repos/builtin.mock/packages/py-extension3/package.py +++ b/var/spack/repos/builtin.mock/packages/py-extension3/package.py @@ -14,11 +14,11 @@ class PyExtension3(Package): url = "http://www.example.com/extension3-1.0.tar.gz" depends_on("python") - depends_on('py-extension1', type=('build', 'run'), when='^python@:2.8.0') + depends_on("py-extension1", type=("build", "run"), when="^python@:2.8.0") - depends_on('patchelf@0.9', when='@1.0:1.1 ^python@:2') - depends_on('patchelf@0.10', when='@1.0:1.1 ^python@3:') + depends_on("patchelf@0.9", when="@1.0:1.1 ^python@:2") + depends_on("patchelf@0.10", when="@1.0:1.1 ^python@3:") - version('2.0', '00000000000000000000000000000320') - version('1.1', '00000000000000000000000000000311') - version('1.0', '00000000000000000000000000000310') + version("2.0", "00000000000000000000000000000320") + version("1.1", "00000000000000000000000000000311") + version("1.0", "00000000000000000000000000000310") diff --git a/var/spack/repos/builtin.mock/packages/py-pip/package.py b/var/spack/repos/builtin.mock/packages/py-pip/package.py index 7e0b7d06ce..437686480b 100644 --- a/var/spack/repos/builtin.mock/packages/py-pip/package.py +++ b/var/spack/repos/builtin.mock/packages/py-pip/package.py @@ -10,6 +10,6 @@ class PyPip(Package): """Only needed because other mock packages use PythonPackage""" homepage = "http://www.example.com" - url = "http://www.example.com/pip-1.0.tar.gz" + url = "http://www.example.com/pip-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") diff --git a/var/spack/repos/builtin.mock/packages/py-wheel/package.py b/var/spack/repos/builtin.mock/packages/py-wheel/package.py index 54128d5a88..c3a23e03a5 100644 --- a/var/spack/repos/builtin.mock/packages/py-wheel/package.py +++ b/var/spack/repos/builtin.mock/packages/py-wheel/package.py @@ -10,6 +10,6 @@ class PyWheel(Package): """Only needed because other mock packages use PythonPackage""" homepage = "http://www.example.com" - url = "http://www.example.com/wheel-1.0.tar.gz" + url = "http://www.example.com/wheel-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") diff --git a/var/spack/repos/builtin.mock/packages/python/package.py b/var/spack/repos/builtin.mock/packages/python/package.py index 4585efc53f..fc091e45e2 100644 --- a/var/spack/repos/builtin.mock/packages/python/package.py +++ b/var/spack/repos/builtin.mock/packages/python/package.py @@ -8,14 +8,15 @@ from spack.package import * class Python(Package): """Dummy Python package to demonstrate preferred versions.""" + homepage = "http://www.python.org" - url = "http://www.python.org/ftp/python/2.7.8/Python-2.7.8.tgz" + url = "http://www.python.org/ftp/python/2.7.8/Python-2.7.8.tgz" extendable = True - version('3.5.1', 'be78e48cdfc1a7ad90efff146dce6cfe') - version('3.5.0', 'a56c0c0b45d75a0ec9c6dee933c41c36') - version('2.7.11', '6b6076ec9e93f05dd63e47eb9c15728b', preferred=True) - version('2.7.10', 'd7547558fd673bd9d38e2108c6b42521') - version('2.7.9', '5eebcaa0030dc4061156d3429657fb83') - version('2.7.8', 'd4bca0159acb0b44a781292b5231936f') + version("3.5.1", "be78e48cdfc1a7ad90efff146dce6cfe") + version("3.5.0", "a56c0c0b45d75a0ec9c6dee933c41c36") + version("2.7.11", "6b6076ec9e93f05dd63e47eb9c15728b", preferred=True) + version("2.7.10", "d7547558fd673bd9d38e2108c6b42521") + version("2.7.9", "5eebcaa0030dc4061156d3429657fb83") + version("2.7.8", "d4bca0159acb0b44a781292b5231936f") diff --git a/var/spack/repos/builtin.mock/packages/quantum-espresso/package.py b/var/spack/repos/builtin.mock/packages/quantum-espresso/package.py index 49fa1942e6..ccd361d5d4 100644 --- a/var/spack/repos/builtin.mock/packages/quantum-espresso/package.py +++ b/var/spack/repos/builtin.mock/packages/quantum-espresso/package.py @@ -10,18 +10,19 @@ class QuantumEspresso(Package): cases with the old concretizer have been solved by the new ones. """ + homepage = "http://www.example.com" url = "http://www.example.com/qe-1.0.tar.gz" - version(1.0, '1234567890abcdef1234567890abcdef') + version(1.0, "1234567890abcdef1234567890abcdef") - variant('invino', default=True, description='?') - variant('veritas', default=True, description='?') + variant("invino", default=True, description="?") + variant("veritas", default=True, description="?") - depends_on('fftw@:1.0') - depends_on('fftw+mpi', when='+invino') + depends_on("fftw@:1.0") + depends_on("fftw+mpi", when="+invino") - depends_on('openblas', when='^fftw@:1') + depends_on("openblas", when="^fftw@:1") - depends_on('libelf@0.8.10:') - depends_on('libelf@:0.8.12', when='+veritas') + depends_on("libelf@0.8.10:") + depends_on("libelf@:0.8.12", when="+veritas") diff --git a/var/spack/repos/builtin.mock/packages/quux/package.py b/var/spack/repos/builtin.mock/packages/quux/package.py index e07ca6ee34..693ef07ba4 100644 --- a/var/spack/repos/builtin.mock/packages/quux/package.py +++ b/var/spack/repos/builtin.mock/packages/quux/package.py @@ -15,12 +15,12 @@ class Quux(Package): homepage = "https://www.example.com" has_code = False - version('3.0.0') + version("3.0.0") - depends_on('garply') + depends_on("garply") def install(self, spec, prefix): - quux_cc = '''#include "quux.h" + quux_cc = """#include "quux.h" #include "garply/garply.h" #include "quux_version.h" #include <iostream> @@ -54,8 +54,8 @@ Quux::quuxify() const return quux_version; } -''' - quux_h = '''#ifndef QUUX_H_ +""" + quux_h = """#ifndef QUUX_H_ class Quux { @@ -70,8 +70,8 @@ public: }; #endif // QUUX_H_ -''' - quuxifier_cc = ''' +""" + quuxifier_cc = """ #include "quux.h" #include <iostream> @@ -83,74 +83,113 @@ main() return 0; } -''' - quux_version_h = '''const int quux_version_major = %s; +""" + quux_version_h = """const int quux_version_major = %s; const int quux_version_minor = %s; -''' - mkdirp('%s/quux' % prefix.include) - mkdirp('%s/quux' % self.stage.source_path) - with open('%s/quux_version.h' % self.stage.source_path, 'w') as f: +""" + mkdirp("%s/quux" % prefix.include) + mkdirp("%s/quux" % self.stage.source_path) + with open("%s/quux_version.h" % self.stage.source_path, "w") as f: f.write(quux_version_h % (self.version[0], self.version[1:])) - with open('%s/quux/quux.cc' % self.stage.source_path, 'w') as f: + with open("%s/quux/quux.cc" % self.stage.source_path, "w") as f: f.write(quux_cc % (prefix.config)) - with open('%s/quux/quux.h' % self.stage.source_path, 'w') as f: + with open("%s/quux/quux.h" % self.stage.source_path, "w") as f: f.write(quux_h) - with open('%s/quux/quuxifier.cc' % self.stage.source_path, 'w') as f: + with open("%s/quux/quuxifier.cc" % self.stage.source_path, "w") as f: f.write(quuxifier_cc) - gpp = which('/usr/bin/g++') - if sys.platform == 'darwin': - gpp = which('/usr/bin/clang++') - gpp('-Dquux_EXPORTS', - '-I%s' % self.stage.source_path, - '-I%s' % spec['garply'].prefix.include, - '-O2', '-g', '-DNDEBUG', '-fPIC', - '-o', 'quux.cc.o', - '-c', 'quux/quux.cc') - gpp('-Dquux_EXPORTS', - '-I%s' % self.stage.source_path, - '-I%s' % spec['garply'].prefix.include, - '-O2', '-g', '-DNDEBUG', '-fPIC', - '-o', 'quuxifier.cc.o', - '-c', 'quux/quuxifier.cc') - if sys.platform == 'darwin': - gpp('-fPIC', '-O2', '-g', '-DNDEBUG', - '-dynamiclib', '-Wl,-headerpad_max_install_names', - '-o', 'libquux.dylib', - '-install_name', '@rpath/libcorge.dylib', - 'quux.cc.o', '-Wl,-rpath,%s' % prefix.lib64, - '-Wl,-rpath,%s' % spec['garply'].prefix.lib64, - '%s/libgarply.dylib' % spec['garply'].prefix.lib64) - gpp('-O2', '-g', '-DNDEBUG', - 'quuxifier.cc.o', '-o', 'quuxifier', - '-Wl,-rpath,%s' % prefix.lib64, - '-Wl,-rpath,%s' % spec['garply'].prefix.lib64, - 'libquux.dylib', - '%s/libgarply.dylib' % spec['garply'].prefix.lib64) + gpp = which("/usr/bin/g++") + if sys.platform == "darwin": + gpp = which("/usr/bin/clang++") + gpp( + "-Dquux_EXPORTS", + "-I%s" % self.stage.source_path, + "-I%s" % spec["garply"].prefix.include, + "-O2", + "-g", + "-DNDEBUG", + "-fPIC", + "-o", + "quux.cc.o", + "-c", + "quux/quux.cc", + ) + gpp( + "-Dquux_EXPORTS", + "-I%s" % self.stage.source_path, + "-I%s" % spec["garply"].prefix.include, + "-O2", + "-g", + "-DNDEBUG", + "-fPIC", + "-o", + "quuxifier.cc.o", + "-c", + "quux/quuxifier.cc", + ) + if sys.platform == "darwin": + gpp( + "-fPIC", + "-O2", + "-g", + "-DNDEBUG", + "-dynamiclib", + "-Wl,-headerpad_max_install_names", + "-o", + "libquux.dylib", + "-install_name", + "@rpath/libcorge.dylib", + "quux.cc.o", + "-Wl,-rpath,%s" % prefix.lib64, + "-Wl,-rpath,%s" % spec["garply"].prefix.lib64, + "%s/libgarply.dylib" % spec["garply"].prefix.lib64, + ) + gpp( + "-O2", + "-g", + "-DNDEBUG", + "quuxifier.cc.o", + "-o", + "quuxifier", + "-Wl,-rpath,%s" % prefix.lib64, + "-Wl,-rpath,%s" % spec["garply"].prefix.lib64, + "libquux.dylib", + "%s/libgarply.dylib" % spec["garply"].prefix.lib64, + ) mkdirp(prefix.lib64) - copy('libquux.dylib', '%s/libquux.dylib' % prefix.lib64) - os.link('%s/libquux.dylib' % prefix.lib64, - '%s/libquux.dylib.3.0' % prefix.lib64) + copy("libquux.dylib", "%s/libquux.dylib" % prefix.lib64) + os.link("%s/libquux.dylib" % prefix.lib64, "%s/libquux.dylib.3.0" % prefix.lib64) else: - gpp('-fPIC', '-O2', '-g', '-DNDEBUG', '-shared', - '-Wl,-soname,libquux.so', '-o', 'libquux.so', 'quux.cc.o', - '-Wl,-rpath,%s:%s::::' % (prefix.lib64, - spec['garply'].prefix.lib64), - '%s/libgarply.so' % spec['garply'].prefix.lib64) - gpp('-O2', '-g', '-DNDEBUG', '-rdynamic', - 'quuxifier.cc.o', '-o', 'quuxifier', - '-Wl,-rpath,%s:%s::::' % (prefix.lib64, - spec['garply'].prefix.lib64), - 'libquux.so', - '%s/libgarply.so' % spec['garply'].prefix.lib64) + gpp( + "-fPIC", + "-O2", + "-g", + "-DNDEBUG", + "-shared", + "-Wl,-soname,libquux.so", + "-o", + "libquux.so", + "quux.cc.o", + "-Wl,-rpath,%s:%s::::" % (prefix.lib64, spec["garply"].prefix.lib64), + "%s/libgarply.so" % spec["garply"].prefix.lib64, + ) + gpp( + "-O2", + "-g", + "-DNDEBUG", + "-rdynamic", + "quuxifier.cc.o", + "-o", + "quuxifier", + "-Wl,-rpath,%s:%s::::" % (prefix.lib64, spec["garply"].prefix.lib64), + "libquux.so", + "%s/libgarply.so" % spec["garply"].prefix.lib64, + ) mkdirp(prefix.lib64) - copy('libquux.so', '%s/libquux.so' % prefix.lib64) - os.link('%s/libquux.so' % prefix.lib64, - '%s/libquux.so.3.0' % prefix.lib64) - copy('quuxifier', '%s/quuxifier' % prefix.lib64) - copy('%s/quux/quux.h' % self.stage.source_path, - '%s/quux/quux.h' % prefix.include) + copy("libquux.so", "%s/libquux.so" % prefix.lib64) + os.link("%s/libquux.so" % prefix.lib64, "%s/libquux.so.3.0" % prefix.lib64) + copy("quuxifier", "%s/quuxifier" % prefix.lib64) + copy("%s/quux/quux.h" % self.stage.source_path, "%s/quux/quux.h" % prefix.include) mkdirp(prefix.bin) - copy('quux_version.h', '%s/quux_version.h' % prefix.bin) - os.symlink('%s/quuxifier' % prefix.lib64, '%s/quuxifier' % prefix.bin) - os.symlink('%s/garplinator' % spec['garply'].prefix.lib64, - '%s/garplinator' % prefix.bin) + copy("quux_version.h", "%s/quux_version.h" % prefix.bin) + os.symlink("%s/quuxifier" % prefix.lib64, "%s/quuxifier" % prefix.bin) + os.symlink("%s/garplinator" % spec["garply"].prefix.lib64, "%s/garplinator" % prefix.bin) diff --git a/var/spack/repos/builtin.mock/packages/raiser/package.py b/var/spack/repos/builtin.mock/packages/raiser/package.py index daabfc8413..59169a3a12 100644 --- a/var/spack/repos/builtin.mock/packages/raiser/package.py +++ b/var/spack/repos/builtin.mock/packages/raiser/package.py @@ -16,28 +16,28 @@ class Raiser(Package): homepage = "http://www.example.com" url = "http://www.example.com/a-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') - version('2.0', 'abcdef0123456789abcdef0123456789') + version("1.0", "0123456789abcdef0123456789abcdef") + version("2.0", "abcdef0123456789abcdef0123456789") variant( - 'exc_type', + "exc_type", values=lambda x: isinstance(x, str), - default='RuntimeError', - description='type of the exception to be raised', - multi=False + default="RuntimeError", + description="type of the exception to be raised", + multi=False, ) variant( - 'msg', + "msg", values=lambda x: isinstance(x, str), - default='Unknown Exception', - description='message that will be tied to the exception', - multi=False + default="Unknown Exception", + description="message that will be tied to the exception", + multi=False, ) def install(self, spec, prefix): - print('Raiser will raise ') - exc_typename = self.spec.variants['exc_type'].value + print("Raiser will raise ") + exc_typename = self.spec.variants["exc_type"].value exc_type = getattr(builtins, exc_typename) - msg = self.spec.variants['msg'].value + msg = self.spec.variants["msg"].value raise exc_type(msg) diff --git a/var/spack/repos/builtin.mock/packages/requires-virtual/package.py b/var/spack/repos/builtin.mock/packages/requires-virtual/package.py index 5049f2a9b7..b2afaaf089 100644 --- a/var/spack/repos/builtin.mock/packages/requires-virtual/package.py +++ b/var/spack/repos/builtin.mock/packages/requires-virtual/package.py @@ -14,6 +14,6 @@ class RequiresVirtual(Package): homepage = "http://www.example.com" url = "http://www.example.com/a-1.0.tar.gz" - version('2.0', 'abcdef0123456789abcdef0123456789') + version("2.0", "abcdef0123456789abcdef0123456789") - depends_on('stuff') + depends_on("stuff") diff --git a/var/spack/repos/builtin.mock/packages/root-adds-virtual/package.py b/var/spack/repos/builtin.mock/packages/root-adds-virtual/package.py index 3be035ca4d..e01e28f102 100644 --- a/var/spack/repos/builtin.mock/packages/root-adds-virtual/package.py +++ b/var/spack/repos/builtin.mock/packages/root-adds-virtual/package.py @@ -9,6 +9,6 @@ class RootAddsVirtual(Package): homepage = "http://www.example.com" url = "http://www.example.com/root-adds-virtual-1.0.tar.gz" - version('1.0', sha256='abcdef0123456789abcdef0123456789') + version("1.0", sha256="abcdef0123456789abcdef0123456789") - depends_on('middle-adds-virtual') + depends_on("middle-adds-virtual") diff --git a/var/spack/repos/builtin.mock/packages/root/package.py b/var/spack/repos/builtin.mock/packages/root/package.py index 221f9681e2..26aa0bb1c9 100644 --- a/var/spack/repos/builtin.mock/packages/root/package.py +++ b/var/spack/repos/builtin.mock/packages/root/package.py @@ -9,6 +9,6 @@ class Root(Package): homepage = "http://www.example.com" url = "http://www.example.com/root-1.0.tar.gz" - version('1.0', 'abcdef0123456789abcdef0123456789') + version("1.0", "abcdef0123456789abcdef0123456789") - depends_on('gmt') + depends_on("gmt") diff --git a/var/spack/repos/builtin.mock/packages/simple-inheritance/package.py b/var/spack/repos/builtin.mock/packages/simple-inheritance/package.py index 2461862218..70bb57f835 100644 --- a/var/spack/repos/builtin.mock/packages/simple-inheritance/package.py +++ b/var/spack/repos/builtin.mock/packages/simple-inheritance/package.py @@ -8,16 +8,16 @@ from spack.package import * class BaseWithDirectives(Package): - depends_on('cmake', type='build') - depends_on('mpi') - variant('openblas', description='Activates openblas', default=True) - provides('service1') + depends_on("cmake", type="build") + depends_on("mpi") + variant("openblas", description="Activates openblas", default=True) + provides("service1") def use_module_variable(self): """Must be called in build environment. Allows us to test parent class - using module variables set up by build_environment.""" - env['TEST_MODULE_VAR'] = 'test_module_variable' - return env['TEST_MODULE_VAR'] + using module variables set up by build_environment.""" + env["TEST_MODULE_VAR"] = "test_module_variable" + return env["TEST_MODULE_VAR"] class SimpleInheritance(BaseWithDirectives): @@ -26,7 +26,7 @@ class SimpleInheritance(BaseWithDirectives): homepage = "http://www.example.com" url = "http://www.example.com/simple-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") - depends_on('openblas', when='+openblas') - provides('lapack', when='+openblas') + depends_on("openblas", when="+openblas") + provides("lapack", when="+openblas") diff --git a/var/spack/repos/builtin.mock/packages/simple-standalone-test/package.py b/var/spack/repos/builtin.mock/packages/simple-standalone-test/package.py index 8df83c788e..46248253cd 100644 --- a/var/spack/repos/builtin.mock/packages/simple-standalone-test/package.py +++ b/var/spack/repos/builtin.mock/packages/simple-standalone-test/package.py @@ -8,13 +8,12 @@ from spack.package import * class SimpleStandaloneTest(Package): """This package has a simple stand-alone test features.""" + homepage = "http://www.example.com/simple_test" - url = "http://www.unit-test-should-replace-this-url/simple_test-1.0.tar.gz" + url = "http://www.unit-test-should-replace-this-url/simple_test-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") def test(self): - msg = 'simple stand-alone test' - self.run_test('echo', [msg], - expected=[msg], - purpose='test: running {0}'.format(msg)) + msg = "simple stand-alone test" + self.run_test("echo", [msg], expected=[msg], purpose="test: running {0}".format(msg)) diff --git a/var/spack/repos/builtin.mock/packages/singlevalue-variant-dependent-type/package.py b/var/spack/repos/builtin.mock/packages/singlevalue-variant-dependent-type/package.py index 2bb841a466..ae0615f0f7 100644 --- a/var/spack/repos/builtin.mock/packages/singlevalue-variant-dependent-type/package.py +++ b/var/spack/repos/builtin.mock/packages/singlevalue-variant-dependent-type/package.py @@ -9,11 +9,11 @@ from spack.package import * class SinglevalueVariantDependentType(Package): """Simple package with one dependency that has a single-valued - variant with values=str""" + variant with values=str""" homepage = "http://www.example.com" - url = "http://www.example.com/archive-1.0.tar.gz" + url = "http://www.example.com/archive-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") - depends_on('singlevalue-variant fum=nope') + depends_on("singlevalue-variant fum=nope") diff --git a/var/spack/repos/builtin.mock/packages/singlevalue-variant-dependent/package.py b/var/spack/repos/builtin.mock/packages/singlevalue-variant-dependent/package.py index 6d9bfe26c9..418d00d4f2 100644 --- a/var/spack/repos/builtin.mock/packages/singlevalue-variant-dependent/package.py +++ b/var/spack/repos/builtin.mock/packages/singlevalue-variant-dependent/package.py @@ -10,8 +10,8 @@ class SinglevalueVariantDependent(Package): """Simple package with one optional dependency""" homepage = "http://www.example.com" - url = "http://www.example.com/archive-1.0.tar.gz" + url = "http://www.example.com/archive-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") - depends_on('multivalue-variant fee=baz') + depends_on("multivalue-variant fee=baz") diff --git a/var/spack/repos/builtin.mock/packages/singlevalue-variant/package.py b/var/spack/repos/builtin.mock/packages/singlevalue-variant/package.py index 2440da9bb8..cc831186b2 100644 --- a/var/spack/repos/builtin.mock/packages/singlevalue-variant/package.py +++ b/var/spack/repos/builtin.mock/packages/singlevalue-variant/package.py @@ -11,12 +11,12 @@ class SinglevalueVariant(Package): homepage = "http://www.llnl.gov" url = "http://www.llnl.gov/mpileaks-1.0.tar.gz" - version(1.0, '0123456789abcdef0123456789abcdef') + version(1.0, "0123456789abcdef0123456789abcdef") variant( - 'fum', - description='Single-valued variant with type in values', - default='bar', + "fum", + description="Single-valued variant with type in values", + default="bar", values=str, - multi=False + multi=False, ) diff --git a/var/spack/repos/builtin.mock/packages/some-virtual-mv/package.py b/var/spack/repos/builtin.mock/packages/some-virtual-mv/package.py index 0a024ae4fb..3075049fd1 100644 --- a/var/spack/repos/builtin.mock/packages/some-virtual-mv/package.py +++ b/var/spack/repos/builtin.mock/packages/some-virtual-mv/package.py @@ -12,11 +12,16 @@ class SomeVirtualMv(Package): homepage = "http://www.example.com" url = "http://www.example.com/foo-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") - provides('somevirtual') + provides("somevirtual") # This multi valued variant is needed to trigger an optimization # criteria for clingo - variant('libs', default='shared,static', values=('shared', 'static'), - multi=True, description='Build shared libs, static libs or both') + variant( + "libs", + default="shared,static", + values=("shared", "static"), + multi=True, + description="Build shared libs, static libs or both", + ) diff --git a/var/spack/repos/builtin.mock/packages/some-virtual-preferred/package.py b/var/spack/repos/builtin.mock/packages/some-virtual-preferred/package.py index b0b1c9ce17..242c3bb240 100644 --- a/var/spack/repos/builtin.mock/packages/some-virtual-preferred/package.py +++ b/var/spack/repos/builtin.mock/packages/some-virtual-preferred/package.py @@ -12,6 +12,6 @@ class SomeVirtualPreferred(Package): homepage = "http://www.example.com" url = "http://www.example.com/foo-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") - provides('somevirtual') + provides("somevirtual") diff --git a/var/spack/repos/builtin.mock/packages/splice-a/package.py b/var/spack/repos/builtin.mock/packages/splice-a/package.py index b8d3dcb243..fd4b952d9c 100644 --- a/var/spack/repos/builtin.mock/packages/splice-a/package.py +++ b/var/spack/repos/builtin.mock/packages/splice-a/package.py @@ -10,21 +10,21 @@ class SpliceA(Package): """Simple package with one optional dependency""" homepage = "http://www.example.com" - url = "http://www.example.com/splice-a-1.0.tar.gz" + url = "http://www.example.com/splice-a-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789efghij') + version("1.0", "0123456789abcdef0123456789efghij") - variant('foo', default=False, description='nope') - variant('bar', default=False, description='nope') - variant('baz', default=False, description='nope') + variant("foo", default=False, description="nope") + variant("bar", default=False, description="nope") + variant("baz", default=False, description="nope") - depends_on('splice-z') - depends_on('splice-z+foo', when='+foo') + depends_on("splice-z") + depends_on("splice-z+foo", when="+foo") - provides('something') - provides('somethingelse') + provides("something") + provides("somethingelse") def install(self, spec, prefix): - with open(prefix.join('splice-a'), 'w') as f: - f.write('splice-a: {0}'.format(prefix)) - f.write('splice-z: {0}'.format(spec['splice-z'].prefix)) + with open(prefix.join("splice-a"), "w") as f: + f.write("splice-a: {0}".format(prefix)) + f.write("splice-z: {0}".format(spec["splice-z"].prefix)) diff --git a/var/spack/repos/builtin.mock/packages/splice-h/package.py b/var/spack/repos/builtin.mock/packages/splice-h/package.py index ecfd2c8b3a..2969b9593f 100644 --- a/var/spack/repos/builtin.mock/packages/splice-h/package.py +++ b/var/spack/repos/builtin.mock/packages/splice-h/package.py @@ -10,21 +10,21 @@ class SpliceH(Package): """Simple package with one optional dependency""" homepage = "http://www.example.com" - url = "http://www.example.com/splice-h-1.0.tar.gz" + url = "http://www.example.com/splice-h-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") - variant('foo', default=False, description='nope') - variant('bar', default=False, description='nope') - variant('baz', default=False, description='nope') + variant("foo", default=False, description="nope") + variant("bar", default=False, description="nope") + variant("baz", default=False, description="nope") - depends_on('splice-z') - depends_on('splice-z+foo', when='+foo') + depends_on("splice-z") + depends_on("splice-z+foo", when="+foo") - provides('something') - provides('somethingelse') + provides("something") + provides("somethingelse") def install(self, spec, prefix): - with open(prefix.join('splice-h'), 'w') as f: - f.write('splice-h: {0}'.format(prefix)) - f.write('splice-z: {0}'.format(spec['splice-z'].prefix)) + with open(prefix.join("splice-h"), "w") as f: + f.write("splice-h: {0}".format(prefix)) + f.write("splice-z: {0}".format(spec["splice-z"].prefix)) diff --git a/var/spack/repos/builtin.mock/packages/splice-t/package.py b/var/spack/repos/builtin.mock/packages/splice-t/package.py index 9cb4a4a70e..e7d58d8da9 100644 --- a/var/spack/repos/builtin.mock/packages/splice-t/package.py +++ b/var/spack/repos/builtin.mock/packages/splice-t/package.py @@ -10,15 +10,15 @@ class SpliceT(Package): """Simple package with one optional dependency""" homepage = "http://www.example.com" - url = "http://www.example.com/splice-t-1.0.tar.gz" + url = "http://www.example.com/splice-t-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") - depends_on('splice-h') - depends_on('splice-z') + depends_on("splice-h") + depends_on("splice-z") def install(self, spec, prefix): - with open(prefix.join('splice-t'), 'w') as f: - f.write('splice-t: {0}'.format(prefix)) - f.write('splice-h: {0}'.format(spec['splice-h'].prefix)) - f.write('splice-z: {0}'.format(spec['splice-z'].prefix)) + with open(prefix.join("splice-t"), "w") as f: + f.write("splice-t: {0}".format(prefix)) + f.write("splice-h: {0}".format(spec["splice-h"].prefix)) + f.write("splice-z: {0}".format(spec["splice-z"].prefix)) diff --git a/var/spack/repos/builtin.mock/packages/splice-vh/package.py b/var/spack/repos/builtin.mock/packages/splice-vh/package.py index 424fb5ddcf..c56ceffe2b 100644 --- a/var/spack/repos/builtin.mock/packages/splice-vh/package.py +++ b/var/spack/repos/builtin.mock/packages/splice-vh/package.py @@ -10,20 +10,20 @@ class SpliceVh(Package): """Simple package with one optional dependency""" homepage = "http://www.example.com" - url = "http://www.example.com/splice-vh-1.0.tar.gz" + url = "http://www.example.com/splice-vh-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") - variant('foo', default=False, description='nope') - variant('bar', default=False, description='nope') - variant('baz', default=False, description='nope') + variant("foo", default=False, description="nope") + variant("bar", default=False, description="nope") + variant("baz", default=False, description="nope") - depends_on('splice-z') - depends_on('splice-z+foo', when='+foo') + depends_on("splice-z") + depends_on("splice-z+foo", when="+foo") - provides('something') + provides("something") def install(self, spec, prefix): - with open(prefix.join('splice-vh'), 'w') as f: - f.write('splice-vh: {0}'.format(prefix)) - f.write('splice-z: {0}'.format(spec['splice-z'].prefix)) + with open(prefix.join("splice-vh"), "w") as f: + f.write("splice-vh: {0}".format(prefix)) + f.write("splice-z: {0}".format(spec["splice-z"].prefix)) diff --git a/var/spack/repos/builtin.mock/packages/splice-z/package.py b/var/spack/repos/builtin.mock/packages/splice-z/package.py index c818bc8a2c..a5fe0e5243 100644 --- a/var/spack/repos/builtin.mock/packages/splice-z/package.py +++ b/var/spack/repos/builtin.mock/packages/splice-z/package.py @@ -10,13 +10,13 @@ class SpliceZ(Package): """Simple package with one optional dependency""" homepage = "http://www.example.com" - url = "http://www.example.com/splice-z-1.0.tar.gz" + url = "http://www.example.com/splice-z-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") - variant('foo', default=False, description='nope') - variant('bar', default=False, description='nope') + variant("foo", default=False, description="nope") + variant("bar", default=False, description="nope") def install(self, spec, prefix): - with open(prefix.join('splice-z'), 'w') as f: - f.write('splice-z: {0}'.format(prefix)) + with open(prefix.join("splice-z"), "w") as f: + f.write("splice-z: {0}".format(prefix)) diff --git a/var/spack/repos/builtin.mock/packages/sticky-variant/package.py b/var/spack/repos/builtin.mock/packages/sticky-variant/package.py index e8a8ee24dd..6d759e39dc 100644 --- a/var/spack/repos/builtin.mock/packages/sticky-variant/package.py +++ b/var/spack/repos/builtin.mock/packages/sticky-variant/package.py @@ -11,8 +11,8 @@ class StickyVariant(AutotoolsPackage): homepage = "http://www.example.com" url = "http://www.example.com/a-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") - variant('allow-gcc', description='', default=False, sticky=True) + variant("allow-gcc", description="", default=False, sticky=True) - conflicts('%gcc', when='~allow-gcc') + conflicts("%gcc", when="~allow-gcc") diff --git a/var/spack/repos/builtin.mock/packages/svn-test/package.py b/var/spack/repos/builtin.mock/packages/svn-test/package.py index ffbdf885df..82155fa294 100644 --- a/var/spack/repos/builtin.mock/packages/svn-test/package.py +++ b/var/spack/repos/builtin.mock/packages/svn-test/package.py @@ -8,6 +8,7 @@ from spack.package import * class SvnTest(Package): """Mock package that uses svn for fetching.""" - url = "http://www.example.com/svn-test-1.0.tar.gz" - version('svn', svn='to-be-filled-in-by-test') + url = "http://www.example.com/svn-test-1.0.tar.gz" + + version("svn", svn="to-be-filled-in-by-test") diff --git a/var/spack/repos/builtin.mock/packages/svn-top-level/package.py b/var/spack/repos/builtin.mock/packages/svn-top-level/package.py index ea88701eb3..b166fe1adc 100644 --- a/var/spack/repos/builtin.mock/packages/svn-top-level/package.py +++ b/var/spack/repos/builtin.mock/packages/svn-top-level/package.py @@ -9,5 +9,5 @@ from spack.package import * class SvnTopLevel(Package): """Mock package that uses svn for fetching.""" - svn = 'https://example.com/some/svn/repo' - version('1.0') + svn = "https://example.com/some/svn/repo" + version("1.0") diff --git a/var/spack/repos/builtin.mock/packages/symly/package.py b/var/spack/repos/builtin.mock/packages/symly/package.py index 647450dc6d..16ec7f5af4 100644 --- a/var/spack/repos/builtin.mock/packages/symly/package.py +++ b/var/spack/repos/builtin.mock/packages/symly/package.py @@ -15,31 +15,29 @@ class Symly(Package): homepage = "https://www.example.com" has_code = False - version('3.0.0') + version("3.0.0") def install(self, spec, prefix): - symly_c = ''' + symly_c = """ #include <stdio.h> int main() { printf("I'm just here to give the build system something to do..."); return 0; } -''' - mkdirp('%s/symly' % self.stage.source_path) - with open('%s/symly/symly.c' % self.stage.source_path, 'w') as f: +""" + mkdirp("%s/symly" % self.stage.source_path) + with open("%s/symly/symly.c" % self.stage.source_path, "w") as f: f.write(symly_c) - gcc = which('/usr/bin/gcc') - if sys.platform == 'darwin': - gcc = which('/usr/bin/clang') + gcc = which("/usr/bin/gcc") + if sys.platform == "darwin": + gcc = which("/usr/bin/clang") mkdirp(prefix.bin) mkdirp(prefix.lib64) - gcc('-o', 'symly.bin', - 'symly/symly.c') + gcc("-o", "symly.bin", "symly/symly.c") print("prefix.bin", prefix.bin) - copy('symly.bin', '%s/symly' % prefix.bin) + copy("symly.bin", "%s/symly" % prefix.bin) # create a symlinked file. - os.symlink('%s/symly' % prefix.bin, - '%s/symly' % prefix.lib64) + os.symlink("%s/symly" % prefix.bin, "%s/symly" % prefix.lib64) # Create a symlinked directory. os.symlink(prefix.bin, prefix.include) diff --git a/var/spack/repos/builtin.mock/packages/test-build-callbacks/package.py b/var/spack/repos/builtin.mock/packages/test-build-callbacks/package.py index 3a60554674..4b4b74e9b3 100644 --- a/var/spack/repos/builtin.mock/packages/test-build-callbacks/package.py +++ b/var/spack/repos/builtin.mock/packages/test-build-callbacks/package.py @@ -11,14 +11,14 @@ class TestBuildCallbacks(Package): """This package illustrates build callback test failure.""" homepage = "http://www.example.com/test-build-callbacks" - url = "http://www.test-failure.test/test-build-callbacks-1.0.tar.gz" + url = "http://www.test-failure.test/test-build-callbacks-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") - phases = ['build', 'install'] + phases = ["build", "install"] # Include undefined method (runtime failure) and 'test' (audit failure) - build_time_test_callbacks = ['undefined-build-test', 'test'] - run_after('build')(Package._run_default_build_time_test_callbacks) + build_time_test_callbacks = ["undefined-build-test", "test"] + run_after("build")(Package._run_default_build_time_test_callbacks) def build(self, spec, prefix): pass @@ -27,5 +27,5 @@ class TestBuildCallbacks(Package): mkdirp(prefix.bin) def test(self): - print('test: running test-build-callbacks') - print('PASSED') + print("test: running test-build-callbacks") + print("PASSED") diff --git a/var/spack/repos/builtin.mock/packages/test-dep-with-imposed-conditions/package.py b/var/spack/repos/builtin.mock/packages/test-dep-with-imposed-conditions/package.py index 9746e5315d..a5d8abcfec 100644 --- a/var/spack/repos/builtin.mock/packages/test-dep-with-imposed-conditions/package.py +++ b/var/spack/repos/builtin.mock/packages/test-dep-with-imposed-conditions/package.py @@ -12,6 +12,6 @@ class TestDepWithImposedConditions(Package): homepage = "http://www.example.com" url = "http://www.example.com/e-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") - depends_on('c@1.0', type='test') + depends_on("c@1.0", type="test") diff --git a/var/spack/repos/builtin.mock/packages/test-dependency/package.py b/var/spack/repos/builtin.mock/packages/test-dependency/package.py index 1bdb4f3f47..116530f805 100644 --- a/var/spack/repos/builtin.mock/packages/test-dependency/package.py +++ b/var/spack/repos/builtin.mock/packages/test-dependency/package.py @@ -9,7 +9,8 @@ class TestDependency(Package): """Represent a dependency that is pulled-in to allow testing other packages. """ + homepage = "http://www.example.com" url = "http://www.example.com/tdep-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") diff --git a/var/spack/repos/builtin.mock/packages/test-error/package.py b/var/spack/repos/builtin.mock/packages/test-error/package.py index 783973929e..4ab4027315 100644 --- a/var/spack/repos/builtin.mock/packages/test-error/package.py +++ b/var/spack/repos/builtin.mock/packages/test-error/package.py @@ -10,12 +10,12 @@ class TestError(Package): """This package has a test method that fails in a subprocess.""" homepage = "http://www.example.com/test-failure" - url = "http://www.test-failure.test/test-failure-1.0.tar.gz" + url = "http://www.test-failure.test/test-failure-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") def install(self, spec, prefix): mkdirp(prefix.bin) def test(self): - self.run_test('false') + self.run_test("false") diff --git a/var/spack/repos/builtin.mock/packages/test-fail/package.py b/var/spack/repos/builtin.mock/packages/test-fail/package.py index 2571b0e44e..8e18fc523f 100644 --- a/var/spack/repos/builtin.mock/packages/test-fail/package.py +++ b/var/spack/repos/builtin.mock/packages/test-fail/package.py @@ -10,12 +10,12 @@ class TestFail(Package): """This package has a test method that fails in a subprocess.""" homepage = "http://www.example.com/test-failure" - url = "http://www.test-failure.test/test-failure-1.0.tar.gz" + url = "http://www.test-failure.test/test-failure-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") def install(self, spec, prefix): mkdirp(prefix.bin) def test(self): - self.run_test('true', expected=['not in the output']) + self.run_test("true", expected=["not in the output"]) diff --git a/var/spack/repos/builtin.mock/packages/test-install-callbacks/package.py b/var/spack/repos/builtin.mock/packages/test-install-callbacks/package.py index 099d04766d..27a31227c3 100644 --- a/var/spack/repos/builtin.mock/packages/test-install-callbacks/package.py +++ b/var/spack/repos/builtin.mock/packages/test-install-callbacks/package.py @@ -11,17 +11,17 @@ class TestInstallCallbacks(Package): """This package illustrates install callback test failure.""" homepage = "http://www.example.com/test-install-callbacks" - url = "http://www.test-failure.test/test-install-callbacks-1.0.tar.gz" + url = "http://www.test-failure.test/test-install-callbacks-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") # Include an undefined callback method - install_time_test_callbacks = ['undefined-install-test', 'test'] - run_after('install')(Package._run_default_install_time_test_callbacks) + install_time_test_callbacks = ["undefined-install-test", "test"] + run_after("install")(Package._run_default_install_time_test_callbacks) def install(self, spec, prefix): mkdirp(prefix.bin) def test(self): - print('test: test-install-callbacks') - print('PASSED') + print("test: test-install-callbacks") + print("PASSED") diff --git a/var/spack/repos/builtin.mock/packages/transitive-conditional-virtual-dependency/package.py b/var/spack/repos/builtin.mock/packages/transitive-conditional-virtual-dependency/package.py index f0c80a6bc2..a7c4658810 100644 --- a/var/spack/repos/builtin.mock/packages/transitive-conditional-virtual-dependency/package.py +++ b/var/spack/repos/builtin.mock/packages/transitive-conditional-virtual-dependency/package.py @@ -7,9 +7,10 @@ from spack.package import * class TransitiveConditionalVirtualDependency(Package): """Depends on a package with a conditional virtual dependency.""" + homepage = "https://dev.null" has_code = False phases = [] - version('1.0') - depends_on('conditional-virtual-dependency') + version("1.0") + depends_on("conditional-virtual-dependency") diff --git a/var/spack/repos/builtin.mock/packages/trigger-external-non-default-variant/package.py b/var/spack/repos/builtin.mock/packages/trigger-external-non-default-variant/package.py index a491b164be..1c4df851e9 100644 --- a/var/spack/repos/builtin.mock/packages/trigger-external-non-default-variant/package.py +++ b/var/spack/repos/builtin.mock/packages/trigger-external-non-default-variant/package.py @@ -7,9 +7,10 @@ from spack.package import * class TriggerExternalNonDefaultVariant(Package): """This ackage depends on an external with a non-default variant""" + homepage = "http://www.example.com" url = "http://www.someurl.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") - depends_on('external-non-default-variant') + depends_on("external-non-default-variant") diff --git a/var/spack/repos/builtin.mock/packages/trivial-install-test-package/package.py b/var/spack/repos/builtin.mock/packages/trivial-install-test-package/package.py index 9b251d8e51..95616d6fd7 100644 --- a/var/spack/repos/builtin.mock/packages/trivial-install-test-package/package.py +++ b/var/spack/repos/builtin.mock/packages/trivial-install-test-package/package.py @@ -7,11 +7,12 @@ from spack.package import * class TrivialInstallTestPackage(Package): """This package is a stub with a trivial install method. It allows us - to test the install and uninstall logic of spack.""" + to test the install and uninstall logic of spack.""" + homepage = "http://www.example.com/trivial_install" - url = "http://www.unit-test-should-replace-this-url/trivial_install-1.0.tar.gz" + url = "http://www.unit-test-should-replace-this-url/trivial_install-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") def install(self, spec, prefix): - touch(join_path(prefix, 'an_installation_file')) + touch(join_path(prefix, "an_installation_file")) diff --git a/var/spack/repos/builtin.mock/packages/trivial-pkg-with-valid-hash/package.py b/var/spack/repos/builtin.mock/packages/trivial-pkg-with-valid-hash/package.py index d99c6f7195..6143df3645 100644 --- a/var/spack/repos/builtin.mock/packages/trivial-pkg-with-valid-hash/package.py +++ b/var/spack/repos/builtin.mock/packages/trivial-pkg-with-valid-hash/package.py @@ -9,7 +9,9 @@ from spack.package import * class TrivialPkgWithValidHash(Package): url = "http://www.unit-test-should-replace-this-url/trivial_install-1.0" - version('1.0', '6ae8a75555209fd6c44157c0aed8016e763ff435a19cf186f76863140143ff72', expand=False) + version( + "1.0", "6ae8a75555209fd6c44157c0aed8016e763ff435a19cf186f76863140143ff72", expand=False + ) hashed_content = "test content" diff --git a/var/spack/repos/builtin.mock/packages/trivial-smoke-test/package.py b/var/spack/repos/builtin.mock/packages/trivial-smoke-test/package.py index 9059ad77f4..ec80640d21 100644 --- a/var/spack/repos/builtin.mock/packages/trivial-smoke-test/package.py +++ b/var/spack/repos/builtin.mock/packages/trivial-smoke-test/package.py @@ -8,18 +8,19 @@ from spack.package import * class TrivialSmokeTest(Package): """This package is a stub with trivial smoke test features.""" + homepage = "http://www.example.com/trivial_test" - url = "http://www.unit-test-should-replace-this-url/trivial_test-1.0.tar.gz" + url = "http://www.unit-test-should-replace-this-url/trivial_test-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") - test_source_filename = 'cached_file.in' + test_source_filename = "cached_file.in" - @run_before('install') + @run_before("install") def create_extra_test_source(self): mkdirp(self.install_test_root) touch(join_path(self.install_test_root, self.test_source_filename)) - @run_after('install') + @run_after("install") def copy_test_sources(self): self.cache_extra_test_sources([self.test_source_filename]) diff --git a/var/spack/repos/builtin.mock/packages/unconstrainable-conflict/package.py b/var/spack/repos/builtin.mock/packages/unconstrainable-conflict/package.py index 654d68e0e2..8e17c75868 100644 --- a/var/spack/repos/builtin.mock/packages/unconstrainable-conflict/package.py +++ b/var/spack/repos/builtin.mock/packages/unconstrainable-conflict/package.py @@ -10,10 +10,10 @@ class UnconstrainableConflict(Package): """Package with a conflict whose trigger cannot constrain its constraint.""" homepage = "http://www.example.com" - url = "http://www.example.com/unconstrainable-conflict-1.0.tar.gz" + url = "http://www.example.com/unconstrainable-conflict-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") # Two conflicts so there's always one that is not the current platform - conflicts('target=x86_64', when='platform=darwin') - conflicts('target=aarch64', when='platform=linux') + conflicts("target=x86_64", when="platform=darwin") + conflicts("target=aarch64", when="platform=linux") diff --git a/var/spack/repos/builtin.mock/packages/unsat-provider/package.py b/var/spack/repos/builtin.mock/packages/unsat-provider/package.py index ef280270af..cd62a7e09d 100644 --- a/var/spack/repos/builtin.mock/packages/unsat-provider/package.py +++ b/var/spack/repos/builtin.mock/packages/unsat-provider/package.py @@ -7,12 +7,13 @@ from spack.package import * class UnsatProvider(Package): """This package has a dependency on a virtual that cannot be provided""" + homepage = "http://www.example.com" url = "http://www.example.com/v1.0.tgz" - version('1.0', sha256='0123456789abcdef0123456789abcdef') + version("1.0", sha256="0123456789abcdef0123456789abcdef") - variant('foo', default=True, description='') + variant("foo", default=True, description="") - provides('unsatvdep', when='+foo') - conflicts('+foo') + provides("unsatvdep", when="+foo") + conflicts("+foo") diff --git a/var/spack/repos/builtin.mock/packages/unsat-virtual-dependency/package.py b/var/spack/repos/builtin.mock/packages/unsat-virtual-dependency/package.py index 2c7efbf943..c248edab40 100644 --- a/var/spack/repos/builtin.mock/packages/unsat-virtual-dependency/package.py +++ b/var/spack/repos/builtin.mock/packages/unsat-virtual-dependency/package.py @@ -7,9 +7,10 @@ from spack.package import * class UnsatVirtualDependency(Package): """This package has a dependency on a virtual that cannot be provided""" + homepage = "http://www.example.com" url = "http://www.example.com/v1.0.tgz" - version('1.0', sha256='0123456789abcdef0123456789abcdef') + version("1.0", sha256="0123456789abcdef0123456789abcdef") - depends_on('unsatvdep') + depends_on("unsatvdep") diff --git a/var/spack/repos/builtin.mock/packages/url-list-test/package.py b/var/spack/repos/builtin.mock/packages/url-list-test/package.py index 88dd1e7787..b2894bbd05 100644 --- a/var/spack/repos/builtin.mock/packages/url-list-test/package.py +++ b/var/spack/repos/builtin.mock/packages/url-list-test/package.py @@ -9,17 +9,18 @@ from spack.package import * class UrlListTest(Package): """Mock package with url_list.""" + homepage = "http://www.url-list-example.com" - web_data_path = join_path(spack.paths.test_path, 'data', 'web') - url = 'file://' + web_data_path + '/foo-0.0.0.tar.gz' - list_url = 'file://' + web_data_path + '/index.html' + web_data_path = join_path(spack.paths.test_path, "data", "web") + url = "file://" + web_data_path + "/foo-0.0.0.tar.gz" + list_url = "file://" + web_data_path + "/index.html" list_depth = 3 - version('0.0.0', '00000000000000000000000000000000') - version('1.0.0', '00000000000000000000000000000100') - version('3.0', '00000000000000000000000000000030') - version('4.5', '00000000000000000000000000000450') - version('2.0.0b2', '000000000000000000000000000200b2') - version('3.0a1', '000000000000000000000000000030a1') - version('4.5-rc5', '000000000000000000000000000045c5') + version("0.0.0", "00000000000000000000000000000000") + version("1.0.0", "00000000000000000000000000000100") + version("3.0", "00000000000000000000000000000030") + version("4.5", "00000000000000000000000000000450") + version("2.0.0b2", "000000000000000000000000000200b2") + version("3.0a1", "000000000000000000000000000030a1") + version("4.5-rc5", "000000000000000000000000000045c5") diff --git a/var/spack/repos/builtin.mock/packages/url-only-override-with-gaps/package.py b/var/spack/repos/builtin.mock/packages/url-only-override-with-gaps/package.py index 10410eb989..cd028f2d58 100644 --- a/var/spack/repos/builtin.mock/packages/url-only-override-with-gaps/package.py +++ b/var/spack/repos/builtin.mock/packages/url-only-override-with-gaps/package.py @@ -7,15 +7,24 @@ from spack.package import * class UrlOnlyOverrideWithGaps(Package): - homepage = 'http://www.example.com' + homepage = "http://www.example.com" - version('1.0.5', 'abcdef0123456789abcdef0123456789') - version('1.0.0', 'bcdef0123456789abcdef0123456789a', - url='http://a.example.com/url_override-1.0.0.tar.gz') - version('0.9.5', 'cdef0123456789abcdef0123456789ab') - version('0.9.0', 'def0123456789abcdef0123456789abc', - url='http://b.example.com/url_override-0.9.0.tar.gz') - version('0.8.5', 'ef0123456789abcdef0123456789abcd') - version('0.8.1', 'f0123456789abcdef0123456789abcde', - url='http://c.example.com/url_override-0.8.1.tar.gz') - version('0.7.0', '0123456789abcdef0123456789abcdef') + version("1.0.5", "abcdef0123456789abcdef0123456789") + version( + "1.0.0", + "bcdef0123456789abcdef0123456789a", + url="http://a.example.com/url_override-1.0.0.tar.gz", + ) + version("0.9.5", "cdef0123456789abcdef0123456789ab") + version( + "0.9.0", + "def0123456789abcdef0123456789abc", + url="http://b.example.com/url_override-0.9.0.tar.gz", + ) + version("0.8.5", "ef0123456789abcdef0123456789abcd") + version( + "0.8.1", + "f0123456789abcdef0123456789abcde", + url="http://c.example.com/url_override-0.8.1.tar.gz", + ) + version("0.7.0", "0123456789abcdef0123456789abcdef") diff --git a/var/spack/repos/builtin.mock/packages/url-only-override/package.py b/var/spack/repos/builtin.mock/packages/url-only-override/package.py index 0eded4b1cb..a121057a0f 100644 --- a/var/spack/repos/builtin.mock/packages/url-only-override/package.py +++ b/var/spack/repos/builtin.mock/packages/url-only-override/package.py @@ -7,8 +7,20 @@ from spack.package import * class UrlOnlyOverride(Package): - homepage = 'http://www.example.com' + homepage = "http://www.example.com" - version('1.0.0', '0123456789abcdef0123456789abcdef', url='http://a.example.com/url_override-1.0.0.tar.gz') - version('0.9.0', 'fedcba9876543210fedcba9876543210', url='http://b.example.com/url_override-0.9.0.tar.gz') - version('0.8.1', '0123456789abcdef0123456789abcdef', url='http://c.example.com/url_override-0.8.1.tar.gz') + version( + "1.0.0", + "0123456789abcdef0123456789abcdef", + url="http://a.example.com/url_override-1.0.0.tar.gz", + ) + version( + "0.9.0", + "fedcba9876543210fedcba9876543210", + url="http://b.example.com/url_override-0.9.0.tar.gz", + ) + version( + "0.8.1", + "0123456789abcdef0123456789abcdef", + url="http://c.example.com/url_override-0.8.1.tar.gz", + ) diff --git a/var/spack/repos/builtin.mock/packages/url-test/package.py b/var/spack/repos/builtin.mock/packages/url-test/package.py index 6b3f7136fd..6ceebbe04b 100644 --- a/var/spack/repos/builtin.mock/packages/url-test/package.py +++ b/var/spack/repos/builtin.mock/packages/url-test/package.py @@ -8,6 +8,7 @@ from spack.package import * class UrlTest(Package): """Mock package that fetches from a URL.""" + homepage = "http://www.url-fetch-example.com" - version('test', url='to-be-filled-in-by-test') + version("test", url="to-be-filled-in-by-test") diff --git a/var/spack/repos/builtin.mock/packages/url_override/package.py b/var/spack/repos/builtin.mock/packages/url_override/package.py index 428c09b1cf..d019b13063 100644 --- a/var/spack/repos/builtin.mock/packages/url_override/package.py +++ b/var/spack/repos/builtin.mock/packages/url_override/package.py @@ -7,9 +7,11 @@ from spack.package import * class UrlOverride(Package): - homepage = 'http://www.doesnotexist.org' - url = 'http://www.doesnotexist.org/url_override-1.0.0.tar.gz' + homepage = "http://www.doesnotexist.org" + url = "http://www.doesnotexist.org/url_override-1.0.0.tar.gz" - version('1.0.0', '0123456789abcdef0123456789abcdef') - version('0.9.0', 'fedcba9876543210fedcba9876543210', url='http://www.anothersite.org/uo-0.9.0.tgz') - version('0.8.1', '0123456789abcdef0123456789abcdef') + version("1.0.0", "0123456789abcdef0123456789abcdef") + version( + "0.9.0", "fedcba9876543210fedcba9876543210", url="http://www.anothersite.org/uo-0.9.0.tgz" + ) + version("0.8.1", "0123456789abcdef0123456789abcdef") diff --git a/var/spack/repos/builtin.mock/packages/v1-provider/package.py b/var/spack/repos/builtin.mock/packages/v1-provider/package.py index 0549c80018..1facd325e4 100644 --- a/var/spack/repos/builtin.mock/packages/v1-provider/package.py +++ b/var/spack/repos/builtin.mock/packages/v1-provider/package.py @@ -9,8 +9,9 @@ class V1Provider(Package): """Mimic the real netlib-lapack, that may be built on top of an optimized blas. """ + homepage = "https://dev.null" - version('1.0') + version("1.0") - provides('v1') + provides("v1") diff --git a/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-a/package.py b/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-a/package.py index 9d1bbd0450..277f1054e0 100644 --- a/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-a/package.py +++ b/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-a/package.py @@ -13,9 +13,9 @@ class VariantOnDependencyConditionA(Package): depends_on('B', when='^A+x') """ - homepage = 'https://www.example.org' - url = 'https://example.org/files/v3.4/cmake-3.4.3.tar.gz' + homepage = "https://www.example.org" + url = "https://example.org/files/v3.4/cmake-3.4.3.tar.gz" - version('1.0', '4cb3ff35b2472aae70f542116d616e63') + version("1.0", "4cb3ff35b2472aae70f542116d616e63") - variant('x', default=True, description='?') + variant("x", default=True, description="?") diff --git a/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-b/package.py b/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-b/package.py index 744ff93ba6..bb6aab53d4 100644 --- a/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-b/package.py +++ b/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-b/package.py @@ -12,7 +12,8 @@ class VariantOnDependencyConditionB(Package): depends_on('A') depends_on('B', when='^A+x') """ - homepage = 'https://www.example.org' - url = 'https://example.org/files/v3.4/cmake-3.4.3.tar.gz' - version('1.0', '4cb3ff35b2472aae70f542116d616e63') + homepage = "https://www.example.org" + url = "https://example.org/files/v3.4/cmake-3.4.3.tar.gz" + + version("1.0", "4cb3ff35b2472aae70f542116d616e63") diff --git a/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-root/package.py b/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-root/package.py index def93d53e1..542bb288a1 100644 --- a/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-root/package.py +++ b/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-root/package.py @@ -13,11 +13,10 @@ class VariantOnDependencyConditionRoot(Package): depends_on('B', when='^A+x') """ - homepage = 'https://www.example.org' - url = 'https://example.org/files/v3.4/cmake-3.4.3.tar.gz' + homepage = "https://www.example.org" + url = "https://example.org/files/v3.4/cmake-3.4.3.tar.gz" - version('1.0', '4cb3ff35b2472aae70f542116d616e63') + version("1.0", "4cb3ff35b2472aae70f542116d616e63") - depends_on('variant-on-dependency-condition-a') - depends_on('variant-on-dependency-condition-b', - when='^variant-on-dependency-condition-a+x') + depends_on("variant-on-dependency-condition-a") + depends_on("variant-on-dependency-condition-b", when="^variant-on-dependency-condition-a+x") diff --git a/var/spack/repos/builtin.mock/packages/vdefault-or-external-root/package.py b/var/spack/repos/builtin.mock/packages/vdefault-or-external-root/package.py index 925ba9dddd..d17a063a0f 100644 --- a/var/spack/repos/builtin.mock/packages/vdefault-or-external-root/package.py +++ b/var/spack/repos/builtin.mock/packages/vdefault-or-external-root/package.py @@ -10,9 +10,9 @@ class VdefaultOrExternalRoot(Package): a default variant value. """ - homepage = 'https://www.example.org' - url = 'https://example.org/files/v3.4/cmake-3.4.3.tar.gz' + homepage = "https://www.example.org" + url = "https://example.org/files/v3.4/cmake-3.4.3.tar.gz" - version('1.0', '4cb3ff35b2472aae70f542116d616e63') + version("1.0", "4cb3ff35b2472aae70f542116d616e63") - depends_on('vdefault-or-external') + depends_on("vdefault-or-external") diff --git a/var/spack/repos/builtin.mock/packages/vdefault-or-external/package.py b/var/spack/repos/builtin.mock/packages/vdefault-or-external/package.py index c1df533e64..cf1305928f 100644 --- a/var/spack/repos/builtin.mock/packages/vdefault-or-external/package.py +++ b/var/spack/repos/builtin.mock/packages/vdefault-or-external/package.py @@ -10,11 +10,11 @@ class VdefaultOrExternal(Package): a default variant value. """ - homepage = 'https://www.example.org' - url = 'https://example.org/files/v3.4/cmake-3.4.3.tar.gz' + homepage = "https://www.example.org" + url = "https://example.org/files/v3.4/cmake-3.4.3.tar.gz" - version('1.0', '4cb3ff35b2472aae70f542116d616e63') + version("1.0", "4cb3ff35b2472aae70f542116d616e63") - variant('external', default=False, description='nope') + variant("external", default=False, description="nope") - depends_on('externaltool', when='+external') + depends_on("externaltool", when="+external") diff --git a/var/spack/repos/builtin.mock/packages/version-test-dependency-preferred/package.py b/var/spack/repos/builtin.mock/packages/version-test-dependency-preferred/package.py index 811173907f..ed28d50a70 100644 --- a/var/spack/repos/builtin.mock/packages/version-test-dependency-preferred/package.py +++ b/var/spack/repos/builtin.mock/packages/version-test-dependency-preferred/package.py @@ -10,10 +10,16 @@ class VersionTestDependencyPreferred(AutotoolsPackage): variant with two default values (a very low priority optimization criterion for clingo is to maximize their number) """ + homepage = "http://www.spack.org" url = "http://www.spack.org/downloads/xz-1.0.tar.gz" - version('5.2.5', sha256='5117f930900b341493827d63aa910ff5e011e0b994197c3b71c08a20228a42df') + version("5.2.5", sha256="5117f930900b341493827d63aa910ff5e011e0b994197c3b71c08a20228a42df") - variant('libs', default='shared,static', values=('shared', 'static'), - multi=True, description='Build shared libs, static libs or both') + variant( + "libs", + default="shared,static", + values=("shared", "static"), + multi=True, + description="Build shared libs, static libs or both", + ) diff --git a/var/spack/repos/builtin.mock/packages/version-test-pkg/package.py b/var/spack/repos/builtin.mock/packages/version-test-pkg/package.py index 92f5dffbba..21971c62b6 100644 --- a/var/spack/repos/builtin.mock/packages/version-test-pkg/package.py +++ b/var/spack/repos/builtin.mock/packages/version-test-pkg/package.py @@ -9,14 +9,16 @@ class VersionTestPkg(AutotoolsPackage): """Mock AutotoolsPackage to check proper version selection by clingo. """ + homepage = "https://www.gnu.org/software/make/" url = "http://www.example.com/libtool-version-1.0.tar.gz" - version('develop', git='https://git.savannah.gnu.org/git/libtool.git', - branch='master', submodules=True) - version('2.4.6', sha256='e40b8f018c1da64edd1cc9a6fce5fa63b2e707e404e20cad91fbae337c98a5b7') - - depends_on( - 'version-test-dependency-preferred', - when='@develop' + version( + "develop", + git="https://git.savannah.gnu.org/git/libtool.git", + branch="master", + submodules=True, ) + version("2.4.6", sha256="e40b8f018c1da64edd1cc9a6fce5fa63b2e707e404e20cad91fbae337c98a5b7") + + depends_on("version-test-dependency-preferred", when="@develop") diff --git a/var/spack/repos/builtin.mock/packages/version-test-root/package.py b/var/spack/repos/builtin.mock/packages/version-test-root/package.py index beb052b9c5..37dd5a21a3 100644 --- a/var/spack/repos/builtin.mock/packages/version-test-root/package.py +++ b/var/spack/repos/builtin.mock/packages/version-test-root/package.py @@ -7,8 +7,9 @@ from spack.package import * class VersionTestRoot(AutotoolsPackage): """Uses version-test-pkg, as a build dependency""" + homepage = "http://www.spack.org" url = "http://www.spack.org/downloads/aml-1.0.tar.gz" - version('0.1.0', sha256='cc89a8768693f1f11539378b21cdca9f0ce3fc5cb564f9b3e4154a051dcea69b') - depends_on('version-test-pkg', type='build') + version("0.1.0", sha256="cc89a8768693f1f11539378b21cdca9f0ce3fc5cb564f9b3e4154a051dcea69b") + depends_on("version-test-pkg", type="build") diff --git a/var/spack/repos/builtin.mock/packages/view-dir-dir/package.py b/var/spack/repos/builtin.mock/packages/view-dir-dir/package.py index e0cece6d54..43fc51882c 100644 --- a/var/spack/repos/builtin.mock/packages/view-dir-dir/package.py +++ b/var/spack/repos/builtin.mock/packages/view-dir-dir/package.py @@ -10,14 +10,15 @@ from spack.package import * class ViewDirDir(Package): """Installs a <prefix>/bin/x where x is a dir, in contrast to view-dir-file.""" + homepage = "http://www.spack.org" url = "http://www.spack.org/downloads/aml-1.0.tar.gz" has_code = False - version('0.1.0', sha256='cc89a8768693f1f11539378b21cdca9f0ce3fc5cb564f9b3e4154a051dcea69b') + version("0.1.0", sha256="cc89a8768693f1f11539378b21cdca9f0ce3fc5cb564f9b3e4154a051dcea69b") def install(self, spec, prefix): - os.mkdir(os.path.join(prefix, 'bin')) - os.mkdir(os.path.join(prefix, 'bin', 'x')) - with open(os.path.join(prefix, 'bin', 'x', 'file_in_dir'), 'wb') as f: - f.write(b'hello world') + os.mkdir(os.path.join(prefix, "bin")) + os.mkdir(os.path.join(prefix, "bin", "x")) + with open(os.path.join(prefix, "bin", "x", "file_in_dir"), "wb") as f: + f.write(b"hello world") diff --git a/var/spack/repos/builtin.mock/packages/view-dir-file/package.py b/var/spack/repos/builtin.mock/packages/view-dir-file/package.py index f448910c8e..1c73ddcce9 100644 --- a/var/spack/repos/builtin.mock/packages/view-dir-file/package.py +++ b/var/spack/repos/builtin.mock/packages/view-dir-file/package.py @@ -10,13 +10,14 @@ from spack.package import * class ViewDirFile(Package): """Installs a <prefix>/bin/x where x is a file, in contrast to view-dir-dir""" + homepage = "http://www.spack.org" url = "http://www.spack.org/downloads/aml-1.0.tar.gz" has_code = False - version('0.1.0', sha256='cc89a8768693f1f11539378b21cdca9f0ce3fc5cb564f9b3e4154a051dcea69b') + version("0.1.0", sha256="cc89a8768693f1f11539378b21cdca9f0ce3fc5cb564f9b3e4154a051dcea69b") def install(self, spec, prefix): - os.mkdir(os.path.join(prefix, 'bin')) - with open(os.path.join(prefix, 'bin', 'x'), 'wb') as f: - f.write(b'file') + os.mkdir(os.path.join(prefix, "bin")) + with open(os.path.join(prefix, "bin", "x"), "wb") as f: + f.write(b"file") diff --git a/var/spack/repos/builtin.mock/packages/view-dir-symlinked-dir/package.py b/var/spack/repos/builtin.mock/packages/view-dir-symlinked-dir/package.py index 3520373e4d..50daf30bfd 100644 --- a/var/spack/repos/builtin.mock/packages/view-dir-symlinked-dir/package.py +++ b/var/spack/repos/builtin.mock/packages/view-dir-symlinked-dir/package.py @@ -11,15 +11,16 @@ from spack.package import * class ViewDirSymlinkedDir(Package): """Installs <prefix>/bin/x/file_in_symlinked_dir where x -> y is a symlinked dir. This should be mergeable with view-dir-dir, but not with view-dir-file.""" + homepage = "http://www.spack.org" url = "http://www.spack.org/downloads/aml-1.0.tar.gz" has_code = False - version('0.1.0', sha256='cc89a8768693f1f11539378b21cdca9f0ce3fc5cb564f9b3e4154a051dcea69b') + version("0.1.0", sha256="cc89a8768693f1f11539378b21cdca9f0ce3fc5cb564f9b3e4154a051dcea69b") def install(self, spec, prefix): - os.mkdir(os.path.join(prefix, 'bin')) - os.mkdir(os.path.join(prefix, 'bin', 'y')) - with open(os.path.join(prefix, 'bin', 'y', 'file_in_symlinked_dir'), 'wb') as f: - f.write(b'hello world') - os.symlink('y', os.path.join(prefix, 'bin', 'x')) + os.mkdir(os.path.join(prefix, "bin")) + os.mkdir(os.path.join(prefix, "bin", "y")) + with open(os.path.join(prefix, "bin", "y", "file_in_symlinked_dir"), "wb") as f: + f.write(b"hello world") + os.symlink("y", os.path.join(prefix, "bin", "x")) diff --git a/var/spack/repos/builtin.mock/packages/virtual-with-versions/package.py b/var/spack/repos/builtin.mock/packages/virtual-with-versions/package.py index f5eb282412..21c0a5a57f 100644 --- a/var/spack/repos/builtin.mock/packages/virtual-with-versions/package.py +++ b/var/spack/repos/builtin.mock/packages/virtual-with-versions/package.py @@ -7,17 +7,18 @@ from spack.package import * class VirtualWithVersions(AutotoolsPackage): """Uses version-test-pkg, as a build dependency""" + homepage = "http://www.spack.org" url = "http://www.spack.org/downloads/aml-1.0.tar.gz" - version('17.0.1', '0123456789abcdef0123456789abcdef') - version('16.0.1', '0123456789abcdef0123456789abcdef') - version('11.0.1', '0123456789abcdef0123456789abcdef') - version('1.8.0', '0123456789abcdef0123456789abcdef') + version("17.0.1", "0123456789abcdef0123456789abcdef") + version("16.0.1", "0123456789abcdef0123456789abcdef") + version("11.0.1", "0123456789abcdef0123456789abcdef") + version("1.8.0", "0123456789abcdef0123456789abcdef") - provides('java@17', when='@17.0:17.9') - provides('java@16', when='@16.0:16.9') - provides('java@11', when='@11.0:11.9') - provides('java@10', when='@10.0:10.9') - provides('java@9', when='@9.0:9.9') - provides('java@8', when='@1.8.0:1.8.9') + provides("java@17", when="@17.0:17.9") + provides("java@16", when="@16.0:16.9") + provides("java@11", when="@11.0:11.9") + provides("java@10", when="@10.0:10.9") + provides("java@9", when="@9.0:9.9") + provides("java@8", when="@1.8.0:1.8.9") diff --git a/var/spack/repos/builtin.mock/packages/when-directives-false/package.py b/var/spack/repos/builtin.mock/packages/when-directives-false/package.py index c366161dca..b1da16b0cb 100644 --- a/var/spack/repos/builtin.mock/packages/when-directives-false/package.py +++ b/var/spack/repos/builtin.mock/packages/when-directives-false/package.py @@ -12,14 +12,18 @@ class WhenDirectivesFalse(Package): homepage = "http://www.example.com" url = "http://www.example.com/example-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") - patch('https://example.com/foo.patch', - sha256='abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234', - when=False) - extends('extendee', when=False) - depends_on('b', when=False) - conflicts('@1.0', when=False) - resource(url="http://www.example.com/example-1.0-resource.tar.gz", - md5='0123456789abcdef0123456789abcdef', - when=False) + patch( + "https://example.com/foo.patch", + sha256="abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234", + when=False, + ) + extends("extendee", when=False) + depends_on("b", when=False) + conflicts("@1.0", when=False) + resource( + url="http://www.example.com/example-1.0-resource.tar.gz", + md5="0123456789abcdef0123456789abcdef", + when=False, + ) diff --git a/var/spack/repos/builtin.mock/packages/when-directives-true/package.py b/var/spack/repos/builtin.mock/packages/when-directives-true/package.py index 7fa155ec43..17b50a347f 100644 --- a/var/spack/repos/builtin.mock/packages/when-directives-true/package.py +++ b/var/spack/repos/builtin.mock/packages/when-directives-true/package.py @@ -12,14 +12,18 @@ class WhenDirectivesTrue(Package): homepage = "http://www.example.com" url = "http://www.example.com/example-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") - patch('https://example.com/foo.patch', - sha256='abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234', - when=True) - extends('extendee', when=True) - depends_on('b', when=True) - conflicts('@1.0', when=True) - resource(url="http://www.example.com/example-1.0-resource.tar.gz", - md5='0123456789abcdef0123456789abcdef', - when=True) + patch( + "https://example.com/foo.patch", + sha256="abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234", + when=True, + ) + extends("extendee", when=True) + depends_on("b", when=True) + conflicts("@1.0", when=True) + resource( + url="http://www.example.com/example-1.0-resource.tar.gz", + md5="0123456789abcdef0123456789abcdef", + when=True, + ) diff --git a/var/spack/repos/builtin.mock/packages/with-constraint-met/package.py b/var/spack/repos/builtin.mock/packages/with-constraint-met/package.py index 2ccdd5d0b0..ffaaa86f42 100644 --- a/var/spack/repos/builtin.mock/packages/with-constraint-met/package.py +++ b/var/spack/repos/builtin.mock/packages/with-constraint-met/package.py @@ -12,12 +12,12 @@ class WithConstraintMet(Package): homepage = "http://www.example.com" url = "http://www.example.com/example-1.0.tar.gz" - version('2.0', '0123456789abcdef0123456789abcdef') - version('1.0', '0123456789abcdef0123456789abcdef') + version("2.0", "0123456789abcdef0123456789abcdef") + version("1.0", "0123456789abcdef0123456789abcdef") - with when('@1.0'): - depends_on('b') - conflicts('%gcc', when='+foo') + with when("@1.0"): + depends_on("b") + conflicts("%gcc", when="+foo") - with when('@0.14: ^b@:4.0'): - depends_on('c', when='@:15 ^b@3.8:') + with when("@0.14: ^b@:4.0"): + depends_on("c", when="@:15 ^b@3.8:") diff --git a/var/spack/repos/builtin.mock/packages/wrong-variant-in-conflicts/package.py b/var/spack/repos/builtin.mock/packages/wrong-variant-in-conflicts/package.py index 0c04cd4606..b7708cd2e9 100644 --- a/var/spack/repos/builtin.mock/packages/wrong-variant-in-conflicts/package.py +++ b/var/spack/repos/builtin.mock/packages/wrong-variant-in-conflicts/package.py @@ -11,6 +11,6 @@ class WrongVariantInConflicts(Package): homepage = "http://www.example.com" url = "http://www.example.com/b-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") - conflicts('+foo', when='@1.0') + conflicts("+foo", when="@1.0") diff --git a/var/spack/repos/builtin.mock/packages/wrong-variant-in-depends-on/package.py b/var/spack/repos/builtin.mock/packages/wrong-variant-in-depends-on/package.py index e771d79766..28b9d87b4d 100644 --- a/var/spack/repos/builtin.mock/packages/wrong-variant-in-depends-on/package.py +++ b/var/spack/repos/builtin.mock/packages/wrong-variant-in-depends-on/package.py @@ -11,6 +11,6 @@ class WrongVariantInDependsOn(Package): homepage = "http://www.example.com" url = "http://www.example.com/b-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") - depends_on('b+doesnotexist') + depends_on("b+doesnotexist") diff --git a/var/spack/repos/builtin.mock/packages/zlib/package.py b/var/spack/repos/builtin.mock/packages/zlib/package.py index 4af5f065b3..f74df69de2 100644 --- a/var/spack/repos/builtin.mock/packages/zlib/package.py +++ b/var/spack/repos/builtin.mock/packages/zlib/package.py @@ -18,41 +18,36 @@ class Zlib(Package): # URL must remain http:// so Spack can bootstrap curl url = "http://zlib.net/fossils/zlib-1.2.11.tar.gz" - version('1.2.11', sha256='c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1') + version("1.2.11", sha256="c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1") # Due to the bug fixes, any installations of 1.2.9 or 1.2.10 should be # immediately replaced with 1.2.11. - version('1.2.8', sha256='36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d') - version('1.2.3', sha256='1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e') + version("1.2.8", sha256="36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d") + version("1.2.3", sha256="1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e") - variant('pic', default=True, - description='Produce position-independent code (for shared libs)') - variant('shared', default=True, - description='Enables the build of shared libraries.') - variant('optimize', default=True, - description='Enable -O2 for a more optimized lib') + variant("pic", default=True, description="Produce position-independent code (for shared libs)") + variant("shared", default=True, description="Enables the build of shared libraries.") + variant("optimize", default=True, description="Enable -O2 for a more optimized lib") - patch('w_patch.patch', when="@1.2.11%cce") + patch("w_patch.patch", when="@1.2.11%cce") @property def libs(self): - shared = '+shared' in self.spec - return find_libraries( - ['libz'], root=self.prefix, recursive=True, shared=shared - ) + shared = "+shared" in self.spec + return find_libraries(["libz"], root=self.prefix, recursive=True, shared=shared) def setup_build_environment(self, env): - if '+pic' in self.spec: - env.append_flags('CFLAGS', self.compiler.cc_pic_flag) - if '+optimize' in self.spec: - env.append_flags('CFLAGS', '-O2') + if "+pic" in self.spec: + env.append_flags("CFLAGS", self.compiler.cc_pic_flag) + if "+optimize" in self.spec: + env.append_flags("CFLAGS", "-O2") def install(self, spec, prefix): config_args = [] - if '~shared' in spec: - config_args.append('--static') - configure('--prefix={0}'.format(prefix), *config_args) + if "~shared" in spec: + config_args.append("--static") + configure("--prefix={0}".format(prefix), *config_args) make() if self.run_tests: - make('check') - make('install') + make("check") + make("install") diff --git a/var/spack/repos/builtin.mock/packages/zmpi/package.py b/var/spack/repos/builtin.mock/packages/zmpi/package.py index 0a673b087d..5bc512575e 100644 --- a/var/spack/repos/builtin.mock/packages/zmpi/package.py +++ b/var/spack/repos/builtin.mock/packages/zmpi/package.py @@ -8,11 +8,12 @@ from spack.package import * class Zmpi(Package): """This is a fake MPI package used to demonstrate virtual package providers - with dependencies.""" + with dependencies.""" + homepage = "http://www.spack-fake-zmpi.org" - url = "http://www.spack-fake-zmpi.org/downloads/zmpi-1.0.tar.gz" + url = "http://www.spack-fake-zmpi.org/downloads/zmpi-1.0.tar.gz" - version('1.0', '0123456789abcdef0123456789abcdef') + version("1.0", "0123456789abcdef0123456789abcdef") - provides('mpi@:10.0') - depends_on('fake') + provides("mpi@:10.0") + depends_on("fake") |