From 2ecec9923829c9514f6e09885ee57cda3688b2f4 Mon Sep 17 00:00:00 2001 From: wdconinc Date: Wed, 15 May 2024 19:37:29 +0000 Subject: [PATCH] [@spackbot] updating style on behalf of wdconinc --- var/spack/repos/builtin/packages/dla-future/package.py | 5 +---- var/spack/repos/builtin/packages/miopen-hip/package.py | 5 +---- var/spack/repos/builtin/packages/mlpack/package.py | 5 +---- .../repos/builtin/packages/openscenegraph/package.py | 5 +---- var/spack/repos/builtin/packages/protobuf/package.py | 5 +---- var/spack/repos/builtin/packages/py-astor/package.py | 5 +---- var/spack/repos/builtin/packages/umpire/package.py | 10 ++-------- var/spack/repos/builtin/packages/wrf/package.py | 10 ++-------- 8 files changed, 10 insertions(+), 40 deletions(-) diff --git a/var/spack/repos/builtin/packages/dla-future/package.py b/var/spack/repos/builtin/packages/dla-future/package.py index 4dd97125112..bec3da70eb7 100644 --- a/var/spack/repos/builtin/packages/dla-future/package.py +++ b/var/spack/repos/builtin/packages/dla-future/package.py @@ -128,10 +128,7 @@ class DlaFuture(CMakePackage, CudaPackage, ROCmPackage): depends_on(f"umpire cuda_arch={arch}", when=f"cuda_arch={arch}") # https://github.com/eth-cscs/DLA-Future/pull/1063/commits/efc9c176a7a8c512b3f37d079dec8c25ac1b7389.patch - patch( - "efc9c176a7a8c512b3f37d079dec8c25ac1b7389.patch", - when="@:0.3 %gcc@13:", - ) + patch("efc9c176a7a8c512b3f37d079dec8c25ac1b7389.patch", when="@:0.3 %gcc@13:") # https://github.com/spack/spack/issues/41511 patch("hip_complex_operator_overloads.patch", when="+rocm") diff --git a/var/spack/repos/builtin/packages/miopen-hip/package.py b/var/spack/repos/builtin/packages/miopen-hip/package.py index 9e8dab88959..c84dfa2835e 100644 --- a/var/spack/repos/builtin/packages/miopen-hip/package.py +++ b/var/spack/repos/builtin/packages/miopen-hip/package.py @@ -58,10 +58,7 @@ class MiopenHip(CMakePackage): patch("0002-add-include-dir-miopen-hip-6.0.0.patch", when="@6.0") patch("0002-add-include-dir-miopen-hip-6.1.0.patch", when="@6.1") # https://github.com/ROCm/MIOpen/pull/2276/commits/f60aa1ff89f8fb596b4a6a4c70aa7d557803db87.patch - patch( - "f60aa1ff89f8fb596b4a6a4c70aa7d557803db87.patch", - when="@5.7", - ) + patch("f60aa1ff89f8fb596b4a6a4c70aa7d557803db87.patch", when="@5.7") for ver in [ "5.1.0", diff --git a/var/spack/repos/builtin/packages/mlpack/package.py b/var/spack/repos/builtin/packages/mlpack/package.py index e667668d3a2..541361ba0f4 100644 --- a/var/spack/repos/builtin/packages/mlpack/package.py +++ b/var/spack/repos/builtin/packages/mlpack/package.py @@ -64,10 +64,7 @@ class Mlpack(CMakePackage): depends_on("r-pkgbuild") # https://github.com/mlpack/mlpack/pull/3502/commits/183396e51a6771d5d2b43f22b0d2a9a91785e533.patch - patch( - "183396e51a6771d5d2b43f22b0d2a9a91785e533.patch", - when="@4:4.2.0", - ) + patch("183396e51a6771d5d2b43f22b0d2a9a91785e533.patch", when="@4:4.2.0") def cmake_args(self): args = [ diff --git a/var/spack/repos/builtin/packages/openscenegraph/package.py b/var/spack/repos/builtin/packages/openscenegraph/package.py index 3fe8d5dfdd1..e52823d5db5 100644 --- a/var/spack/repos/builtin/packages/openscenegraph/package.py +++ b/var/spack/repos/builtin/packages/openscenegraph/package.py @@ -83,10 +83,7 @@ class Openscenegraph(CMakePackage): # patch submitted for inclusion in OpenSceneGraph for extending compatibility # with ffmpeg from versions up to 4 to versions 5 & 6 # https://github.com/openscenegraph/OpenSceneGraph/pull/1281/commits/759620a3b7b787c960a7e414ba26ab5497817d40.patch - patch( - "759620a3b7b787c960a7e414ba26ab5497817d40.patch", - when="@3.6:", - ) + patch("759620a3b7b787c960a7e414ba26ab5497817d40.patch", when="@3.6:") patch("glibc-jasper.patch", when="@3.4%gcc") # from gentoo: https://raw.githubusercontent.com/gentoo/gentoo/9523b20c27d12dd72d1fd5ced3ba4995099925a2/dev-games/openscenegraph/files/openscenegraph-3.6.5-openexr3.patch patch("openscenegraph-3.6.5-openexr3.patch", when="@3.6:") diff --git a/var/spack/repos/builtin/packages/protobuf/package.py b/var/spack/repos/builtin/packages/protobuf/package.py index 49ab8d0576b..364f01b2dbb 100644 --- a/var/spack/repos/builtin/packages/protobuf/package.py +++ b/var/spack/repos/builtin/packages/protobuf/package.py @@ -110,10 +110,7 @@ class Protobuf(CMakePackage): # fix build on Centos 8, see also https://github.com/protocolbuffers/protobuf/issues/5144 # https://github.com/protocolbuffers/protobuf/pull/11032/commits/3039f932aaf212bcf2f14a3f2fd00dbfb881e46b.patch - patch( - "3039f932aaf212bcf2f14a3f2fd00dbfb881e46b.patch", - when="@3.4:3.21", - ) + patch("3039f932aaf212bcf2f14a3f2fd00dbfb881e46b.patch", when="@3.4:3.21") patch("msvc-abseil-target-namespace.patch", when="@3.22 %msvc") diff --git a/var/spack/repos/builtin/packages/py-astor/package.py b/var/spack/repos/builtin/packages/py-astor/package.py index 0c679579cf2..e78f0cf1635 100644 --- a/var/spack/repos/builtin/packages/py-astor/package.py +++ b/var/spack/repos/builtin/packages/py-astor/package.py @@ -25,7 +25,4 @@ class PyAstor(PythonPackage): # https://github.com/berkerpeksag/astor/issues/162 # https://github.com/berkerpeksag/astor/pull/163 # https://github.com/berkerpeksag/astor/pull/163/commits/30059dac4eb832e58ab2109db84508b294ba366d.patch - patch( - "30059dac4eb832e58ab2109db84508b294ba366d.patch", - when="@0.8.0", - ) + patch("30059dac4eb832e58ab2109db84508b294ba366d.patch", when="@0.8.0") diff --git a/var/spack/repos/builtin/packages/umpire/package.py b/var/spack/repos/builtin/packages/umpire/package.py index 4ec6ba3c99b..c08a2a1203e 100644 --- a/var/spack/repos/builtin/packages/umpire/package.py +++ b/var/spack/repos/builtin/packages/umpire/package.py @@ -157,17 +157,11 @@ class Umpire(CachedCMakePackage, CudaPackage, ROCmPackage): # https://github.com/LLNL/Umpire/pull/805 # https://github.com/LLNL/Umpire/pull/805/commits/47ff0aa1f7a01a917c3b7ac618e8a9e44a10fd25.patch - patch( - "47ff0aa1f7a01a917c3b7ac618e8a9e44a10fd25.patch", - when="@2022.10.0", - ) + patch("47ff0aa1f7a01a917c3b7ac618e8a9e44a10fd25.patch", when="@2022.10.0") # https://github.com/LLNL/Umpire/pull/816 # https://github.com/LLNL/Umpire/pull/816/commits/2292d1d6078f6d9523b7ad0886ffa053644569d5.patch - patch( - "2292d1d6078f6d9523b7ad0886ffa053644569d5.patch", - when="@2022.10.0", - ) + patch("2292d1d6078f6d9523b7ad0886ffa053644569d5.patch", when="@2022.10.0") # https://github.com/LLNL/Umpire/pull/853 patch( diff --git a/var/spack/repos/builtin/packages/wrf/package.py b/var/spack/repos/builtin/packages/wrf/package.py index 2b82b1b1e6a..79882d53720 100644 --- a/var/spack/repos/builtin/packages/wrf/package.py +++ b/var/spack/repos/builtin/packages/wrf/package.py @@ -216,15 +216,9 @@ class Wrf(Package): ) # Add ARM compiler support # https://github.com/wrf-model/WRF/pull/1888/commits/4a084e03575da65f254917ef5d8eb39074abd3fc.patch - patch( - "4a084e03575da65f254917ef5d8eb39074abd3fc.patch", - when="@4.5: %arm", - ) + patch("4a084e03575da65f254917ef5d8eb39074abd3fc.patch", when="@4.5: %arm") # https://github.com/wrf-model/WRF/pull/1888/commits/6087d9192f7f91967147e50f5bc8b9e49310cf98.patch - patch( - "6087d9192f7f91967147e50f5bc8b9e49310cf98.patch", - when="@4.5: %arm", - ) + patch("6087d9192f7f91967147e50f5bc8b9e49310cf98.patch", when="@4.5: %arm") depends_on("pkgconfig", type=("build")) depends_on("libtirpc")