From 95847a0b373d1fe55772ff39d58aa616bec88932 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 5 Jul 2023 07:37:44 -0500 Subject: Drop Python 2 object subclassing (#38720) --- var/spack/repos/builtin/packages/harfbuzz/package.py | 2 +- var/spack/repos/builtin/packages/intel-tbb/package.py | 2 +- var/spack/repos/builtin/packages/libxml2/package.py | 2 +- var/spack/repos/builtin/packages/metis/package.py | 2 +- var/spack/repos/builtin/packages/openfoam/package.py | 2 +- var/spack/repos/builtin/packages/ruby/package.py | 2 +- var/spack/repos/builtin/packages/zlib/package.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/harfbuzz/package.py b/var/spack/repos/builtin/packages/harfbuzz/package.py index 711b59ed84..2f44b0a6a4 100644 --- a/var/spack/repos/builtin/packages/harfbuzz/package.py +++ b/var/spack/repos/builtin/packages/harfbuzz/package.py @@ -116,7 +116,7 @@ class Harfbuzz(MesonPackage, AutotoolsPackage): change_sed_delimiter("@", ";", "src/Makefile.in") -class SetupEnvironment(object): +class SetupEnvironment: def setup_dependent_build_environment(self, env, dependent_spec): env.prepend_path("XDG_DATA_DIRS", self.prefix.share) env.prepend_path("GI_TYPELIB_PATH", join_path(self.prefix.lib, "girepository-1.0")) diff --git a/var/spack/repos/builtin/packages/intel-tbb/package.py b/var/spack/repos/builtin/packages/intel-tbb/package.py index b8e4d92d3d..45761c7a06 100644 --- a/var/spack/repos/builtin/packages/intel-tbb/package.py +++ b/var/spack/repos/builtin/packages/intel-tbb/package.py @@ -184,7 +184,7 @@ class IntelTbb(CMakePackage, MakefilePackage): return find_libraries("libtbb*", root=self.prefix, shared=shared, recursive=True) -class SetupEnvironment(object): +class SetupEnvironment: # We set OS here in case the user has it set to something else # that TBB doesn't expect. def setup_build_environment(self, env): diff --git a/var/spack/repos/builtin/packages/libxml2/package.py b/var/spack/repos/builtin/packages/libxml2/package.py index bde03c534d..9c1f22adb8 100644 --- a/var/spack/repos/builtin/packages/libxml2/package.py +++ b/var/spack/repos/builtin/packages/libxml2/package.py @@ -185,7 +185,7 @@ class Libxml2(AutotoolsPackage, NMakePackage): xmllint("--dtdvalid", dtd_path, data_dir.join("info.xml")) -class RunAfter(object): +class RunAfter: @run_after("install") @on_package_attributes(run_tests=True) def import_module_test(self): diff --git a/var/spack/repos/builtin/packages/metis/package.py b/var/spack/repos/builtin/packages/metis/package.py index 2ce1bed1ea..ab0f137aec 100644 --- a/var/spack/repos/builtin/packages/metis/package.py +++ b/var/spack/repos/builtin/packages/metis/package.py @@ -76,7 +76,7 @@ class Metis(CMakePackage, MakefilePackage): ) -class SetupEnvironment(object): +class SetupEnvironment: def setup_build_environment(self, env): # Ignore warnings/errors re unrecognized omp pragmas on %intel if "%intel@14:" in self.spec: diff --git a/var/spack/repos/builtin/packages/openfoam/package.py b/var/spack/repos/builtin/packages/openfoam/package.py index 852e0123b7..977f99fad5 100644 --- a/var/spack/repos/builtin/packages/openfoam/package.py +++ b/var/spack/repos/builtin/packages/openfoam/package.py @@ -881,7 +881,7 @@ class Openfoam(Package): # ----------------------------------------------------------------------------- -class OpenfoamArch(object): +class OpenfoamArch: """OpenfoamArch represents architecture/compiler settings for OpenFOAM. The string representation is WM_OPTIONS. diff --git a/var/spack/repos/builtin/packages/ruby/package.py b/var/spack/repos/builtin/packages/ruby/package.py index 431b62d4fd..87a2e13071 100644 --- a/var/spack/repos/builtin/packages/ruby/package.py +++ b/var/spack/repos/builtin/packages/ruby/package.py @@ -101,7 +101,7 @@ class Ruby(AutotoolsPackage, NMakePackage): module.rake = Executable(self.prefix.bin.rake) -class SetupEnvironment(object): +class SetupEnvironment: def setup_dependent_build_environment(self, env, dependent_spec): # TODO: do this only for actual extensions. # Set GEM_PATH to include dependent gem directories diff --git a/var/spack/repos/builtin/packages/zlib/package.py b/var/spack/repos/builtin/packages/zlib/package.py index 16341ecbaf..f77e3e0e3d 100644 --- a/var/spack/repos/builtin/packages/zlib/package.py +++ b/var/spack/repos/builtin/packages/zlib/package.py @@ -62,7 +62,7 @@ class Zlib(MakefilePackage, Package): return find_libraries(["libz"], root=self.prefix, recursive=True, shared=shared) -class SetupEnvironment(object): +class SetupEnvironment: def setup_build_environment(self, env): if "+pic" in self.spec: env.append_flags("CFLAGS", self.pkg.compiler.cc_pic_flag) -- cgit v1.2.3-70-g09d2