From 603569e321013a1a63a637813c94c2834d0a0023 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Thu, 16 Feb 2023 22:06:12 -0700 Subject: [PATCH] Style: black 23, skip magic trailing comma (#35351) * Style: black 23, skip magic trailing commas * isort should use same line length as black * Fix unused import * Update version of black used in CI * Update new packages * Update new packages --- .github/workflows/valid-style.yml | 2 +- lib/spack/docs/conf.py | 11 +- lib/spack/llnl/util/filesystem.py | 3 - lib/spack/llnl/util/lang.py | 12 +- lib/spack/llnl/util/tty/__init__.py | 1 - lib/spack/llnl/util/tty/log.py | 5 +- lib/spack/llnl/util/tty/pty.py | 11 +- lib/spack/spack/audit.py | 3 +- lib/spack/spack/binary_distribution.py | 33 +---- lib/spack/spack/bootstrap/__init__.py | 6 +- lib/spack/spack/bootstrap/_common.py | 5 +- lib/spack/spack/bootstrap/core.py | 7 +- lib/spack/spack/bootstrap/environment.py | 2 +- lib/spack/spack/build_environment.py | 1 - lib/spack/spack/build_systems/autotools.py | 6 +- lib/spack/spack/build_systems/cached_cmake.py | 1 - lib/spack/spack/build_systems/cmake.py | 5 +- lib/spack/spack/build_systems/generic.py | 5 +- lib/spack/spack/build_systems/intel.py | 9 +- lib/spack/spack/build_systems/lua.py | 5 +- lib/spack/spack/build_systems/oneapi.py | 6 +- lib/spack/spack/build_systems/sip.py | 5 +- lib/spack/spack/ci.py | 120 +++--------------- lib/spack/spack/ci_optimization.py | 1 - lib/spack/spack/cmd/__init__.py | 5 +- lib/spack/spack/cmd/audit.py | 1 - lib/spack/spack/cmd/buildcache.py | 4 +- lib/spack/spack/cmd/change.py | 4 +- lib/spack/spack/cmd/ci.py | 8 +- lib/spack/spack/cmd/commands.py | 8 +- lib/spack/spack/cmd/config.py | 8 +- lib/spack/spack/cmd/create.py | 13 +- lib/spack/spack/cmd/debug.py | 5 +- lib/spack/spack/cmd/deprecate.py | 7 +- lib/spack/spack/cmd/diff.py | 14 +- lib/spack/spack/cmd/env.py | 6 +- lib/spack/spack/cmd/external.py | 7 +- lib/spack/spack/cmd/fetch.py | 5 +- lib/spack/spack/cmd/graph.py | 8 +- lib/spack/spack/cmd/help.py | 4 +- lib/spack/spack/cmd/install.py | 4 +- lib/spack/spack/cmd/license.py | 6 +- lib/spack/spack/cmd/load.py | 3 +- lib/spack/spack/cmd/mark.py | 7 +- lib/spack/spack/cmd/mirror.py | 8 +- lib/spack/spack/cmd/modules/__init__.py | 11 +- lib/spack/spack/cmd/solve.py | 6 +- lib/spack/spack/cmd/spec.py | 2 +- lib/spack/spack/cmd/style.py | 42 ++---- lib/spack/spack/cmd/test.py | 26 +--- lib/spack/spack/cmd/uninstall.py | 14 +- lib/spack/spack/cmd/unload.py | 3 +- lib/spack/spack/cmd/url.py | 7 +- lib/spack/spack/compilers/__init__.py | 2 - lib/spack/spack/compilers/apple_clang.py | 5 +- lib/spack/spack/config.py | 10 +- lib/spack/spack/cray_manifest.py | 5 +- lib/spack/spack/database.py | 10 +- lib/spack/spack/detection/common.py | 3 +- lib/spack/spack/environment/environment.py | 17 +-- lib/spack/spack/fetch_strategy.py | 14 +- .../spack/hooks/absolutify_elf_sonames.py | 1 - lib/spack/spack/hooks/sbang.py | 3 +- lib/spack/spack/installer.py | 18 +-- lib/spack/spack/modules/common.py | 5 +- lib/spack/spack/package_base.py | 22 +--- lib/spack/spack/relocate.py | 10 +- lib/spack/spack/repo.py | 1 - lib/spack/spack/report.py | 5 +- lib/spack/spack/reporters/cdash.py | 10 +- lib/spack/spack/reporters/extract.py | 6 +- lib/spack/spack/schema/buildcache_spec.py | 5 +- lib/spack/spack/schema/cdash.py | 2 +- lib/spack/spack/schema/config.py | 10 +- lib/spack/spack/schema/container.py | 10 +- lib/spack/spack/schema/cray_manifest.py | 4 +- lib/spack/spack/schema/database_index.py | 20 +-- lib/spack/spack/schema/env.py | 15 +-- lib/spack/spack/schema/gitlab_ci.py | 69 ++-------- lib/spack/spack/schema/mirrors.py | 4 +- lib/spack/spack/schema/modules.py | 9 +- lib/spack/spack/schema/packages.py | 31 ++--- lib/spack/spack/schema/projections.py | 7 +- lib/spack/spack/schema/repos.py | 8 +- lib/spack/spack/schema/spec.py | 99 +++------------ lib/spack/spack/solver/asp.py | 35 +---- lib/spack/spack/spec.py | 13 +- lib/spack/spack/test/bindist.py | 6 +- lib/spack/spack/test/bootstrap.py | 10 +- lib/spack/spack/test/build_distribution.py | 1 - lib/spack/spack/test/build_environment.py | 7 +- lib/spack/spack/test/builder.py | 28 +--- lib/spack/spack/test/cc.py | 12 +- lib/spack/spack/test/ci.py | 27 +--- lib/spack/spack/test/cmd/audit.py | 1 - lib/spack/spack/test/cmd/build_env.py | 9 +- lib/spack/spack/test/cmd/ci.py | 102 +++------------ lib/spack/spack/test/cmd/clean.py | 2 - lib/spack/spack/test/cmd/commands.py | 2 +- lib/spack/spack/test/cmd/compiler.py | 5 +- lib/spack/spack/test/cmd/config.py | 6 +- lib/spack/spack/test/cmd/create.py | 12 +- lib/spack/spack/test/cmd/env.py | 18 +-- lib/spack/spack/test/cmd/extensions.py | 9 +- lib/spack/spack/test/cmd/external.py | 8 +- lib/spack/spack/test/cmd/find.py | 40 +----- lib/spack/spack/test/cmd/info.py | 6 +- lib/spack/spack/test/cmd/install.py | 28 +--- lib/spack/spack/test/cmd/maintainers.py | 6 +- lib/spack/spack/test/cmd/mirror.py | 22 +--- lib/spack/spack/test/cmd/test.py | 1 - lib/spack/spack/test/compilers/basics.py | 29 +---- lib/spack/spack/test/concretize.py | 18 +-- .../spack/test/concretize_preferences.py | 1 + .../spack/test/concretize_requirements.py | 8 +- lib/spack/spack/test/config.py | 62 ++------- lib/spack/spack/test/conftest.py | 24 +--- lib/spack/spack/test/cray_manifest.py | 10 +- lib/spack/spack/test/directory_layout.py | 5 +- lib/spack/spack/test/environment.py | 5 +- .../spack/test/environment_modifications.py | 9 +- lib/spack/spack/test/git_fetch.py | 1 - .../test/hooks/absolutify_elf_sonames.py | 5 +- lib/spack/spack/test/llnl/util/file_list.py | 11 +- lib/spack/spack/test/llnl/util/filesystem.py | 58 ++------- lib/spack/spack/test/llnl/util/lang.py | 16 +-- lib/spack/spack/test/llnl/util/link_tree.py | 1 - lib/spack/spack/test/llnl/util/tty/log.py | 5 +- lib/spack/spack/test/mirror.py | 18 +-- lib/spack/spack/test/modules/common.py | 9 +- lib/spack/spack/test/modules/lmod.py | 12 +- lib/spack/spack/test/modules/tcl.py | 1 - lib/spack/spack/test/package_class.py | 13 +- lib/spack/spack/test/packaging.py | 1 - lib/spack/spack/test/pattern.py | 3 - lib/spack/spack/test/relocate_text.py | 14 +- lib/spack/spack/test/schema.py | 6 +- lib/spack/spack/test/spack_yaml.py | 2 - lib/spack/spack/test/spec_dag.py | 7 +- lib/spack/spack/test/spec_list.py | 7 +- lib/spack/spack/test/spec_semantics.py | 3 - lib/spack/spack/test/spec_syntax.py | 69 ++-------- lib/spack/spack/test/spec_yaml.py | 18 +-- lib/spack/spack/test/stage.py | 3 +- lib/spack/spack/test/test_suite.py | 6 +- lib/spack/spack/test/traverse.py | 35 +---- lib/spack/spack/test/util/elf.py | 10 +- lib/spack/spack/test/variant.py | 10 -- lib/spack/spack/test/versions.py | 9 +- lib/spack/spack/test/web.py | 6 +- lib/spack/spack/util/elf.py | 25 +--- lib/spack/spack/util/environment.py | 7 +- lib/spack/spack/util/executable.py | 7 +- lib/spack/spack/util/gcs.py | 1 - lib/spack/spack/util/package_hash.py | 5 +- lib/spack/spack/util/spack_yaml.py | 7 +- lib/spack/spack/util/unparse/unparser.py | 39 +----- lib/spack/spack/util/url.py | 25 +--- lib/spack/spack/version.py | 6 +- pyproject.toml | 4 +- share/spack/qa/flake8_formatter.py | 15 +-- .../repos/builtin.mock/packages/a/package.py | 4 +- .../packages/attributes-foo/package.py | 1 - .../dep-diamond-patch-mid2/package.py | 2 +- .../packages/git-url-top-level/package.py | 10 +- .../packages/simple-inheritance/package.py | 1 - .../repos/builtin/packages/abacus/package.py | 21 +-- .../repos/builtin/packages/abinit/package.py | 1 - .../repos/builtin/packages/ace/package.py | 1 - .../repos/builtin/packages/acts/package.py | 14 +- .../repos/builtin/packages/actsvg/package.py | 12 +- .../repos/builtin/packages/adios/package.py | 1 - .../builtin/packages/admixtools/package.py | 1 - .../repos/builtin/packages/amber/package.py | 6 +- .../repos/builtin/packages/amdfftw/package.py | 1 - .../repos/builtin/packages/amrvis/package.py | 5 +- .../builtin/packages/anaconda3/package.py | 1 - .../builtin/packages/apr-util/package.py | 28 +--- .../repos/builtin/packages/apr/package.py | 4 +- .../repos/builtin/packages/arbor/package.py | 10 +- .../builtin/packages/arm-forge/package.py | 6 +- .../builtin/packages/armpl-gcc/package.py | 1 - .../repos/builtin/packages/asagi/package.py | 1 - .../builtin/packages/asdcplib/package.py | 1 - .../repos/builtin/packages/asio/package.py | 16 +-- .../builtin/packages/augustus/package.py | 7 +- .../builtin/packages/autodiff/package.py | 5 +- .../repos/builtin/packages/autogen/package.py | 2 +- .../repos/builtin/packages/axom/package.py | 3 +- .../repos/builtin/packages/bacio/package.py | 7 +- .../builtin/packages/bamaddrg/package.py | 1 - .../builtin/packages/berkeleygw/package.py | 1 - .../builtin/packages/binutils/package.py | 6 +- .../builtin/packages/blast-plus/package.py | 7 +- .../builtin/packages/blast2go/package.py | 7 +- .../repos/builtin/packages/blaze/package.py | 9 +- .../repos/builtin/packages/bohrium/package.py | 5 +- .../repos/builtin/packages/bowtie2/package.py | 4 +- .../builtin/packages/bubblewrap/package.py | 6 +- .../repos/builtin/packages/buddy/package.py | 4 +- .../repos/builtin/packages/bufr/package.py | 8 +- .../repos/builtin/packages/camx/package.py | 5 +- .../repos/builtin/packages/cantera/package.py | 10 +- .../builtin/packages/cbtf-lanl/package.py | 1 - .../repos/builtin/packages/cbtf/package.py | 2 - .../builtin/packages/chameleon/package.py | 1 - .../repos/builtin/packages/charmpp/package.py | 1 - .../builtin/packages/chemfiles/package.py | 4 +- .../repos/builtin/packages/cli11/package.py | 6 +- .../packages/clingo-bootstrap/package.py | 2 +- .../builtin/packages/cni-plugins/package.py | 3 +- .../repos/builtin/packages/corenlp/package.py | 4 +- .../repos/builtin/packages/cosma/package.py | 2 +- .../repos/builtin/packages/cosmomc/package.py | 8 +- .../repos/builtin/packages/costa/package.py | 6 +- .../repos/builtin/packages/cp2k/package.py | 62 ++------- .../builtin/packages/cray-fftw/package.py | 6 +- .../builtin/packages/crtm-fix/package.py | 6 +- .../repos/builtin/packages/crtm/package.py | 4 +- .../repos/builtin/packages/curl/package.py | 14 +- .../builtin/packages/cutensor/package.py | 2 +- .../repos/builtin/packages/dakota/package.py | 4 +- .../repos/builtin/packages/damaris/package.py | 1 - .../packages/darshan-runtime/package.py | 15 +-- .../builtin/packages/darshan-util/package.py | 15 +-- .../repos/builtin/packages/dbcsr/package.py | 7 +- .../repos/builtin/packages/dealii/package.py | 12 +- .../packages/deconseq-standalone/package.py | 1 - .../repos/builtin/packages/dia/package.py | 1 - .../builtin/packages/dihydrogen/package.py | 15 +-- .../builtin/packages/dmlc-core/package.py | 4 +- .../builtin/packages/docbook-xml/package.py | 10 +- .../repos/builtin/packages/dock/package.py | 7 +- .../builtin/packages/dos2unix/package.py | 2 +- .../repos/builtin/packages/dust/package.py | 10 +- .../builtin/packages/e3sm-kernels/package.py | 5 +- .../repos/builtin/packages/eagle/package.py | 6 +- .../repos/builtin/packages/easi/package.py | 1 - .../repos/builtin/packages/ebms/package.py | 1 - .../repos/builtin/packages/eccodes/package.py | 12 +- .../packages/ecp-data-vis-sdk/package.py | 5 +- .../builtin/packages/elfutils/package.py | 5 +- .../builtin/packages/elmerfem/package.py | 8 +- .../repos/builtin/packages/esmf/package.py | 53 ++------ .../repos/builtin/packages/expat/package.py | 5 +- .../repos/builtin/packages/faiss/package.py | 3 - .../repos/builtin/packages/ffmpeg/package.py | 10 +- .../repos/builtin/packages/ffte/package.py | 5 +- .../repos/builtin/packages/fftw/package.py | 1 - .../builtin/packages/flamemaster/package.py | 5 +- .../repos/builtin/packages/flex/package.py | 1 - .../repos/builtin/packages/fms/package.py | 7 +- .../builtin/packages/foam-extend/package.py | 24 +--- .../repos/builtin/packages/fplo/package.py | 18 +-- .../builtin/packages/fujitsu-fftw/package.py | 1 - .../repos/builtin/packages/g2/package.py | 7 +- .../repos/builtin/packages/g2c/package.py | 6 +- .../repos/builtin/packages/g2tmpl/package.py | 7 +- .../repos/builtin/packages/gate/package.py | 14 +- .../builtin/packages/gatepet2stir/package.py | 4 +- .../repos/builtin/packages/gcc/package.py | 13 +- .../repos/builtin/packages/gcta/package.py | 5 +- .../repos/builtin/packages/gdal/package.py | 4 +- .../repos/builtin/packages/gdbm/package.py | 1 - .../builtin/packages/geant4-data/package.py | 26 +--- .../repos/builtin/packages/genie/package.py | 6 +- .../repos/builtin/packages/gfsio/package.py | 7 +- .../builtin/packages/ghostscript/package.py | 6 +- .../repos/builtin/packages/git/package.py | 2 +- .../repos/builtin/packages/glpk/package.py | 1 - .../repos/builtin/packages/glvis/package.py | 8 +- .../repos/builtin/packages/gnutls/package.py | 18 +-- .../builtin/packages/go-bootstrap/package.py | 5 +- .../builtin/packages/go-md2man/package.py | 1 - .../repos/builtin/packages/go/package.py | 5 +- .../repos/builtin/packages/gpi-2/package.py | 8 +- .../repos/builtin/packages/grid/package.py | 7 +- .../repos/builtin/packages/gromacs/package.py | 13 +- .../repos/builtin/packages/gtkplus/package.py | 14 +- .../repos/builtin/packages/hal/package.py | 3 - .../repos/builtin/packages/halide/package.py | 5 +- .../builtin/packages/hdf5-vfd-gds/package.py | 4 +- .../repos/builtin/packages/hdf5/package.py | 43 +------ .../builtin/packages/heaptrack/package.py | 1 - .../repos/builtin/packages/heffte/package.py | 4 +- .../repos/builtin/packages/helics/package.py | 5 +- .../repos/builtin/packages/hiop/package.py | 8 +- .../repos/builtin/packages/hip/package.py | 5 +- .../repos/builtin/packages/hipfft/package.py | 2 +- .../repos/builtin/packages/hipsycl/package.py | 12 +- .../repos/builtin/packages/hiredis/package.py | 9 +- .../repos/builtin/packages/hisat2/package.py | 9 +- .../builtin/packages/hpctoolkit/package.py | 4 +- .../repos/builtin/packages/hpx/package.py | 3 +- .../repos/builtin/packages/hypre/package.py | 24 +--- .../builtin/packages/ibm-java/package.py | 2 +- .../repos/builtin/packages/idl/package.py | 2 - .../builtin/packages/intel-llvm/package.py | 1 - .../packages/intel-oneapi-mpi/package.py | 4 +- .../repos/builtin/packages/ip/package.py | 7 +- .../repos/builtin/packages/ip2/package.py | 7 +- .../repos/builtin/packages/ipopt/package.py | 12 +- .../repos/builtin/packages/iq-tree/package.py | 1 - .../repos/builtin/packages/kadath/package.py | 2 +- .../builtin/packages/kokkos-legacy/package.py | 40 ++---- .../builtin/packages/lapackpp/package.py | 2 +- .../repos/builtin/packages/lbann/package.py | 17 +-- .../repos/builtin/packages/lcals/package.py | 1 - .../builtin/packages/ldc-bootstrap/package.py | 1 - .../repos/builtin/packages/ldc/package.py | 1 - .../repos/builtin/packages/legion/package.py | 8 +- .../builtin/packages/libabigail/package.py | 1 - .../builtin/packages/libbeagle/package.py | 2 +- .../builtin/packages/libcroco/package.py | 6 +- .../repos/builtin/packages/libfms/package.py | 6 +- .../builtin/packages/libgeotiff/package.py | 4 +- .../repos/builtin/packages/libint/package.py | 1 - .../builtin/packages/libmypaint/package.py | 5 +- .../repos/builtin/packages/libpsl/package.py | 4 +- .../builtin/packages/libqrencode/package.py | 4 +- .../builtin/packages/libraw1394/package.py | 5 +- .../repos/builtin/packages/libszip/package.py | 7 +- .../repos/builtin/packages/libtiff/package.py | 6 +- .../repos/builtin/packages/libwebp/package.py | 6 +- .../builtin/packages/linsys-v/package.py | 5 +- .../builtin/packages/llvm-doe/package.py | 35 +---- .../repos/builtin/packages/llvm/package.py | 20 +-- .../packages/lua-luajit-openresty/package.py | 3 +- .../builtin/packages/lua-mpack/package.py | 20 +-- .../repos/builtin/packages/lua/package.py | 12 +- .../builtin/packages/maeparser/package.py | 4 +- .../builtin/packages/mapsplice2/package.py | 12 +- .../builtin/packages/mctc-lib/package.py | 4 +- .../repos/builtin/packages/med/package.py | 14 +- .../repos/builtin/packages/mesa/package.py | 9 +- .../repos/builtin/packages/mesa18/package.py | 9 +- .../builtin/packages/mesquite/package.py | 5 +- .../repos/builtin/packages/mfem/package.py | 6 +- .../repos/builtin/packages/mg/package.py | 5 +- .../builtin/packages/mgcfd-op2/package.py | 7 +- .../repos/builtin/packages/mgis/package.py | 1 - .../builtin/packages/mimalloc/package.py | 6 +- .../repos/builtin/packages/minigmg/package.py | 1 - .../builtin/packages/miopen-hip/package.py | 15 +-- .../builtin/packages/miopen-opencl/package.py | 19 +-- .../builtin/packages/mivisionx/package.py | 4 +- .../builtin/packages/mlirmiopen/package.py | 11 +- .../builtin/packages/mpas-model/package.py | 15 +-- .../repos/builtin/packages/mpfr/package.py | 4 +- .../builtin/packages/mpi-serial/package.py | 12 +- .../repos/builtin/packages/mujoco/package.py | 6 +- .../repos/builtin/packages/must/package.py | 13 +- .../repos/builtin/packages/mvapich/package.py | 5 +- .../repos/builtin/packages/mysqlpp/package.py | 4 +- .../repos/builtin/packages/n2p2/package.py | 20 +-- .../repos/builtin/packages/ncl/package.py | 1 - .../repos/builtin/packages/nemsio/package.py | 7 +- .../repos/builtin/packages/neovim/package.py | 15 +-- .../builtin/packages/netcdf-cxx/package.py | 5 +- .../builtin/packages/netlib-lapack/package.py | 26 +--- .../repos/builtin/packages/ngspice/package.py | 5 +- .../repos/builtin/packages/nix/package.py | 2 +- .../builtin/packages/ocamlbuild/package.py | 6 +- .../repos/builtin/packages/oce/package.py | 6 +- .../repos/builtin/packages/octopus/package.py | 15 +-- .../packages/ome-common-cpp/package.py | 5 +- .../builtin/packages/ome-files-cpp/package.py | 5 +- .../builtin/packages/ome-model/package.py | 5 +- .../repos/builtin/packages/ompss-2/package.py | 6 +- .../repos/builtin/packages/oommf/package.py | 15 +-- .../builtin/packages/openblas/package.py | 5 +- .../repos/builtin/packages/opencv/package.py | 115 ++++------------- .../builtin/packages/openfast/package.py | 12 +- .../builtin/packages/openfoam-org/package.py | 4 +- .../builtin/packages/openfoam/package.py | 16 +-- .../builtin/packages/openldap/package.py | 6 +- .../builtin/packages/openlibm/package.py | 4 +- .../repos/builtin/packages/openmpi/package.py | 6 +- .../packages/openscenegraph/package.py | 7 +- .../packages/openspeedshop-utils/package.py | 1 - .../builtin/packages/openspeedshop/package.py | 2 - .../repos/builtin/packages/openssl/package.py | 6 +- .../ophidia-analytics-framework/package.py | 5 +- .../packages/ophidia-primitives/package.py | 5 +- .../packages/ophidia-server/package.py | 5 +- .../builtin/packages/osg-ca-certs/package.py | 2 +- .../repos/builtin/packages/papyrus/package.py | 1 - .../packages/parallel-netcdf/package.py | 7 +- .../builtin/packages/parallel/package.py | 7 +- .../builtin/packages/parallelio/package.py | 12 +- .../builtin/packages/paraview/package.py | 11 +- .../repos/builtin/packages/pdftk/package.py | 1 - .../repos/builtin/packages/pegtl/package.py | 1 - .../builtin/packages/perl-fth/package.py | 5 +- .../repos/builtin/packages/perl/package.py | 41 ++---- .../repos/builtin/packages/pexsi/package.py | 2 - .../repos/builtin/packages/pfunit/package.py | 6 +- .../repos/builtin/packages/pgplot/package.py | 1 - .../repos/builtin/packages/piranha/package.py | 5 +- .../repos/builtin/packages/pixman/package.py | 5 +- .../repos/builtin/packages/plplot/package.py | 14 +- .../repos/builtin/packages/plumed/package.py | 1 - .../repos/builtin/packages/podman/package.py | 4 +- .../repos/builtin/packages/poppler/package.py | 16 +-- .../packages/ppopen-appl-amr-fdm/package.py | 5 +- .../repos/builtin/packages/prank/package.py | 1 - .../repos/builtin/packages/precice/package.py | 4 +- .../repos/builtin/packages/prism/package.py | 10 +- .../repos/builtin/packages/prrte/package.py | 1 - .../repos/builtin/packages/pvm/package.py | 7 +- .../builtin/packages/py-chainer/package.py | 15 +-- .../builtin/packages/py-darshan/package.py | 10 +- .../builtin/packages/py-galaxy2cwl/package.py | 5 +- .../py-lightning-utilities/package.py | 3 +- .../builtin/packages/py-llnl-sina/package.py | 7 +- .../builtin/packages/py-mariadb/package.py | 3 +- .../builtin/packages/py-parsl/package.py | 6 +- .../builtin/packages/py-pybind11/package.py | 4 +- .../repos/builtin/packages/py-pyfr/package.py | 15 +-- .../packages/py-pykokkos-base/package.py | 4 +- .../py-tensorflow-datasets/package.py | 5 +- .../builtin/packages/py-tensorflow/package.py | 5 +- .../builtin/packages/py-trimesh/package.py | 10 +- .../repos/builtin/packages/python/package.py | 21 +-- .../repos/builtin/packages/qmcpack/package.py | 1 - .../repos/builtin/packages/qoz/package.py | 5 +- .../builtin/packages/qrupdate/package.py | 1 - .../repos/builtin/packages/qt-base/package.py | 8 +- .../repos/builtin/packages/qt/package.py | 16 +-- .../packages/quantum-espresso/package.py | 7 +- .../repos/builtin/packages/r3d/package.py | 7 +- .../repos/builtin/packages/racket/package.py | 1 - .../packages/redis-plus-plus/package.py | 8 +- .../repos/builtin/packages/redis/package.py | 5 +- .../repos/builtin/packages/relion/package.py | 6 +- .../builtin/packages/revbayes/package.py | 7 +- .../repos/builtin/packages/rmgdft/package.py | 1 - .../builtin/packages/rocalution/package.py | 6 +- .../repos/builtin/packages/rocfft/package.py | 4 +- .../packages/rocm-openmp-extras/package.py | 66 ++-------- .../repos/builtin/packages/rocmlir/package.py | 6 +- .../repos/builtin/packages/roms/package.py | 2 - .../repos/builtin/packages/root/package.py | 12 +- .../repos/builtin/packages/rose/package.py | 14 +- .../builtin/packages/routinator/package.py | 5 +- .../repos/builtin/packages/rtags/package.py | 5 +- .../repos/builtin/packages/rust/package.py | 4 +- .../repos/builtin/packages/salmon/package.py | 4 +- .../builtin/packages/sambamba/package.py | 6 +- .../repos/builtin/packages/sbml/package.py | 5 +- .../repos/builtin/packages/scalpel/package.py | 6 +- .../builtin/packages/scantailor/package.py | 5 +- .../repos/builtin/packages/scotch/package.py | 8 +- .../repos/builtin/packages/seacas/package.py | 10 +- .../packages/serenity-libint/package.py | 4 +- .../builtin/packages/serenity/package.py | 1 - .../builtin/packages/serialbox/package.py | 11 +- .../repos/builtin/packages/sfcgal/package.py | 5 +- .../repos/builtin/packages/sfcio/package.py | 7 +- .../builtin/packages/shapeit4/package.py | 2 - .../builtin/packages/shellcheck/package.py | 2 +- .../repos/builtin/packages/sigio/package.py | 7 +- .../repos/builtin/packages/silo/package.py | 6 +- .../repos/builtin/packages/simgrid/package.py | 2 - .../builtin/packages/simple-dftd3/package.py | 1 - .../builtin/packages/simplemoc/package.py | 1 - .../repos/builtin/packages/sina/package.py | 6 +- .../repos/builtin/packages/slurm/package.py | 1 - .../repos/builtin/packages/sonlib/package.py | 3 - .../repos/builtin/packages/sp/package.py | 7 +- .../builtin/packages/spectrum-mpi/package.py | 2 +- .../repos/builtin/packages/spiner/package.py | 6 +- .../builtin/packages/sqlcipher/package.py | 7 +- .../repos/builtin/packages/starpu/package.py | 6 +- .../builtin/packages/strumpack/package.py | 6 +- .../builtin/packages/suite-sparse/package.py | 5 +- .../builtin/packages/sundials/package.py | 5 +- .../builtin/packages/superlu-mt/package.py | 6 +- .../repos/builtin/packages/sysstat/package.py | 5 +- .../repos/builtin/packages/tamaas/package.py | 4 +- .../builtin/packages/tasmanian/package.py | 4 +- .../repos/builtin/packages/tau/package.py | 1 - .../repos/builtin/packages/texinfo/package.py | 5 +- .../repos/builtin/packages/texlive/package.py | 15 +-- .../repos/builtin/packages/tfel/package.py | 1 - .../builtin/packages/timemory/package.py | 36 ++---- .../builtin/packages/totalview/package.py | 1 - .../builtin/packages/tracy-client/package.py | 26 +--- .../repos/builtin/packages/tracy/package.py | 20 +-- .../repos/builtin/packages/trexio/package.py | 1 - .../builtin/packages/trilinos/package.py | 15 +-- .../builtin/packages/ufs-utils/package.py | 7 +- .../repos/builtin/packages/unuran/package.py | 1 - .../repos/builtin/packages/vasp/package.py | 1 - .../repos/builtin/packages/vecgeom/package.py | 7 +- .../builtin/packages/viennarna/package.py | 1 - .../repos/builtin/packages/vtk/package.py | 5 +- .../repos/builtin/packages/w3emc/package.py | 7 +- .../repos/builtin/packages/w3nco/package.py | 7 +- .../builtin/packages/wannier90/package.py | 5 +- .../repos/builtin/packages/wget/package.py | 5 +- .../repos/builtin/packages/wgrib2/package.py | 9 +- .../repos/builtin/packages/wrf-io/package.py | 7 +- .../repos/builtin/packages/wrf/package.py | 15 +-- .../repos/builtin/packages/xsbench/package.py | 1 - .../repos/builtin/packages/xyce/package.py | 1 - .../repos/builtin/packages/yambo/package.py | 1 - .../repos/builtin/packages/zoltan/package.py | 5 +- .../repos/tutorial/packages/hdf5/package.py | 34 +---- .../packages/netlib-lapack/package.py | 13 +- 510 files changed, 864 insertions(+), 3856 deletions(-) diff --git a/.github/workflows/valid-style.yml b/.github/workflows/valid-style.yml index deacc52262..1bf8faa77a 100644 --- a/.github/workflows/valid-style.yml +++ b/.github/workflows/valid-style.yml @@ -44,7 +44,7 @@ jobs: cache: 'pip' - name: Install Python packages run: | - python3 -m pip install --upgrade pip six setuptools types-six black==22.12.0 mypy isort clingo flake8 + python3 -m pip install --upgrade pip six setuptools types-six black==23.1.0 mypy isort clingo flake8 - name: Setup git configuration run: | # Need this for the git tests to succeed. diff --git a/lib/spack/docs/conf.py b/lib/spack/docs/conf.py index fdf40f79cb..2b04fa642f 100644 --- a/lib/spack/docs/conf.py +++ b/lib/spack/docs/conf.py @@ -89,6 +89,7 @@ # Enable todo items todo_include_todos = True + # # Disable duplicate cross-reference warnings. # @@ -353,9 +354,7 @@ class SpackStyle(DefaultStyle): # Grouping the document tree into LaTeX files. List of tuples # (source start file, target name, title, author, documentclass [howto/manual]). -latex_documents = [ - ("index", "Spack.tex", "Spack Documentation", "Todd Gamblin", "manual"), -] +latex_documents = [("index", "Spack.tex", "Spack Documentation", "Todd Gamblin", "manual")] # The name of an image file (relative to this directory) to place at the top of # the title page. @@ -402,7 +401,7 @@ class SpackStyle(DefaultStyle): "Spack", "One line description of project.", "Miscellaneous", - ), + ) ] # Documents to append as an appendix to all manuals. @@ -418,6 +417,4 @@ class SpackStyle(DefaultStyle): # -- Extension configuration ------------------------------------------------- # sphinx.ext.intersphinx -intersphinx_mapping = { - "python": ("https://docs.python.org/3", None), -} +intersphinx_mapping = {"python": ("https://docs.python.org/3", None)} diff --git a/lib/spack/llnl/util/filesystem.py b/lib/spack/llnl/util/filesystem.py index b39a17b52a..330ee35911 100644 --- a/lib/spack/llnl/util/filesystem.py +++ b/lib/spack/llnl/util/filesystem.py @@ -268,7 +268,6 @@ def groupid_to_group(x): regex = re.escape(regex) filenames = path_to_os_path(*filenames) for filename in filenames: - msg = 'FILTER FILE: {0} [replacing "{1}"]' tty.debug(msg.format(filename, regex)) @@ -1220,7 +1219,6 @@ def traverse_tree( # target is relative to the link, then that may not resolve properly # relative to our cwd - see resolve_link_target_relative_to_the_link if os.path.isdir(source_child) and (follow_links or not os.path.islink(source_child)): - # When follow_nonexisting isn't set, don't descend into dirs # in source that do not exist in dest if follow_nonexisting or os.path.exists(dest_child): @@ -1662,7 +1660,6 @@ def find(root, files, recursive=True): @system_path_filter def _find_recursive(root, search_files): - # The variable here is **on purpose** a defaultdict. The idea is that # we want to poke the filesystem as little as possible, but still maintain # stability in the order of the answer. Thus we are recording each library diff --git a/lib/spack/llnl/util/lang.py b/lib/spack/llnl/util/lang.py index b03558b4f7..2f484cb874 100644 --- a/lib/spack/llnl/util/lang.py +++ b/lib/spack/llnl/util/lang.py @@ -198,7 +198,7 @@ def _memoized_function(*args, **kwargs): except TypeError as e: # TypeError is raised when indexing into a dict if the key is unhashable. raise UnhashableArguments( - "args + kwargs '{}' was not hashable for function '{}'".format(key, func.__name__), + "args + kwargs '{}' was not hashable for function '{}'".format(key, func.__name__) ) from e return _memoized_function @@ -237,6 +237,7 @@ def decorator_with_or_without_args(decorator): @decorator """ + # See https://stackoverflow.com/questions/653368 for more on this @functools.wraps(decorator) def new_dec(*args, **kwargs): @@ -990,8 +991,7 @@ def enum(**kwargs): def stable_partition( - input_iterable: Iterable, - predicate_fn: Callable[[Any], bool], + input_iterable: Iterable, predicate_fn: Callable[[Any], bool] ) -> Tuple[List[Any], List[Any]]: """Partition the input iterable according to a custom predicate. @@ -1104,11 +1104,7 @@ def __enter__(self): def __exit__(self, exc_type, exc_value, tb): if exc_value is not None: - self._handler._receive_forwarded( - self._context, - exc_value, - traceback.format_tb(tb), - ) + self._handler._receive_forwarded(self._context, exc_value, traceback.format_tb(tb)) # Suppress any exception from being re-raised: # https://docs.python.org/3/reference/datamodel.html#object.__exit__. diff --git a/lib/spack/llnl/util/tty/__init__.py b/lib/spack/llnl/util/tty/__init__.py index c723fe8051..ba9a627587 100644 --- a/lib/spack/llnl/util/tty/__init__.py +++ b/lib/spack/llnl/util/tty/__init__.py @@ -108,7 +108,6 @@ class SuppressOutput: """Class for disabling output in a scope using 'with' keyword""" def __init__(self, msg_enabled=True, warn_enabled=True, error_enabled=True): - self._msg_enabled_initial = _msg_enabled self._warn_enabled_initial = _warn_enabled self._error_enabled_initial = _error_enabled diff --git a/lib/spack/llnl/util/tty/log.py b/lib/spack/llnl/util/tty/log.py index 9a3ee46450..f2aed3d5b9 100644 --- a/lib/spack/llnl/util/tty/log.py +++ b/lib/spack/llnl/util/tty/log.py @@ -161,10 +161,7 @@ def _is_background(self): def _get_canon_echo_flags(self): """Get current termios canonical and echo settings.""" cfg = termios.tcgetattr(self.stream) - return ( - bool(cfg[3] & termios.ICANON), - bool(cfg[3] & termios.ECHO), - ) + return (bool(cfg[3] & termios.ICANON), bool(cfg[3] & termios.ECHO)) def _enable_keyboard_input(self): """Disable canonical input and echoing on ``self.stream``.""" diff --git a/lib/spack/llnl/util/tty/pty.py b/lib/spack/llnl/util/tty/pty.py index 1b5626f4ff..db959b3cff 100644 --- a/lib/spack/llnl/util/tty/pty.py +++ b/lib/spack/llnl/util/tty/pty.py @@ -77,10 +77,7 @@ def __init__(self, pid, controller_fd, timeout=1, sleep_time=1e-1, debug=False): def get_canon_echo_attrs(self): """Get echo and canon attributes of the terminal of controller_fd.""" cfg = termios.tcgetattr(self.controller_fd) - return ( - bool(cfg[3] & termios.ICANON), - bool(cfg[3] & termios.ECHO), - ) + return (bool(cfg[3] & termios.ICANON), bool(cfg[3] & termios.ECHO)) def horizontal_line(self, name): """Labled horizontal line for debugging.""" @@ -92,11 +89,7 @@ def status(self): if self.debug: canon, echo = self.get_canon_echo_attrs() sys.stderr.write( - "canon: %s, echo: %s\n" - % ( - "on" if canon else "off", - "on" if echo else "off", - ) + "canon: %s, echo: %s\n" % ("on" if canon else "off", "on" if echo else "off") ) sys.stderr.write("input: %s\n" % self.input_on()) sys.stderr.write("bg: %s\n" % self.background()) diff --git a/lib/spack/spack/audit.py b/lib/spack/spack/audit.py index a6e0a88b9c..441ec33136 100644 --- a/lib/spack/spack/audit.py +++ b/lib/spack/spack/audit.py @@ -321,8 +321,7 @@ def _check_patch_urls(pkgs, error_cls): errors.append( error_cls( "patch URL in package {0} must end with {1}".format( - pkg_cls.name, - full_index_arg, + pkg_cls.name, full_index_arg ), [patch.url], ) diff --git a/lib/spack/spack/binary_distribution.py b/lib/spack/spack/binary_distribution.py index 1e1085707e..01f428c633 100644 --- a/lib/spack/spack/binary_distribution.py +++ b/lib/spack/spack/binary_distribution.py @@ -210,10 +210,7 @@ def _associate_built_specs_with_mirror(self, cache_key, mirror_url): break else: self._mirrors_for_spec[dag_hash].append( - { - "mirror_url": mirror_url, - "spec": indexed_spec, - } + {"mirror_url": mirror_url, "spec": indexed_spec} ) finally: shutil.rmtree(tmpdir) @@ -296,10 +293,7 @@ def update_spec(self, spec, found_list): break else: current_list.append( - { - "mirror_url": new_entry["mirror_url"], - "spec": new_entry["spec"], - } + {"mirror_url": new_entry["mirror_url"], "spec": new_entry["spec"]} ) def update(self, with_cooldown=False): @@ -367,8 +361,7 @@ def update(self, with_cooldown=False): # May need to fetch the index and update the local caches try: needs_regen = self._fetch_and_cache_index( - cached_mirror_url, - cache_entry=cache_entry, + cached_mirror_url, cache_entry=cache_entry ) self._last_fetch_times[cached_mirror_url] = (now, True) all_methods_failed = False @@ -2006,12 +1999,7 @@ def try_direct_fetch(spec, mirrors=None): fetched_spec = Spec.from_json(specfile_contents) fetched_spec._mark_concrete() - found_specs.append( - { - "mirror_url": mirror.fetch_url, - "spec": fetched_spec, - } - ) + found_specs.append({"mirror_url": mirror.fetch_url, "spec": fetched_spec}) return found_specs @@ -2313,11 +2301,7 @@ def download_single_spec(concrete_spec, destination, mirror_url=None): local_tarball_path = os.path.join(destination, tarball_dir_name) files_to_fetch = [ - { - "url": [tarball_path_name], - "path": local_tarball_path, - "required": True, - }, + {"url": [tarball_path_name], "path": local_tarball_path, "required": True}, { "url": [ tarball_name(concrete_spec, ".spec.json.sig"), @@ -2438,12 +2422,7 @@ def conditional_fetch(self): response.headers.get("Etag", None) or response.headers.get("etag", None) ) - return FetchIndexResult( - etag=etag, - hash=computed_hash, - data=result, - fresh=False, - ) + return FetchIndexResult(etag=etag, hash=computed_hash, data=result, fresh=False) class EtagIndexFetcher: diff --git a/lib/spack/spack/bootstrap/__init__.py b/lib/spack/spack/bootstrap/__init__.py index 225e7d808e..1dad6597a6 100644 --- a/lib/spack/spack/bootstrap/__init__.py +++ b/lib/spack/spack/bootstrap/__init__.py @@ -5,11 +5,7 @@ """Function and classes needed to bootstrap Spack itself.""" from .config import ensure_bootstrap_configuration, is_bootstrapping -from .core import ( - all_core_root_specs, - ensure_core_dependencies, - ensure_patchelf_in_path_or_raise, -) +from .core import all_core_root_specs, ensure_core_dependencies, ensure_patchelf_in_path_or_raise from .environment import BootstrapEnvironment, ensure_environment_dependencies from .status import status_message diff --git a/lib/spack/spack/bootstrap/_common.py b/lib/spack/spack/bootstrap/_common.py index 31e6208ae6..3e464d1d86 100644 --- a/lib/spack/spack/bootstrap/_common.py +++ b/lib/spack/spack/bootstrap/_common.py @@ -59,10 +59,7 @@ def _try_import_from_store(module, query_spec, query_info=None): # to be picked up and used, possibly depending on something in the store, first # allows the bootstrap version to work when an incompatible version is in # sys.path - orders = [ - module_paths + sys.path, - sys.path + module_paths, - ] + orders = [module_paths + sys.path, sys.path + module_paths] for path in orders: sys.path = path try: diff --git a/lib/spack/spack/bootstrap/core.py b/lib/spack/spack/bootstrap/core.py index b9db0bad39..2021171a38 100644 --- a/lib/spack/spack/bootstrap/core.py +++ b/lib/spack/spack/bootstrap/core.py @@ -53,12 +53,7 @@ import spack.util.url import spack.version -from ._common import ( - _executables_in_store, - _python_import, - _root_spec, - _try_import_from_store, -) +from ._common import _executables_in_store, _python_import, _root_spec, _try_import_from_store from .config import spack_python_interpreter, spec_for_current_python #: Name of the file containing metadata about the bootstrapping source diff --git a/lib/spack/spack/bootstrap/environment.py b/lib/spack/spack/bootstrap/environment.py index 7eb8d3ad58..cc8d6c09b4 100644 --- a/lib/spack/spack/bootstrap/environment.py +++ b/lib/spack/spack/bootstrap/environment.py @@ -171,7 +171,7 @@ def mypy_root_spec(): def black_root_spec(): """Return the root spec used to bootstrap black""" - return _root_spec("py-black@:22.12.0") + return _root_spec("py-black@:23.1.0") def flake8_root_spec(): diff --git a/lib/spack/spack/build_environment.py b/lib/spack/spack/build_environment.py index b8ede1638a..1506233de9 100644 --- a/lib/spack/spack/build_environment.py +++ b/lib/spack/spack/build_environment.py @@ -1016,7 +1016,6 @@ def get_cmake_prefix_path(pkg): def _setup_pkg_and_run( serialized_pkg, function, kwargs, child_pipe, input_multiprocess_fd, jsfd1, jsfd2 ): - context = kwargs.get("context", "build") try: diff --git a/lib/spack/spack/build_systems/autotools.py b/lib/spack/spack/build_systems/autotools.py index fbe495ab68..a2594203ff 100644 --- a/lib/spack/spack/build_systems/autotools.py +++ b/lib/spack/spack/build_systems/autotools.py @@ -110,11 +110,7 @@ class AutotoolsBuilder(BaseBuilder): phases = ("autoreconf", "configure", "build", "install") #: Names associated with package methods in the old build-system format - legacy_methods = ( - "configure_args", - "check", - "installcheck", - ) + legacy_methods = ("configure_args", "check", "installcheck") #: Names associated with package attributes in the old build-system format legacy_attributes = ( diff --git a/lib/spack/spack/build_systems/cached_cmake.py b/lib/spack/spack/build_systems/cached_cmake.py index a98800a359..92b6a5122a 100644 --- a/lib/spack/spack/build_systems/cached_cmake.py +++ b/lib/spack/spack/build_systems/cached_cmake.py @@ -31,7 +31,6 @@ def cmake_cache_option(name, boolean_value, comment=""): class CachedCMakeBuilder(CMakeBuilder): - #: Phases of a Cached CMake package #: Note: the initconfig phase is used for developer builds as a final phase to stop on phases: Tuple[str, ...] = ("initconfig", "cmake", "build", "install") diff --git a/lib/spack/spack/build_systems/cmake.py b/lib/spack/spack/build_systems/cmake.py index 06822c89a9..89a6c670d0 100644 --- a/lib/spack/spack/build_systems/cmake.py +++ b/lib/spack/spack/build_systems/cmake.py @@ -252,10 +252,7 @@ def std_args(pkg, generator=None): if platform.mac_ver()[0]: args.extend( - [ - define("CMAKE_FIND_FRAMEWORK", "LAST"), - define("CMAKE_FIND_APPBUNDLE", "LAST"), - ] + [define("CMAKE_FIND_FRAMEWORK", "LAST"), define("CMAKE_FIND_APPBUNDLE", "LAST")] ) # Set up CMake rpath diff --git a/lib/spack/spack/build_systems/generic.py b/lib/spack/spack/build_systems/generic.py index 1db40d9124..1e5759ae56 100644 --- a/lib/spack/spack/build_systems/generic.py +++ b/lib/spack/spack/build_systems/generic.py @@ -38,10 +38,7 @@ class GenericBuilder(BaseBuilder): legacy_methods: Tuple[str, ...] = () #: Names associated with package attributes in the old build-system format - legacy_attributes: Tuple[str, ...] = ( - "archive_files", - "install_time_test_callbacks", - ) + legacy_attributes: Tuple[str, ...] = ("archive_files", "install_time_test_callbacks") #: Callback names for post-install phase tests install_time_test_callbacks = [] diff --git a/lib/spack/spack/build_systems/intel.py b/lib/spack/spack/build_systems/intel.py index e9e9102043..771761119a 100644 --- a/lib/spack/spack/build_systems/intel.py +++ b/lib/spack/spack/build_systems/intel.py @@ -857,10 +857,7 @@ def scalapack_libs(self): raise_lib_error("Cannot find a BLACS library for the given MPI.") int_suff = "_" + self.intel64_int_suffix - scalapack_libnames = [ - "libmkl_scalapack" + int_suff, - blacs_lib + int_suff, - ] + scalapack_libnames = ["libmkl_scalapack" + int_suff, blacs_lib + int_suff] sca_libs = find_libraries( scalapack_libnames, root=self.component_lib_dir("mkl"), shared=("+shared" in self.spec) ) @@ -1161,9 +1158,7 @@ def _determine_license_type(self): # # Ideally, we just tell the installer to look around on the system. # Thankfully, we neither need to care nor emulate where it looks: - license_type = { - "ACTIVATION_TYPE": "exist_lic", - } + license_type = {"ACTIVATION_TYPE": "exist_lic"} # However (and only), if the spack-internal Intel license file has been # populated beyond its templated explanatory comments, proffer it to diff --git a/lib/spack/spack/build_systems/lua.py b/lib/spack/spack/build_systems/lua.py index 2eda67e513..ad67f50825 100644 --- a/lib/spack/spack/build_systems/lua.py +++ b/lib/spack/spack/build_systems/lua.py @@ -68,10 +68,7 @@ def unpack(self, pkg, spec, prefix): @staticmethod def _generate_tree_line(name, prefix): - return """{{ name = "{name}", root = "{prefix}" }};""".format( - name=name, - prefix=prefix, - ) + return """{{ name = "{name}", root = "{prefix}" }};""".format(name=name, prefix=prefix) def generate_luarocks_config(self, pkg, spec, prefix): spec = self.pkg.spec diff --git a/lib/spack/spack/build_systems/oneapi.py b/lib/spack/spack/build_systems/oneapi.py index 09611b1a3a..a6f96d45eb 100644 --- a/lib/spack/spack/build_systems/oneapi.py +++ b/lib/spack/spack/build_systems/oneapi.py @@ -37,11 +37,7 @@ class IntelOneApiPackage(Package): conflicts(c, msg="This package in only available for x86_64 and Linux") # Add variant to toggle environment modifications from vars.sh - variant( - "envmods", - default=True, - description="Toggles environment modifications", - ) + variant("envmods", default=True, description="Toggles environment modifications") @staticmethod def update_description(cls): diff --git a/lib/spack/spack/build_systems/sip.py b/lib/spack/spack/build_systems/sip.py index c7a345b245..c45254ebb0 100644 --- a/lib/spack/spack/build_systems/sip.py +++ b/lib/spack/spack/build_systems/sip.py @@ -61,10 +61,7 @@ def import_modules(self): list: list of strings of module names """ modules = [] - root = os.path.join( - self.prefix, - self.spec["python"].package.platlib, - ) + root = os.path.join(self.prefix, self.spec["python"].package.platlib) # Some Python libraries are packages: collections of modules # distributed in directories containing __init__.py files diff --git a/lib/spack/spack/ci.py b/lib/spack/spack/ci.py index 6ab6d12633..2eadb0929c 100644 --- a/lib/spack/spack/ci.py +++ b/lib/spack/spack/ci.py @@ -42,9 +42,7 @@ from spack.reporters import CDash, CDashConfiguration from spack.reporters.cdash import build_stamp as cdash_build_stamp -JOB_RETRY_CONDITIONS = [ - "always", -] +JOB_RETRY_CONDITIONS = ["always"] TEMP_STORAGE_MIRROR_NAME = "ci_temporary_mirror" SPACK_RESERVED_TAGS = ["public", "protected", "notary"] @@ -129,10 +127,7 @@ def _remove_reserved_tags(tags): def _get_spec_string(spec): - format_elements = [ - "{name}{@version}", - "{%compiler}", - ] + format_elements = ["{name}{@version}", "{%compiler}"] if spec.architecture: format_elements.append(" {arch=architecture}") @@ -328,12 +323,7 @@ def _compute_spec_deps(spec_list, check_index_only=False, mirrors_to_check=None) dependencies = [] def append_dep(s, d): - dependencies.append( - { - "spec": s, - "depends": d, - } - ) + dependencies.append({"spec": s, "depends": d}) for spec in spec_list: for s in spec.traverse(deptype=all): @@ -346,10 +336,7 @@ def append_dep(s, d): ) skey = _spec_deps_key(s) - spec_labels[skey] = { - "spec": s, - "needs_rebuild": not up_to_date_mirrors, - } + spec_labels[skey] = {"spec": s, "needs_rebuild": not up_to_date_mirrors} for d in s.dependencies(deptype=all): dkey = _spec_deps_key(d) @@ -368,10 +355,7 @@ def append_dep(s, d): } ) - deps_json_obj = { - "specs": specs, - "dependencies": dependencies, - } + deps_json_obj = {"specs": specs, "dependencies": dependencies} return deps_json_obj @@ -410,14 +394,7 @@ def _copy_attributes(attrs_list, src_dict, dest_dict): def _find_matching_config(spec, gitlab_ci): runner_attributes = {} - overridable_attrs = [ - "image", - "tags", - "variables", - "before_script", - "script", - "after_script", - ] + overridable_attrs = ["image", "tags", "variables", "before_script", "script", "after_script"] _copy_attributes(overridable_attrs, gitlab_ci, runner_attributes) @@ -685,28 +662,14 @@ def generate_gitlab_ci_yaml( except AttributeError: phase_name = phase strip_compilers = False - phases.append( - { - "name": phase_name, - "strip-compilers": strip_compilers, - } - ) + phases.append({"name": phase_name, "strip-compilers": strip_compilers}) for bs in env.spec_lists[phase_name]: bootstrap_specs.append( - { - "spec": bs, - "phase-name": phase_name, - "strip-compilers": strip_compilers, - } + {"spec": bs, "phase-name": phase_name, "strip-compilers": strip_compilers} ) - phases.append( - { - "name": "specs", - "strip-compilers": False, - } - ) + phases.append({"name": "specs", "strip-compilers": False}) # If a remote mirror override (alternate buildcache destination) was # specified, add it here in case it has already built hashes we might @@ -1109,15 +1072,9 @@ def generate_gitlab_ci_yaml( "variables": variables, "script": job_script, "tags": tags, - "artifacts": { - "paths": artifact_paths, - "when": "always", - }, + "artifacts": {"paths": artifact_paths, "when": "always"}, "needs": sorted(job_dependencies, key=lambda d: d["job"]), - "retry": { - "max": 2, - "when": JOB_RETRY_CONDITIONS, - }, + "retry": {"max": 2, "when": JOB_RETRY_CONDITIONS}, "interruptible": True, } @@ -1135,10 +1092,7 @@ def generate_gitlab_ci_yaml( if image_name: job_object["image"] = image_name if image_entry is not None: - job_object["image"] = { - "name": image_name, - "entrypoint": image_entry, - } + job_object["image"] = {"name": image_name, "entrypoint": image_entry} output_object[job_name] = job_object job_id += 1 @@ -1181,11 +1135,7 @@ def generate_gitlab_ci_yaml( service_job_retries = { "max": 2, - "when": [ - "runner_system_failure", - "stuck_or_timeout_failure", - "script_failure", - ], + "when": ["runner_system_failure", "stuck_or_timeout_failure", "script_failure"], } if job_id > 0: @@ -1357,9 +1307,7 @@ def generate_gitlab_ci_yaml( _copy_attributes(default_attrs, service_job_config, noop_job) if "script" not in noop_job: - noop_job["script"] = [ - 'echo "All specs already up to date, nothing to rebuild."', - ] + noop_job["script"] = ['echo "All specs already up to date, nothing to rebuild."'] noop_job["retry"] = service_job_retries @@ -1620,9 +1568,7 @@ def download_and_extract_artifacts(url, work_dir): """ tty.msg("Fetching artifacts from: {0}\n".format(url)) - headers = { - "Content-Type": "application/zip", - } + headers = {"Content-Type": "application/zip"} token = os.environ.get("GITLAB_PRIVATE_TOKEN", None) if token: @@ -2081,10 +2027,7 @@ def write_broken_spec(url, pkg_name, stack_name, job_url, pipeline_url, spec_dic with open(file_path, "w") as fd: fd.write(syaml.dump(broken_spec_details)) web_util.push_to_url( - file_path, - url, - keep_original=False, - extra_args={"ContentType": "text/plain"}, + file_path, url, keep_original=False, extra_args={"ContentType": "text/plain"} ) except Exception as err: # If there is an S3 error (e.g., access denied or connection @@ -2162,14 +2105,7 @@ def run_standalone_tests(**kwargs): tty.error("Reproduction directory is required for stand-alone tests") return - test_args = [ - "spack", - "--color=always", - "--backtrace", - "--verbose", - "test", - "run", - ] + test_args = ["spack", "--color=always", "--backtrace", "--verbose", "test", "run"] if fail_fast: test_args.append("--fail-fast") @@ -2319,19 +2255,9 @@ def populate_buildgroup(self, job_names): opener = build_opener(HTTPHandler) - parent_group_id = self.create_buildgroup( - opener, - headers, - url, - self.build_group, - "Daily", - ) + parent_group_id = self.create_buildgroup(opener, headers, url, self.build_group, "Daily") group_id = self.create_buildgroup( - opener, - headers, - url, - "Latest {0}".format(self.build_group), - "Latest", + opener, headers, url, "Latest {0}".format(self.build_group), "Latest" ) if not parent_group_id or not group_id: @@ -2341,13 +2267,9 @@ def populate_buildgroup(self, job_names): data = { "dynamiclist": [ - { - "match": name, - "parentgroupid": parent_group_id, - "site": self.site, - } + {"match": name, "parentgroupid": parent_group_id, "site": self.site} for name in job_names - ], + ] } enc_data = json.dumps(data).encode("utf-8") diff --git a/lib/spack/spack/ci_optimization.py b/lib/spack/spack/ci_optimization.py index 7b2128e255..bb9e5eec16 100644 --- a/lib/spack/spack/ci_optimization.py +++ b/lib/spack/spack/ci_optimization.py @@ -43,7 +43,6 @@ def matches(obj, proto): return all((key in obj and matches(obj[key], val)) for key, val in proto.items()) if isinstance(obj, collections.abc.Sequence) and not isinstance(obj, str): - if not (isinstance(proto, collections.abc.Sequence) and not isinstance(proto, str)): return False diff --git a/lib/spack/spack/cmd/__init__.py b/lib/spack/spack/cmd/__init__.py index b3251cef55..f0dbc4d43e 100644 --- a/lib/spack/spack/cmd/__init__.py +++ b/lib/spack/spack/cmd/__init__.py @@ -161,9 +161,7 @@ class _UnquotedFlags(object): """ flags_arg_pattern = re.compile( - r'^({0})=([^\'"].*)$'.format( - "|".join(spack.spec.FlagMap.valid_compiler_flags()), - ) + r'^({0})=([^\'"].*)$'.format("|".join(spack.spec.FlagMap.valid_compiler_flags())) ) def __init__(self, all_unquoted_flag_pairs: List[Tuple[Match[str], str]]): @@ -227,7 +225,6 @@ def parse_specs(args, **kwargs): return specs except spack.error.SpecError as e: - msg = e.message if e.long_message: msg += e.long_message diff --git a/lib/spack/spack/cmd/audit.py b/lib/spack/spack/cmd/audit.py index 9706f995c6..cb71dbbcb2 100644 --- a/lib/spack/spack/cmd/audit.py +++ b/lib/spack/spack/cmd/audit.py @@ -53,7 +53,6 @@ def packages(parser, args): def packages_https(parser, args): - # Since packages takes a long time, --all is required without name if not args.check_all and not args.name: tty.die("Please specify one or more packages to audit, or --all.") diff --git a/lib/spack/spack/cmd/buildcache.py b/lib/spack/spack/cmd/buildcache.py index b1be9b6056..7532271054 100644 --- a/lib/spack/spack/cmd/buildcache.py +++ b/lib/spack/spack/cmd/buildcache.py @@ -103,9 +103,7 @@ def setup_parser(subparser): help="Regenerate buildcache index after building package(s)", ) create.add_argument( - "--spec-file", - default=None, - help="Create buildcache entry for spec from json or yaml file", + "--spec-file", default=None, help="Create buildcache entry for spec from json or yaml file" ) create.add_argument( "--only", diff --git a/lib/spack/spack/cmd/change.py b/lib/spack/spack/cmd/change.py index 652d42db14..0a57cb6da5 100644 --- a/lib/spack/spack/cmd/change.py +++ b/lib/spack/spack/cmd/change.py @@ -20,9 +20,7 @@ def setup_parser(subparser): help="name of the list to remove specs from", ) subparser.add_argument( - "--match-spec", - dest="match_spec", - help="if name is ambiguous, supply a spec to match", + "--match-spec", dest="match_spec", help="if name is ambiguous, supply a spec to match" ) subparser.add_argument( "-a", diff --git a/lib/spack/spack/cmd/ci.py b/lib/spack/spack/cmd/ci.py index aadc47fc2c..1127399842 100644 --- a/lib/spack/spack/cmd/ci.py +++ b/lib/spack/spack/cmd/ci.py @@ -548,13 +548,7 @@ def ci_rebuild(args): commands = [ # apparently there's a race when spack bootstraps? do it up front once - [ - SPACK_COMMAND, - "-e", - env.path, - "bootstrap", - "now", - ], + [SPACK_COMMAND, "-e", env.path, "bootstrap", "now"], [ SPACK_COMMAND, "-e", diff --git a/lib/spack/spack/cmd/commands.py b/lib/spack/spack/cmd/commands.py index 14703bf8a5..d26d67bc32 100644 --- a/lib/spack/spack/cmd/commands.py +++ b/lib/spack/spack/cmd/commands.py @@ -13,11 +13,7 @@ import llnl.util.filesystem as fs import llnl.util.tty as tty -from llnl.util.argparsewriter import ( - ArgparseCompletionWriter, - ArgparseRstWriter, - ArgparseWriter, -) +from llnl.util.argparsewriter import ArgparseCompletionWriter, ArgparseRstWriter, ArgparseWriter from llnl.util.tty.colify import colify import spack.cmd @@ -42,7 +38,7 @@ "format": "bash", "header": os.path.join(spack.paths.share_path, "bash", "spack-completion.in"), "update": os.path.join(spack.paths.share_path, "spack-completion.bash"), - }, + } } diff --git a/lib/spack/spack/cmd/config.py b/lib/spack/spack/cmd/config.py index 9ccf6f9e9b..0ab66d449f 100644 --- a/lib/spack/spack/cmd/config.py +++ b/lib/spack/spack/cmd/config.py @@ -408,13 +408,7 @@ def config_prefer_upstream(args): pkgs = {} for spec in pref_specs: # Collect all the upstream compilers and versions for this package. - pkg = pkgs.get( - spec.name, - { - "version": [], - "compiler": [], - }, - ) + pkg = pkgs.get(spec.name, {"version": [], "compiler": []}) pkgs[spec.name] = pkg # We have no existing variant if this is our first added version. diff --git a/lib/spack/spack/cmd/create.py b/lib/spack/spack/cmd/create.py index bf796e47dc..8ee259c52d 100644 --- a/lib/spack/spack/cmd/create.py +++ b/lib/spack/spack/cmd/create.py @@ -16,19 +16,10 @@ import spack.stage import spack.util.web from spack.spec import Spec -from spack.url import ( - UndetectableNameError, - UndetectableVersionError, - parse_name, - parse_version, -) +from spack.url import UndetectableNameError, UndetectableVersionError, parse_name, parse_version from spack.util.editor import editor from spack.util.executable import ProcessError, which -from spack.util.naming import ( - mod_to_class, - simplify_name, - valid_fully_qualified_module_name, -) +from spack.util.naming import mod_to_class, simplify_name, valid_fully_qualified_module_name description = "create a new package file" section = "packaging" diff --git a/lib/spack/spack/cmd/debug.py b/lib/spack/spack/cmd/debug.py index 3b8c151294..8c3cb93d17 100644 --- a/lib/spack/spack/cmd/debug.py +++ b/lib/spack/spack/cmd/debug.py @@ -96,8 +96,5 @@ def report(args): def debug(parser, args): - action = { - "create-db-tarball": create_db_tarball, - "report": report, - } + action = {"create-db-tarball": create_db_tarball, "report": report} action[args.debug_command](args) diff --git a/lib/spack/spack/cmd/deprecate.py b/lib/spack/spack/cmd/deprecate.py index 47215ed131..3f0994f564 100644 --- a/lib/spack/spack/cmd/deprecate.py +++ b/lib/spack/spack/cmd/deprecate.py @@ -33,12 +33,7 @@ level = "long" # Arguments for display_specs when we find ambiguity -display_args = { - "long": True, - "show_flags": True, - "variants": True, - "indent": 4, -} +display_args = {"long": True, "show_flags": True, "variants": True, "indent": 4} def setup_parser(sp): diff --git a/lib/spack/spack/cmd/diff.py b/lib/spack/spack/cmd/diff.py index 5206a246c0..13c27aec2c 100644 --- a/lib/spack/spack/cmd/diff.py +++ b/lib/spack/spack/cmd/diff.py @@ -80,22 +80,12 @@ def compare_specs(a, b, to_string=False, color=None): # specs and to descend into dependency hashes so we include all facts. a_facts = set( shift(func) - for func in setup.spec_clauses( - a, - body=True, - expand_hashes=True, - concrete_build_deps=True, - ) + for func in setup.spec_clauses(a, body=True, expand_hashes=True, concrete_build_deps=True) if func.name == "attr" ) b_facts = set( shift(func) - for func in setup.spec_clauses( - b, - body=True, - expand_hashes=True, - concrete_build_deps=True, - ) + for func in setup.spec_clauses(b, body=True, expand_hashes=True, concrete_build_deps=True) if func.name == "attr" ) diff --git a/lib/spack/spack/cmd/env.py b/lib/spack/spack/cmd/env.py index fd8bf2de56..fe7d1ad59a 100644 --- a/lib/spack/spack/cmd/env.py +++ b/lib/spack/spack/cmd/env.py @@ -148,8 +148,7 @@ def env_activate(args): if not args.shell: spack.cmd.common.shell_init_instructions( - "spack env activate", - " eval `spack env activate {sh_arg} [...]`", + "spack env activate", " eval `spack env activate {sh_arg} [...]`" ) return 1 @@ -238,8 +237,7 @@ def env_deactivate_setup_parser(subparser): def env_deactivate(args): if not args.shell: spack.cmd.common.shell_init_instructions( - "spack env deactivate", - " eval `spack env deactivate {sh_arg}`", + "spack env deactivate", " eval `spack env deactivate {sh_arg}`" ) return 1 diff --git a/lib/spack/spack/cmd/external.py b/lib/spack/spack/cmd/external.py index 51e468e1bc..d859ad9d7a 100644 --- a/lib/spack/spack/cmd/external.py +++ b/lib/spack/spack/cmd/external.py @@ -38,11 +38,7 @@ def setup_parser(subparser): default=False, help="packages with detected externals won't be built with Spack", ) - find_parser.add_argument( - "--exclude", - action="append", - help="packages to exclude from search", - ) + find_parser.add_argument("--exclude", action="append", help="packages to exclude from search") find_parser.add_argument( "-p", "--path", @@ -187,7 +183,6 @@ def external_read_cray_manifest(args): def _collect_and_consume_cray_manifest_files( manifest_file=None, manifest_directory=None, dry_run=False, fail_on_error=False ): - manifest_files = [] if manifest_file: manifest_files.append(manifest_file) diff --git a/lib/spack/spack/cmd/fetch.py b/lib/spack/spack/cmd/fetch.py index 0bfd513070..663c57c4cb 100644 --- a/lib/spack/spack/cmd/fetch.py +++ b/lib/spack/spack/cmd/fetch.py @@ -25,10 +25,7 @@ def setup_parser(subparser): help="fetch only missing (not yet installed) dependencies", ) subparser.add_argument( - "-D", - "--dependencies", - action="store_true", - help="also fetch all dependencies", + "-D", "--dependencies", action="store_true", help="also fetch all dependencies" ) arguments.add_common_arguments(subparser, ["specs"]) subparser.epilog = ( diff --git a/lib/spack/spack/cmd/graph.py b/lib/spack/spack/cmd/graph.py index 5a953f9ae5..a0fd16f19f 100644 --- a/lib/spack/spack/cmd/graph.py +++ b/lib/spack/spack/cmd/graph.py @@ -9,13 +9,7 @@ import spack.config import spack.environment as ev import spack.store -from spack.graph import ( - DAGWithDependencyTypes, - SimpleDAG, - graph_ascii, - graph_dot, - static_graph_dot, -) +from spack.graph import DAGWithDependencyTypes, SimpleDAG, graph_ascii, graph_dot, static_graph_dot description = "generate graphs of package dependency relationships" section = "basic" diff --git a/lib/spack/spack/cmd/help.py b/lib/spack/spack/cmd/help.py index f719195e91..1f45735158 100644 --- a/lib/spack/spack/cmd/help.py +++ b/lib/spack/spack/cmd/help.py @@ -87,9 +87,7 @@ """ -guides = { - "spec": spec_guide, -} +guides = {"spec": spec_guide} def setup_parser(subparser): diff --git a/lib/spack/spack/cmd/install.py b/lib/spack/spack/cmd/install.py index 81cfebc19e..51f18479ee 100644 --- a/lib/spack/spack/cmd/install.py +++ b/lib/spack/spack/cmd/install.py @@ -496,9 +496,7 @@ def reporter_factory(specs): return None context_manager = spack.report.build_context_manager( - reporter=args.reporter(), - filename=report_filename(args, specs=specs), - specs=specs, + reporter=args.reporter(), filename=report_filename(args, specs=specs), specs=specs ) return context_manager diff --git a/lib/spack/spack/cmd/license.py b/lib/spack/spack/cmd/license.py index 27facdcaee..454fefcece 100644 --- a/lib/spack/spack/cmd/license.py +++ b/lib/spack/spack/cmd/license.py @@ -58,10 +58,7 @@ #: licensed files that can have LGPL language in them #: so far, just this command -- so it can find LGPL things elsewhere -lgpl_exceptions = [ - r"lib/spack/spack/cmd/license.py", - r"lib/spack/spack/test/cmd/license.py", -] +lgpl_exceptions = [r"lib/spack/spack/cmd/license.py", r"lib/spack/spack/test/cmd/license.py"] def _all_spack_files(root=spack.paths.prefix): @@ -129,7 +126,6 @@ def error_messages(self): def _check_license(lines, path): - found = [] for line in lines: diff --git a/lib/spack/spack/cmd/load.py b/lib/spack/spack/cmd/load.py index 4f60ab3d52..ee9ee939e8 100644 --- a/lib/spack/spack/cmd/load.py +++ b/lib/spack/spack/cmd/load.py @@ -98,8 +98,7 @@ def load(parser, args): if not args.shell: specs_str = " ".join(args.constraint) or "SPECS" spack.cmd.common.shell_init_instructions( - "spack load", - " eval `spack load {sh_arg} %s`" % specs_str, + "spack load", " eval `spack load {sh_arg} %s`" % specs_str ) return 1 diff --git a/lib/spack/spack/cmd/mark.py b/lib/spack/spack/cmd/mark.py index d7a3c06642..1d125cc409 100644 --- a/lib/spack/spack/cmd/mark.py +++ b/lib/spack/spack/cmd/mark.py @@ -27,12 +27,7 @@ """ # Arguments for display_specs when we find ambiguity -display_args = { - "long": True, - "show_flags": False, - "variants": False, - "indent": 4, -} +display_args = {"long": True, "show_flags": False, "variants": False, "indent": 4} def setup_parser(subparser): diff --git a/lib/spack/spack/cmd/mirror.py b/lib/spack/spack/cmd/mirror.py index 21319d9fdf..8ad10b1a6c 100644 --- a/lib/spack/spack/cmd/mirror.py +++ b/lib/spack/spack/cmd/mirror.py @@ -445,9 +445,7 @@ def mirror_create(args): mirror_specs = concrete_specs_from_user(args) create_mirror_for_individual_specs( - mirror_specs, - path=path, - skip_unstable_versions=args.skip_unstable_versions, + mirror_specs, path=path, skip_unstable_versions=args.skip_unstable_versions ) @@ -467,9 +465,7 @@ def create_mirror_for_all_specs(path, skip_unstable_versions, selection_fn): def create_mirror_for_all_specs_inside_environment(path, skip_unstable_versions, selection_fn): mirror_specs = concrete_specs_from_environment(selection_fn=selection_fn) create_mirror_for_individual_specs( - mirror_specs, - path=path, - skip_unstable_versions=skip_unstable_versions, + mirror_specs, path=path, skip_unstable_versions=skip_unstable_versions ) diff --git a/lib/spack/spack/cmd/modules/__init__.py b/lib/spack/spack/cmd/modules/__init__.py index c3bb74c096..107189f814 100644 --- a/lib/spack/spack/cmd/modules/__init__.py +++ b/lib/spack/spack/cmd/modules/__init__.py @@ -180,10 +180,7 @@ def loads(module_type, specs, args, out=None): for spec in specs ) - module_commands = { - "tcl": "module load ", - "lmod": "module load ", - } + module_commands = {"tcl": "module load ", "lmod": "module load "} d = {"command": "" if not args.shell else module_commands[module_type], "prefix": args.prefix} @@ -368,18 +365,14 @@ def refresh(module_type, specs, args): def modules_cmd(parser, args, module_type, callbacks=callbacks): - # Qualifiers to be used when querying the db for specs - constraint_qualifiers = { - "refresh": {"installed": True, "known": True}, - } + constraint_qualifiers = {"refresh": {"installed": True, "known": True}} query_args = constraint_qualifiers.get(args.subparser_name, {}) # Get the specs that match the query from the DB specs = args.specs(**query_args) try: - callbacks[args.subparser_name](module_type, specs, args) except MultipleSpecsMatch: diff --git a/lib/spack/spack/cmd/solve.py b/lib/spack/spack/cmd/solve.py index 69caeb421f..3752c16f41 100644 --- a/lib/spack/spack/cmd/solve.py +++ b/lib/spack/spack/cmd/solve.py @@ -182,11 +182,7 @@ def solve(parser, args): # set up solver parameters # Note: reuse and other concretizer prefs are passed as configuration result = solver.solve( - specs, - out=output, - timers=args.timers, - stats=args.stats, - setup_only=setup_only, + specs, out=output, timers=args.timers, stats=args.stats, setup_only=setup_only ) if not setup_only: _process_result(result, show, required_format, kwargs) diff --git a/lib/spack/spack/cmd/spec.py b/lib/spack/spack/cmd/spec.py index 9ff19dcff8..b31c7a93b7 100644 --- a/lib/spack/spack/cmd/spec.py +++ b/lib/spack/spack/cmd/spec.py @@ -110,7 +110,7 @@ def spec(parser, args): else: tty.die("spack spec requires at least one spec or an active environment") - for (input, output) in specs: + for input, output in specs: # With -y, just print YAML to output. if args.format: if args.format == "yaml": diff --git a/lib/spack/spack/cmd/style.py b/lib/spack/spack/cmd/style.py index ff9e5af6b5..a75171379f 100644 --- a/lib/spack/spack/cmd/style.py +++ b/lib/spack/spack/cmd/style.py @@ -30,20 +30,13 @@ def grouper(iterable, n, fillvalue=None): #: List of directories to exclude from checks -- relative to spack root -exclude_directories = [ - os.path.relpath(spack.paths.external_path, spack.paths.prefix), -] +exclude_directories = [os.path.relpath(spack.paths.external_path, spack.paths.prefix)] #: Order in which tools should be run. flake8 is last so that it can #: double-check the results of other tools (if, e.g., --fix was provided) #: The list maps an executable name to a method to ensure the tool is #: bootstrapped or present in the environment. -tool_names = [ - "isort", - "black", - "flake8", - "mypy", -] +tool_names = ["isort", "black", "flake8", "mypy"] #: tools we run in spack style tools = {} @@ -52,7 +45,7 @@ def grouper(iterable, n, fillvalue=None): mypy_ignores = [ # same as `disable_error_code = "annotation-unchecked"` in pyproject.toml, which # doesn't exist in mypy 0.971 for Python 3.6 - "[annotation-unchecked]", + "[annotation-unchecked]" ] @@ -150,10 +143,7 @@ def setup_parser(subparser): help="branch to compare against to determine changed files (default: develop)", ) subparser.add_argument( - "-a", - "--all", - action="store_true", - help="check all files, not just changed files", + "-a", "--all", action="store_true", help="check all files, not just changed files" ) subparser.add_argument( "-r", @@ -178,10 +168,7 @@ def setup_parser(subparser): help="format automatically if possible (e.g., with isort, black)", ) subparser.add_argument( - "--root", - action="store", - default=None, - help="style check a different spack instance", + "--root", action="store", default=None, help="style check a different spack instance" ) tool_group = subparser.add_mutually_exclusive_group() @@ -211,6 +198,7 @@ def rewrite_and_print_output( output, args, re_obj=re.compile(r"^(.+):([0-9]+):"), replacement=r"{0}:{1}:" ): """rewrite ouput with :: format to respect path args""" + # print results relative to current working directory def translate(match): return replacement.format(cwd_relative(match.group(1), args), *list(match.groups()[1:])) @@ -281,24 +269,10 @@ def run_mypy(mypy_cmd, file_list, args): os.path.join(spack.paths.prefix, "pyproject.toml"), "--show-error-codes", ] - mypy_arg_sets = [ - common_mypy_args - + [ - "--package", - "spack", - "--package", - "llnl", - ] - ] + mypy_arg_sets = [common_mypy_args + ["--package", "spack", "--package", "llnl"]] if "SPACK_MYPY_CHECK_PACKAGES" in os.environ: mypy_arg_sets.append( - common_mypy_args - + [ - "--package", - "packages", - "--disable-error-code", - "no-redef", - ] + common_mypy_args + ["--package", "packages", "--disable-error-code", "no-redef"] ) returncode = 0 diff --git a/lib/spack/spack/cmd/test.py b/lib/spack/spack/cmd/test.py index 7c917207c4..0baab069eb 100644 --- a/lib/spack/spack/cmd/test.py +++ b/lib/spack/spack/cmd/test.py @@ -33,9 +33,7 @@ def setup_parser(subparser): # Run run_parser = sp.add_parser( - "run", - description=test_run.__doc__, - help=spack.cmd.first_line(test_run.__doc__), + "run", description=test_run.__doc__, help=spack.cmd.first_line(test_run.__doc__) ) alias_help_msg = "Provide an alias for this test-suite" @@ -80,9 +78,7 @@ def setup_parser(subparser): # List list_parser = sp.add_parser( - "list", - description=test_list.__doc__, - help=spack.cmd.first_line(test_list.__doc__), + "list", description=test_list.__doc__, help=spack.cmd.first_line(test_list.__doc__) ) list_parser.add_argument( "-a", @@ -96,9 +92,7 @@ def setup_parser(subparser): # Find find_parser = sp.add_parser( - "find", - description=test_find.__doc__, - help=spack.cmd.first_line(test_find.__doc__), + "find", description=test_find.__doc__, help=spack.cmd.first_line(test_find.__doc__) ) find_parser.add_argument( "filter", @@ -108,9 +102,7 @@ def setup_parser(subparser): # Status status_parser = sp.add_parser( - "status", - description=test_status.__doc__, - help=spack.cmd.first_line(test_status.__doc__), + "status", description=test_status.__doc__, help=spack.cmd.first_line(test_status.__doc__) ) status_parser.add_argument( "names", nargs=argparse.REMAINDER, help="Test suites for which to print status" @@ -147,9 +139,7 @@ def setup_parser(subparser): # Remove remove_parser = sp.add_parser( - "remove", - description=test_remove.__doc__, - help=spack.cmd.first_line(test_remove.__doc__), + "remove", description=test_remove.__doc__, help=spack.cmd.first_line(test_remove.__doc__) ) arguments.add_common_arguments(remove_parser, ["yes_to_all"]) remove_parser.add_argument( @@ -189,11 +179,7 @@ def test_run(args): specs = spack.cmd.parse_specs(args.specs) if args.specs else [None] specs_to_test = [] for spec in specs: - matching = spack.store.db.query_local( - spec, - hashes=hashes, - explicit=explicit, - ) + matching = spack.store.db.query_local(spec, hashes=hashes, explicit=explicit) if spec and not matching: tty.warn("No {0}installed packages match spec {1}".format(explicit_str, spec)) """ diff --git a/lib/spack/spack/cmd/uninstall.py b/lib/spack/spack/cmd/uninstall.py index 869ab88f62..888ba15f56 100644 --- a/lib/spack/spack/cmd/uninstall.py +++ b/lib/spack/spack/cmd/uninstall.py @@ -31,12 +31,7 @@ """ # Arguments for display_specs when we find ambiguity -display_args = { - "long": True, - "show_flags": False, - "variants": False, - "indent": 4, -} +display_args = {"long": True, "show_flags": False, "variants": False, "indent": 4} def setup_parser(subparser): @@ -236,12 +231,7 @@ def do_uninstall(specs, force=False): hashes_to_remove = set(s.dag_hash() for s in specs) for s in traverse.traverse_nodes( - specs, - order="topo", - direction="children", - root=True, - cover="nodes", - deptype="all", + specs, order="topo", direction="children", root=True, cover="nodes", deptype="all" ): if s.dag_hash() in hashes_to_remove: spack.package_base.PackageBase.uninstall_by_spec(s, force=force) diff --git a/lib/spack/spack/cmd/unload.py b/lib/spack/spack/cmd/unload.py index 1867ff64e7..9b076ffd66 100644 --- a/lib/spack/spack/cmd/unload.py +++ b/lib/spack/spack/cmd/unload.py @@ -77,8 +77,7 @@ def unload(parser, args): specs_str = " ".join(args.specs) or "SPECS" spack.cmd.common.shell_init_instructions( - "spack unload", - " eval `spack unload {sh_arg}` %s" % specs_str, + "spack unload", " eval `spack unload {sh_arg}` %s" % specs_str ) return 1 diff --git a/lib/spack/spack/cmd/url.py b/lib/spack/spack/cmd/url.py index d93d2cc458..86ffde231d 100644 --- a/lib/spack/spack/cmd/url.py +++ b/lib/spack/spack/cmd/url.py @@ -106,12 +106,7 @@ def setup_parser(subparser): def url(parser, args): - action = { - "parse": url_parse, - "list": url_list, - "summary": url_summary, - "stats": url_stats, - } + action = {"parse": url_parse, "list": url_list, "summary": url_summary, "stats": url_stats} action[args.subcommand](args) diff --git a/lib/spack/spack/compilers/__init__.py b/lib/spack/spack/compilers/__init__.py index 4b304096b1..9b48ee847c 100644 --- a/lib/spack/spack/compilers/__init__.py +++ b/lib/spack/spack/compilers/__init__.py @@ -619,11 +619,9 @@ def _default(search_paths): command_arguments = [] files_to_be_tested = fs.files_in(*search_paths) for compiler_name in spack.compilers.supported_compilers(): - compiler_cls = class_for_compiler_name(compiler_name) for language in ("cc", "cxx", "f77", "fc"): - # Select only the files matching a regexp for (file, full_path), regexp in itertools.product( files_to_be_tested, compiler_cls.search_regexps(language) diff --git a/lib/spack/spack/compilers/apple_clang.py b/lib/spack/spack/compilers/apple_clang.py index 57e7d01519..e4bef2c4bb 100644 --- a/lib/spack/spack/compilers/apple_clang.py +++ b/lib/spack/spack/compilers/apple_clang.py @@ -154,10 +154,7 @@ def setup_custom_environment(self, pkg, env): ), ) - real_dirs = [ - "Toolchains/XcodeDefault.xctoolchain/usr/bin", - "usr/bin", - ] + real_dirs = ["Toolchains/XcodeDefault.xctoolchain/usr/bin", "usr/bin"] bins = ["c++", "c89", "c99", "cc", "clang", "clang++", "cpp"] diff --git a/lib/spack/spack/config.py b/lib/spack/spack/config.py index 07a6275a12..1cb060a8b5 100644 --- a/lib/spack/spack/config.py +++ b/lib/spack/spack/config.py @@ -793,7 +793,7 @@ def _config(): configuration_paths = [ # Default configuration scope is the lowest-level scope. These are # versioned with Spack and can be overridden by systems, sites or users - configuration_defaults_path, + configuration_defaults_path ] disable_local_config = "SPACK_DISABLE_LOCAL_CONFIG" in os.environ @@ -801,15 +801,11 @@ def _config(): # System configuration is per machine. # This is disabled if user asks for no local configuration. if not disable_local_config: - configuration_paths.append( - ("system", spack.paths.system_config_path), - ) + configuration_paths.append(("system", spack.paths.system_config_path)) # Site configuration is per spack instance, for sites or projects # No site-level configs should be checked into spack by default. - configuration_paths.append( - ("site", os.path.join(spack.paths.etc_path)), - ) + configuration_paths.append(("site", os.path.join(spack.paths.etc_path))) # User configuration can override both spack defaults and site config # This is disabled if user asks for no local configuration. diff --git a/lib/spack/spack/cray_manifest.py b/lib/spack/spack/cray_manifest.py index c2908f61be..6f686aaf57 100644 --- a/lib/spack/spack/cray_manifest.py +++ b/lib/spack/spack/cray_manifest.py @@ -18,10 +18,7 @@ #: packages here. default_path = "/opt/cray/pe/cpe-descriptive-manifest/" -compiler_name_translation = { - "nvidia": "nvhpc", - "rocm": "rocmcc", -} +compiler_name_translation = {"nvidia": "nvhpc", "rocm": "rocmcc"} def translated_compiler_name(manifest_compiler_name): diff --git a/lib/spack/spack/database.py b/lib/spack/spack/database.py index 0607c6312a..2e012a67d5 100644 --- a/lib/spack/spack/database.py +++ b/lib/spack/spack/database.py @@ -46,10 +46,7 @@ import spack.store import spack.util.lock as lk import spack.util.spack_json as sjson -from spack.directory_layout import ( - DirectoryLayoutError, - InconsistentInstallDirectoryError, -) +from spack.directory_layout import DirectoryLayoutError, InconsistentInstallDirectoryError from spack.error import SpackError from spack.util.crypto import bit_length from spack.version import Version @@ -108,10 +105,7 @@ def reader(version): - reader_cls = { - Version("5"): spack.spec.SpecfileV1, - Version("6"): spack.spec.SpecfileV3, - } + reader_cls = {Version("5"): spack.spec.SpecfileV1, Version("6"): spack.spec.SpecfileV3} return reader_cls[version] diff --git a/lib/spack/spack/detection/common.py b/lib/spack/spack/detection/common.py index e809f5f5ec..7e1e5e6a41 100644 --- a/lib/spack/spack/detection/common.py +++ b/lib/spack/spack/detection/common.py @@ -377,7 +377,8 @@ def compute_windows_user_path_for_package(pkg): install location, return list of potential locations based on common heuristics. For more info on Windows user specific installs see: - https://learn.microsoft.com/en-us/dotnet/api/system.environment.specialfolder?view=netframework-4.8""" + https://learn.microsoft.com/en-us/dotnet/api/system.environment.specialfolder?view=netframework-4.8 + """ if not is_windows: return [] diff --git a/lib/spack/spack/environment/environment.py b/lib/spack/spack/environment/environment.py index c008cc5c7e..a46b8f9835 100644 --- a/lib/spack/spack/environment/environment.py +++ b/lib/spack/spack/environment/environment.py @@ -45,11 +45,7 @@ import spack.util.spack_json as sjson import spack.util.spack_yaml as syaml import spack.util.url -from spack.filesystem_view import ( - SimpleFilesystemView, - inverse_view_func_parser, - view_func_parser, -) +from spack.filesystem_view import SimpleFilesystemView, inverse_view_func_parser, view_func_parser from spack.installer import PackageInstaller from spack.spec import Spec from spack.spec_list import InvalidSpecConstraintError, SpecList @@ -304,12 +300,7 @@ def _write_yaml(data, str_or_file): def _eval_conditional(string): """Evaluate conditional definitions using restricted variable scope.""" valid_variables = spack.util.environment.get_host_environment() - valid_variables.update( - { - "re": re, - "env": os.environ, - } - ) + valid_variables.update({"re": re, "env": os.environ}) return eval(string, valid_variables) @@ -973,9 +964,7 @@ def included_config_scopes(self): config_path = os.path.join(config_path, basename) else: staged_path = spack.config.fetch_remote_configs( - config_path, - self.config_stage_dir, - skip_existing=True, + config_path, self.config_stage_dir, skip_existing=True ) if not staged_path: raise SpackEnvironmentError( diff --git a/lib/spack/spack/fetch_strategy.py b/lib/spack/spack/fetch_strategy.py index 720a28b9bd..19ad454ec5 100644 --- a/lib/spack/spack/fetch_strategy.py +++ b/lib/spack/spack/fetch_strategy.py @@ -35,13 +35,7 @@ import llnl.util import llnl.util.filesystem as fs import llnl.util.tty as tty -from llnl.util.filesystem import ( - get_single_file, - mkdirp, - temp_cwd, - temp_rename, - working_dir, -) +from llnl.util.filesystem import get_single_file, mkdirp, temp_cwd, temp_rename, working_dir from llnl.util.symlink import symlink import spack.config @@ -1555,11 +1549,7 @@ def for_package_version(pkg, version): # performance hit for branches on older versions of git. # Branches cannot be cached, so we tell the fetcher not to cache tags/branches ref_type = "commit" if version.is_commit else "tag" - kwargs = { - "git": pkg.git, - ref_type: version.ref, - "no_cache": True, - } + kwargs = {"git": pkg.git, ref_type: version.ref, "no_cache": True} kwargs["submodules"] = getattr(pkg, "submodules", False) diff --git a/lib/spack/spack/hooks/absolutify_elf_sonames.py b/lib/spack/spack/hooks/absolutify_elf_sonames.py index 149708f9a3..91377706e3 100644 --- a/lib/spack/spack/hooks/absolutify_elf_sonames.py +++ b/lib/spack/spack/hooks/absolutify_elf_sonames.py @@ -37,7 +37,6 @@ class SharedLibrariesVisitor(BaseDirectoryVisitor): exception of an exclude list.""" def __init__(self, exclude_list): - # List of file and directory names to be excluded self.exclude_list = frozenset(exclude_list) diff --git a/lib/spack/spack/hooks/sbang.py b/lib/spack/spack/hooks/sbang.py index fcea77d829..e62d2bfa40 100644 --- a/lib/spack/spack/hooks/sbang.py +++ b/lib/spack/spack/hooks/sbang.py @@ -212,8 +212,7 @@ def install_sbang(): # copy over the fresh copy of `sbang` sbang_tmp_path = os.path.join( - os.path.dirname(sbang_path), - ".%s.tmp" % os.path.basename(sbang_path), + os.path.dirname(sbang_path), ".%s.tmp" % os.path.basename(sbang_path) ) shutil.copy(spack.paths.sbang_script, sbang_tmp_path) diff --git a/lib/spack/spack/installer.py b/lib/spack/spack/installer.py index 1b9800054d..7bbe8b2dd2 100644 --- a/lib/spack/spack/installer.py +++ b/lib/spack/spack/installer.py @@ -423,11 +423,7 @@ def _try_install_from_binary_cache(pkg, explicit, unsigned=False, timer=timer.NU matches = binary_distribution.get_mirrors_for_spec(pkg.spec, index_only=True) return _process_binary_cache_tarball( - pkg, - explicit, - unsigned, - mirrors_for_spec=matches, - timer=timer, + pkg, explicit, unsigned, mirrors_for_spec=matches, timer=timer ) @@ -789,7 +785,7 @@ def _add_bootstrap_compilers(self, compiler, architecture, pkgs, request, all_de associated dependents """ packages = _packages_needed_to_bootstrap_compiler(compiler, architecture, pkgs) - for (comp_pkg, is_compiler) in packages: + for comp_pkg, is_compiler in packages: pkgid = package_id(comp_pkg) if pkgid not in self.build_tasks: self._add_init_task(comp_pkg, request, is_compiler, all_deps) @@ -813,8 +809,7 @@ def _modify_existing_task(self, pkgid, attr, value): key, task = tup if task.pkg_id == pkgid: tty.debug( - "Modifying task for {0} to treat it as a compiler".format(pkgid), - level=2, + "Modifying task for {0} to treat it as a compiler".format(pkgid), level=2 ) setattr(task, attr, value) self.build_pq[i] = (key, task) @@ -1212,7 +1207,6 @@ def _add_tasks(self, request, all_deps): install_package = request.install_args.get("install_package") if install_package and request.pkg_id not in self.build_tasks: - # Be sure to clear any previous failure spack.store.db.clear_failure(request.spec, force=True) @@ -1948,11 +1942,7 @@ def run(self): # Run post install hooks before build stage is removed. spack.hooks.post_install(self.pkg.spec) - _print_timer( - pre=self.pre, - pkg_id=self.pkg_id, - timer=self.timer, - ) + _print_timer(pre=self.pre, pkg_id=self.pkg_id, timer=self.timer) _print_installed_pkg(self.pkg.prefix) # Send final status that install is successful diff --git a/lib/spack/spack/modules/common.py b/lib/spack/spack/modules/common.py index 6d0d4bf62f..53779fc878 100644 --- a/lib/spack/spack/modules/common.py +++ b/lib/spack/spack/modules/common.py @@ -249,10 +249,7 @@ def root_path(name, module_set_name): Returns: root folder for module file installation """ - defaults = { - "lmod": "$spack/share/spack/lmod", - "tcl": "$spack/share/spack/modules", - } + defaults = {"lmod": "$spack/share/spack/lmod", "tcl": "$spack/share/spack/modules"} # Root folders where the various module files should be written roots = spack.config.get("modules:%s:roots" % module_set_name, {}) diff --git a/lib/spack/spack/package_base.py b/lib/spack/spack/package_base.py index 7c6a2d301b..fd108911a3 100644 --- a/lib/spack/spack/package_base.py +++ b/lib/spack/spack/package_base.py @@ -65,9 +65,7 @@ from spack.version import GitVersion, Version, VersionBase FLAG_HANDLER_RETURN_TYPE = Tuple[ - Optional[Iterable[str]], - Optional[Iterable[str]], - Optional[Iterable[str]], + Optional[Iterable[str]], Optional[Iterable[str]], Optional[Iterable[str]] ] FLAG_HANDLER_TYPE = Callable[[str, Iterable[str]], FLAG_HANDLER_RETURN_TYPE] @@ -1705,11 +1703,7 @@ def _has_make_target(self, target): "don't know how to make {0}. Stop", ] - kwargs = { - "fail_on_error": False, - "output": os.devnull, - "error": str, - } + kwargs = {"fail_on_error": False, "output": os.devnull, "error": str} stderr = make("-n", target, **kwargs) @@ -2220,10 +2214,7 @@ def uninstall_by_spec(spec, force=False, deprecator=None): if not force: dependents = spack.store.db.installed_relatives( - spec, - direction="parents", - transitive=True, - deptype=("link", "run"), + spec, direction="parents", transitive=True, deptype=("link", "run") ) if dependents: raise PackageStillNeededError(spec, dependents) @@ -2236,7 +2227,6 @@ def uninstall_by_spec(spec, force=False, deprecator=None): # Pre-uninstall hook runs first. with spack.store.db.prefix_write_lock(spec): - if pkg is not None: try: spack.hooks.pre_uninstall(spec) @@ -2399,11 +2389,7 @@ def fetch_remote_versions(self, concurrency=128): try: return spack.util.web.find_versions_of_archive( - self.all_urls, - self.list_url, - self.list_depth, - concurrency, - reference_package=self, + self.all_urls, self.list_url, self.list_depth, concurrency, reference_package=self ) except spack.util.web.NoNetworkConnectionError as e: tty.die("Package.fetch_versions couldn't connect to:", e.url, e.message) diff --git a/lib/spack/spack/relocate.py b/lib/spack/spack/relocate.py index fd0a2d8cc1..2303bf22a2 100644 --- a/lib/spack/spack/relocate.py +++ b/lib/spack/spack/relocate.py @@ -409,13 +409,7 @@ def needs_text_relocation(m_type, m_subtype): def relocate_macho_binaries( - path_names, - old_layout_root, - new_layout_root, - prefix_to_prefix, - rel, - old_prefix, - new_prefix, + path_names, old_layout_root, new_layout_root, prefix_to_prefix, rel, old_prefix, new_prefix ): """ Use macholib python package to get the rpaths, depedent libraries @@ -829,7 +823,7 @@ def fixup_macos_rpath(root, filename): # Check for nonexistent rpaths (often added by spack linker overzealousness # with both lib/ and lib64/) and duplicate rpaths - for (rpath, count) in rpaths.items(): + for rpath, count in rpaths.items(): if rpath.startswith("@loader_path") or rpath.startswith("@executable_path"): # Allowable relative paths pass diff --git a/lib/spack/spack/repo.py b/lib/spack/spack/repo.py index 737467b9fd..b9c3a39a20 100644 --- a/lib/spack/spack/repo.py +++ b/lib/spack/spack/repo.py @@ -1066,7 +1066,6 @@ def dump_provenance(self, spec, path): # Install patch files needed by the package. fs.mkdirp(path) for patch in itertools.chain.from_iterable(spec.package.patches.values()): - if patch.path: if os.path.exists(patch.path): fs.install(patch.path, path) diff --git a/lib/spack/spack/report.py b/lib/spack/spack/report.py index 1ecbf0d938..00fe7eb5cf 100644 --- a/lib/spack/spack/report.py +++ b/lib/spack/spack/report.py @@ -113,7 +113,6 @@ def wrapper(instance, *args, **kwargs): start_time = time.time() try: - value = wrapped_fn(instance, *args, **kwargs) package["stdout"] = self.fetch_log(pkg) package["installed_from_binary_cache"] = pkg.installed_from_binary_cache @@ -234,9 +233,7 @@ def extract_package_from_signature(self, instance, *args, **kwargs): @contextlib.contextmanager def build_context_manager( - reporter: spack.reporters.Reporter, - filename: str, - specs: List[spack.spec.Spec], + reporter: spack.reporters.Reporter, filename: str, specs: List[spack.spec.Spec] ): """Decorate a package to generate a report after the installation function is executed. diff --git a/lib/spack/spack/reporters/cdash.py b/lib/spack/spack/reporters/cdash.py index dc0e194903..582d6cd4df 100644 --- a/lib/spack/spack/reporters/cdash.py +++ b/lib/spack/spack/reporters/cdash.py @@ -47,8 +47,7 @@ CDashConfiguration = collections.namedtuple( - "CDashConfiguration", - ["upload_url", "packages", "build", "site", "buildstamp", "track"], + "CDashConfiguration", ["upload_url", "packages", "build", "site", "buildstamp", "track"] ) @@ -336,12 +335,7 @@ def test_skipped_report(self, directory_name, spec, reason=None): if reason: output += "\n{0}".format(reason) - package = { - "name": spec.name, - "id": spec.dag_hash(), - "result": "skipped", - "stdout": output, - } + package = {"name": spec.name, "id": spec.dag_hash(), "result": "skipped", "stdout": output} self.test_report_for_package(directory_name, package, duration=0.0) def concretization_report(self, directory_name, msg): diff --git a/lib/spack/spack/reporters/extract.py b/lib/spack/spack/reporters/extract.py index 9b14d545c6..e31f8d951a 100644 --- a/lib/spack/spack/reporters/extract.py +++ b/lib/spack/spack/reporters/extract.py @@ -10,11 +10,7 @@ import llnl.util.tty as tty # The keys here represent the only recognized (ctest/cdash) status values -completed = { - "failed": "Completed", - "passed": "Completed", - "notrun": "No tests to run", -} +completed = {"failed": "Completed", "passed": "Completed", "notrun": "No tests to run"} log_regexp = re.compile(r"^==> \[([0-9:.\-]*)(?:, [0-9]*)?\] (.*)") returns_regexp = re.compile(r"\[([0-9 ,]*)\]") diff --git a/lib/spack/spack/schema/buildcache_spec.py b/lib/spack/spack/schema/buildcache_spec.py index 4ebb31e132..eeeb6dc085 100644 --- a/lib/spack/spack/schema/buildcache_spec.py +++ b/lib/spack/spack/schema/buildcache_spec.py @@ -32,10 +32,7 @@ }, "binary_cache_checksum": { "type": "object", - "properties": { - "hash_algorithm": {"type": "string"}, - "hash": {"type": "string"}, - }, + "properties": {"hash_algorithm": {"type": "string"}, "hash": {"type": "string"}}, }, "buildcache_layout_version": {"type": "number"}, }, diff --git a/lib/spack/spack/schema/cdash.py b/lib/spack/spack/schema/cdash.py index d4d462596b..5634031b74 100644 --- a/lib/spack/spack/schema/cdash.py +++ b/lib/spack/spack/schema/cdash.py @@ -22,7 +22,7 @@ r"project": {"type": "string"}, r"site": {"type": "string"}, }, - }, + } } diff --git a/lib/spack/spack/schema/config.py b/lib/spack/spack/schema/config.py index 125279e7a9..7ecd1ad627 100644 --- a/lib/spack/spack/schema/config.py +++ b/lib/spack/spack/schema/config.py @@ -21,7 +21,7 @@ "flags": { "type": "object", "properties": { - "keep_werror": {"type": "string", "enum": ["all", "specific", "none"]}, + "keep_werror": {"type": "string", "enum": ["all", "specific", "none"]} }, }, "shared_linking": { @@ -54,12 +54,12 @@ ), }, {"type": "string"}, # deprecated - ], + ] }, "install_hash_length": {"type": "integer", "minimum": 1}, "install_path_scheme": {"type": "string"}, # deprecated "build_stage": { - "oneOf": [{"type": "string"}, {"type": "array", "items": {"type": "string"}}], + "oneOf": [{"type": "string"}, {"type": "array", "items": {"type": "string"}}] }, "test_stage": {"type": "string"}, "extensions": {"type": "array", "items": {"type": "string"}}, @@ -82,7 +82,7 @@ "concretizer": {"type": "string", "enum": ["original", "clingo"]}, "db_lock_timeout": {"type": "integer", "minimum": 1}, "package_lock_timeout": { - "anyOf": [{"type": "integer", "minimum": 1}, {"type": "null"}], + "anyOf": [{"type": "integer", "minimum": 1}, {"type": "null"}] }, "allow_sgid": {"type": "boolean"}, "binary_index_root": {"type": "string"}, @@ -96,7 +96,7 @@ "modules:[module set]:roots and is ignored", "error": False, }, - }, + } } diff --git a/lib/spack/spack/schema/container.py b/lib/spack/spack/schema/container.py index 92e6953c0e..21d8bba8ef 100644 --- a/lib/spack/spack/schema/container.py +++ b/lib/spack/spack/schema/container.py @@ -62,9 +62,7 @@ "additionalProperties": False, }, # Add labels to the image - "labels": { - "type": "object", - }, + "labels": {"type": "object"}, # Add a custom extra section at the bottom of a stage "extra_instructions": { "type": "object", @@ -83,11 +81,7 @@ "help": {"type": "string"}, }, }, - "docker": { - "type": "object", - "additionalProperties": False, - "default": {}, - }, + "docker": {"type": "object", "additionalProperties": False, "default": {}}, }, } diff --git a/lib/spack/spack/schema/cray_manifest.py b/lib/spack/spack/schema/cray_manifest.py index 42b55cb144..39529fc48f 100644 --- a/lib/spack/spack/schema/cray_manifest.py +++ b/lib/spack/spack/schema/cray_manifest.py @@ -114,9 +114,7 @@ "prefix": {"type": "string", "minLength": 1}, "rpm": {"type": "string", "minLength": 1}, "hash": {"type": "string", "minLength": 1}, - "parameters": { - "type": "object", - }, + "parameters": {"type": "object"}, }, }, }, diff --git a/lib/spack/spack/schema/database_index.py b/lib/spack/spack/schema/database_index.py index 1a28b73646..021146f92a 100644 --- a/lib/spack/spack/schema/database_index.py +++ b/lib/spack/spack/schema/database_index.py @@ -32,27 +32,17 @@ "type": "object", "properties": { "spec": spack.schema.spec.properties, - "path": { - "oneOf": [ - {"type": "string"}, - {"type": "null"}, - ], - }, + "path": {"oneOf": [{"type": "string"}, {"type": "null"}]}, "installed": {"type": "boolean"}, - "ref_count": { - "type": "integer", - "minimum": 0, - }, + "ref_count": {"type": "integer", "minimum": 0}, "explicit": {"type": "boolean"}, - "installation_time": { - "type": "number", - }, + "installation_time": {"type": "number"}, }, - }, + } }, }, "version": {"type": "string"}, }, - }, + } }, } diff --git a/lib/spack/spack/schema/env.py b/lib/spack/spack/schema/env.py index a96fe2dbc3..88c1ef1c85 100644 --- a/lib/spack/spack/schema/env.py +++ b/lib/spack/spack/schema/env.py @@ -28,12 +28,7 @@ "properties": { "matrix": { "type": "array", - "items": { - "type": "array", - "items": { - "type": "string", - }, - }, + "items": {"type": "array", "items": {"type": "string"}}, }, "exclude": {"type": "array", "items": {"type": "string"}}, }, @@ -61,11 +56,7 @@ spack.schema.merged.properties, # extra environment schema properties { - "include": { - "type": "array", - "default": [], - "items": {"type": "string"}, - }, + "include": {"type": "array", "default": [], "items": {"type": "string"}}, "develop": { "type": "object", "default": {}, @@ -78,7 +69,7 @@ "spec": {"type": "string"}, "path": {"type": "string"}, }, - }, + } }, }, "definitions": { diff --git a/lib/spack/spack/schema/gitlab_ci.py b/lib/spack/spack/schema/gitlab_ci.py index dd46819a46..2f2e51c831 100644 --- a/lib/spack/spack/schema/gitlab_ci.py +++ b/lib/spack/spack/schema/gitlab_ci.py @@ -18,28 +18,16 @@ "type": "object", "properties": { "name": {"type": "string"}, - "entrypoint": { - "type": "array", - "items": { - "type": "string", - }, - }, + "entrypoint": {"type": "array", "items": {"type": "string"}}, }, }, - ], + ] } runner_attributes_schema_items = { "image": image_schema, "tags": {"type": "array", "items": {"type": "string"}}, - "variables": { - "type": "object", - "patternProperties": { - r"[\w\d\-_\.]+": { - "type": "string", - }, - }, - }, + "variables": {"type": "object", "patternProperties": {r"[\w\d\-_\.]+": {"type": "string"}}}, "before_script": {"type": "array", "items": {"type": "string"}}, "script": {"type": "array", "items": {"type": "string"}}, "after_script": {"type": "array", "items": {"type": "string"}}, @@ -56,9 +44,7 @@ "type": "object", "additionalProperties": False, "required": ["tags"], - "properties": { - "tags": {"type": "array", "items": {"type": "string"}}, - }, + "properties": {"tags": {"type": "array", "items": {"type": "string"}}}, } @@ -69,24 +55,17 @@ "type": "array", "items": { "anyOf": [ - { - "type": "string", - }, + {"type": "string"}, { "type": "object", "additionalProperties": False, "required": ["name"], "properties": { - "name": { - "type": "string", - }, - "compiler-agnostic": { - "type": "boolean", - "default": False, - }, + "name": {"type": "string"}, + "compiler-agnostic": {"type": "boolean", "default": False}, }, }, - ], + ] }, }, "match_behavior": {"type": "string", "enum": ["first", "merge"], "default": "first"}, @@ -97,12 +76,7 @@ "additionalProperties": False, "required": ["match"], "properties": { - "match": { - "type": "array", - "items": { - "type": "string", - }, - }, + "match": {"type": "array", "items": {"type": "string"}}, "remove-attributes": remove_attributes_schema, "runner-attributes": runner_selector_schema, }, @@ -112,12 +86,7 @@ "signing-job-attributes": runner_selector_schema, "rebuild-index": {"type": "boolean"}, "broken-specs-url": {"type": "string"}, - "broken-tests-packages": { - "type": "array", - "items": { - "type": "string", - }, - }, + "broken-tests-packages": {"type": "array", "items": {"type": "string"}}, }, ) @@ -128,12 +97,7 @@ "additionalProperties": False, "required": ["mappings"], "properties": union_dicts( - core_shared_properties, - { - "enable-artifacts-buildcache": { - "type": "boolean", - }, - }, + core_shared_properties, {"enable-artifacts-buildcache": {"type": "boolean"}} ), }, { @@ -141,21 +105,14 @@ "additionalProperties": False, "required": ["mappings"], "properties": union_dicts( - core_shared_properties, - { - "temporary-storage-url-prefix": { - "type": "string", - }, - }, + core_shared_properties, {"temporary-storage-url-prefix": {"type": "string"}} ), }, ] } #: Properties for inclusion in other schemas -properties = { - "gitlab-ci": gitlab_ci_properties, -} +properties = {"gitlab-ci": gitlab_ci_properties} #: Full schema with metadata schema = { diff --git a/lib/spack/spack/schema/mirrors.py b/lib/spack/spack/schema/mirrors.py index 70222ca10a..41dbddb051 100644 --- a/lib/spack/spack/schema/mirrors.py +++ b/lib/spack/spack/schema/mirrors.py @@ -27,9 +27,9 @@ }, }, ] - }, + } }, - }, + } } diff --git a/lib/spack/spack/schema/modules.py b/lib/spack/spack/schema/modules.py index 3c0de12b88..975b512c7f 100644 --- a/lib/spack/spack/schema/modules.py +++ b/lib/spack/spack/schema/modules.py @@ -110,10 +110,7 @@ "arch_folder": {"type": "boolean"}, "roots": { "type": "object", - "properties": { - "tcl": {"type": "string"}, - "lmod": {"type": "string"}, - }, + "properties": {"tcl": {"type": "string"}, "lmod": {"type": "string"}}, }, "enable": { "type": "array", @@ -165,7 +162,7 @@ # prefix-relative path to be inspected for existence r"^[\w-]*": array_of_strings }, - }, + } }, "patternProperties": { valid_module_set_name: { @@ -173,7 +170,7 @@ "default": {}, "additionalProperties": False, "properties": module_config_properties, - }, + } }, } } diff --git a/lib/spack/spack/schema/packages.py b/lib/spack/spack/schema/packages.py index e6d624ed55..1f7c16e2d7 100644 --- a/lib/spack/spack/schema/packages.py +++ b/lib/spack/spack/schema/packages.py @@ -61,25 +61,14 @@ "default": [], "items": {"type": "string"}, }, # compiler specs - "buildable": { - "type": "boolean", - "default": True, - }, + "buildable": {"type": "boolean", "default": True}, "permissions": { "type": "object", "additionalProperties": False, "properties": { - "read": { - "type": "string", - "enum": ["user", "group", "world"], - }, - "write": { - "type": "string", - "enum": ["user", "group", "world"], - }, - "group": { - "type": "string", - }, + "read": {"type": "string", "enum": ["user", "group", "world"]}, + "write": {"type": "string", "enum": ["user", "group", "world"]}, + "group": {"type": "string"}, }, }, # If 'get_full_repo' is promoted to a Package-level @@ -87,9 +76,7 @@ "package_attributes": { "type": "object", "additionalProperties": False, - "patternProperties": { - r"\w+": {}, - }, + "patternProperties": {r"\w+": {}}, }, "providers": { "type": "object", @@ -100,14 +87,14 @@ "type": "array", "default": [], "items": {"type": "string"}, - }, + } }, }, "variants": { "oneOf": [ {"type": "string"}, {"type": "array", "items": {"type": "string"}}, - ], + ] }, "externals": { "type": "array", @@ -124,9 +111,9 @@ }, }, }, - }, + } }, - }, + } } diff --git a/lib/spack/spack/schema/projections.py b/lib/spack/spack/schema/projections.py index 6d6623a5e7..a28df1c5b5 100644 --- a/lib/spack/spack/schema/projections.py +++ b/lib/spack/spack/schema/projections.py @@ -12,12 +12,7 @@ #: Properties for inclusion in other schemas properties = { - "projections": { - "type": "object", - "patternProperties": { - r"all|\w[\w-]*": {"type": "string"}, - }, - }, + "projections": {"type": "object", "patternProperties": {r"all|\w[\w-]*": {"type": "string"}}} } diff --git a/lib/spack/spack/schema/repos.py b/lib/spack/spack/schema/repos.py index bec1d5a7f0..e846285ca1 100644 --- a/lib/spack/spack/schema/repos.py +++ b/lib/spack/spack/schema/repos.py @@ -11,13 +11,7 @@ #: Properties for inclusion in other schemas -properties = { - "repos": { - "type": "array", - "default": [], - "items": {"type": "string"}, - }, -} +properties = {"repos": {"type": "array", "default": [], "items": {"type": "string"}}} #: Full schema with metadata diff --git a/lib/spack/spack/schema/spec.py b/lib/spack/spack/schema/spec.py index 54a5d990a3..8d2390b2f3 100644 --- a/lib/spack/spack/schema/spec.py +++ b/lib/spack/spack/schema/spec.py @@ -14,44 +14,26 @@ target = { "oneOf": [ - { - "type": "string", - }, + {"type": "string"}, { "type": "object", "additionalProperties": False, - "required": [ - "name", - "vendor", - "features", - "generation", - "parents", - ], + "required": ["name", "vendor", "features", "generation", "parents"], "properties": { "name": {"type": "string"}, "vendor": {"type": "string"}, - "features": { - "type": "array", - "items": {"type": "string"}, - }, + "features": {"type": "array", "items": {"type": "string"}}, "generation": {"type": "integer"}, - "parents": { - "type": "array", - "items": {"type": "string"}, - }, + "parents": {"type": "array", "items": {"type": "string"}}, }, }, - ], + ] } arch = { "type": "object", "additionalProperties": False, - "properties": { - "platform": {}, - "platform_os": {}, - "target": target, - }, + "properties": {"platform": {}, "platform_os": {}, "target": target}, } dependencies = { @@ -61,12 +43,9 @@ "type": "object", "properties": { "hash": {"type": "string"}, - "type": { - "type": "array", - "items": {"type": "string"}, - }, + "type": {"type": "array", "items": {"type": "string"}}, }, - }, + } }, } @@ -90,13 +69,7 @@ "items": { "type": "object", "additionalProperties": False, - "required": [ - "version", - "arch", - "compiler", - "namespace", - "parameters", - ], + "required": ["version", "arch", "compiler", "namespace", "parameters"], "properties": { "name": {"type": "string"}, "hash": {"type": "string"}, @@ -104,12 +77,7 @@ # these hashes were used on some specs prior to 0.18 "full_hash": {"type": "string"}, "build_hash": {"type": "string"}, - "version": { - "oneOf": [ - {"type": "string"}, - {"type": "number"}, - ], - }, + "version": {"oneOf": [{"type": "string"}, {"type": "number"}]}, "arch": arch, "compiler": { "type": "object", @@ -119,12 +87,7 @@ "version": {"type": "string"}, }, }, - "develop": { - "anyOf": [ - {"type": "boolean"}, - {"type": "string"}, - ], - }, + "develop": {"anyOf": [{"type": "boolean"}, {"type": "string"}]}, "namespace": {"type": "string"}, "parameters": { "type": "object", @@ -138,40 +101,16 @@ ], "additionalProperties": True, "properties": { - "patches": { - "type": "array", - "items": {"type": "string"}, - }, - "cflags": { - "type": "array", - "items": {"type": "string"}, - }, - "cppflags": { - "type": "array", - "items": {"type": "string"}, - }, - "cxxflags": { - "type": "array", - "items": {"type": "string"}, - }, - "fflags": { - "type": "array", - "items": {"type": "string"}, - }, - "ldflags": { - "type": "array", - "items": {"type": "string"}, - }, - "ldlib": { - "type": "array", - "items": {"type": "string"}, - }, + "patches": {"type": "array", "items": {"type": "string"}}, + "cflags": {"type": "array", "items": {"type": "string"}}, + "cppflags": {"type": "array", "items": {"type": "string"}}, + "cxxflags": {"type": "array", "items": {"type": "string"}}, + "fflags": {"type": "array", "items": {"type": "string"}}, + "ldflags": {"type": "array", "items": {"type": "string"}}, + "ldlib": {"type": "array", "items": {"type": "string"}}, }, }, - "patches": { - "type": "array", - "items": {}, - }, + "patches": {"type": "array", "items": {}}, "dependencies": dependencies, "build_spec": build_spec, }, diff --git a/lib/spack/spack/solver/asp.py b/lib/spack/spack/solver/asp.py index 527377127c..673e202afa 100644 --- a/lib/spack/spack/solver/asp.py +++ b/lib/spack/spack/solver/asp.py @@ -112,8 +112,7 @@ def getter(node): #: Enumeration like object to mark version provenance version_provenance = collections.namedtuple( # type: ignore - "VersionProvenance", - version_origin_fields, + "VersionProvenance", version_origin_fields )(**{name: i for i, name in enumerate(version_origin_fields)}) #: Named tuple to contain information on declared versions @@ -1138,8 +1137,7 @@ def pkg_rules(self, pkg, tests): # virtual preferences self.virtual_preferences( - pkg.name, - lambda v, p, i: self.gen.fact(fn.pkg_provider_preference(pkg.name, v, p, i)), + pkg.name, lambda v, p, i: self.gen.fact(fn.pkg_provider_preference(pkg.name, v, p, i)) ) self.package_requirement_rules(pkg) @@ -1248,8 +1246,7 @@ def provider_defaults(self): ) assert self.possible_virtuals is not None, msg self.virtual_preferences( - "all", - lambda v, p, i: self.gen.fact(fn.default_provider_preference(v, p, i)), + "all", lambda v, p, i: self.gen.fact(fn.default_provider_preference(v, p, i)) ) def provider_requirements(self): @@ -1427,12 +1424,7 @@ def spec_clauses(self, *args, **kwargs): return clauses def _spec_clauses( - self, - spec, - body=False, - transitive=True, - expand_hashes=False, - concrete_build_deps=False, + self, spec, body=False, transitive=True, expand_hashes=False, concrete_build_deps=False ): """Return a list of clauses for a spec mandates are true. @@ -2521,15 +2513,7 @@ def _reusable_specs(self): pass return reusable_specs - def solve( - self, - specs, - out=None, - timers=False, - stats=False, - tests=False, - setup_only=False, - ): + def solve(self, specs, out=None, timers=False, stats=False, tests=False, setup_only=False): """ Arguments: specs (list): List of ``Spec`` objects to solve for. @@ -2549,14 +2533,7 @@ def solve( result, _, _ = self.driver.solve(setup, specs, reuse=reusable_specs, output=output) return result - def solve_in_rounds( - self, - specs, - out=None, - timers=False, - stats=False, - tests=False, - ): + def solve_in_rounds(self, specs, out=None, timers=False, stats=False, tests=False): """Solve for a stable model of specs in multiple rounds. This relaxes the assumption of solve that everything must be consistent and diff --git a/lib/spack/spack/spec.py b/lib/spack/spack/spec.py index aaeb15e82e..94e3230285 100644 --- a/lib/spack/spack/spec.py +++ b/lib/spack/spack/spec.py @@ -229,6 +229,7 @@ def __init__(self, spec_or_platform_tuple=(None, None, None)): Otherwise information on platform, OS and target should be passed in either as a spec string or as a tuple. """ + # If the argument to __init__ is a spec string, parse it # and construct an ArchSpec def _string_or_none(s): @@ -731,7 +732,6 @@ def __new__(cls, value, **kwargs): class FlagMap(lang.HashableMap): - __slots__ = ("spec",) def __init__(self, spec): @@ -1221,7 +1221,6 @@ def copy(self, *args, **kwargs): @lang.lazy_lexicographic_ordering(set_hash=False) class Spec(object): - #: Cache for spec's prefix, computed lazily in the corresponding property _prefix = None @@ -1550,12 +1549,7 @@ def _add_dependency(self, spec: "Spec", *, deptypes: dp.DependencyArgument): "Cannot depend on incompatible specs '%s' and '%s'" % (dspec.spec, spec) ) - def add_dependency_edge( - self, - dependency_spec: "Spec", - *, - deptypes: dp.DependencyArgument, - ): + def add_dependency_edge(self, dependency_spec: "Spec", *, deptypes: dp.DependencyArgument): """Add a dependency edge to this spec. Args: @@ -2241,7 +2235,6 @@ def spec_and_dependency_types(s): # Recurse on dependencies for s, s_dependencies in dep_like.items(): - if isinstance(s, str): dag_node, dependency_types = name_and_dependency_types(s) else: @@ -2897,7 +2890,6 @@ def flat_dependencies(self, **kwargs): try: deptree = self.traverse(root=False) for spec in deptree: - if spec.name not in flat_deps: if copy: spec = spec.copy(deps=False) @@ -5245,7 +5237,6 @@ def __init__(self, spec, matches): match_fmt_custom = '{0}. "{1}" conflicts with "{2}" [{3}]\n' for idx, (s, c, w, msg) in enumerate(matches): - if s not in visited: visited.add(s) long_message += "List of matching conflicts for spec:\n\n" diff --git a/lib/spack/spack/test/bindist.py b/lib/spack/spack/test/bindist.py index dc9003d42a..d959258c85 100644 --- a/lib/spack/spack/test/bindist.py +++ b/lib/spack/spack/test/bindist.py @@ -416,11 +416,7 @@ def test_spec_needs_rebuild(monkeypatch, tmpdir): assert rebuild -@pytest.mark.usefixtures( - "install_mockery_mutable_config", - "mock_packages", - "mock_fetch", -) +@pytest.mark.usefixtures("install_mockery_mutable_config", "mock_packages", "mock_fetch") def test_generate_index_missing(monkeypatch, tmpdir, mutable_config): """Ensure spack buildcache index only reports available packages""" diff --git a/lib/spack/spack/test/bootstrap.py b/lib/spack/spack/test/bootstrap.py index f779ff9b72..7eee7a21e3 100644 --- a/lib/spack/spack/test/bootstrap.py +++ b/lib/spack/spack/test/bootstrap.py @@ -67,18 +67,12 @@ def test_raising_exception_if_bootstrap_disabled(mutable_config): def test_raising_exception_module_importable(): - with pytest.raises( - ImportError, - match='cannot bootstrap the "asdf" Python module', - ): + with pytest.raises(ImportError, match='cannot bootstrap the "asdf" Python module'): spack.bootstrap.core.ensure_module_importable_or_raise("asdf") def test_raising_exception_executables_in_path(): - with pytest.raises( - RuntimeError, - match="cannot bootstrap any of the asdf, fdsa executables", - ): + with pytest.raises(RuntimeError, match="cannot bootstrap any of the asdf, fdsa executables"): spack.bootstrap.core.ensure_executables_in_path_or_raise(["asdf", "fdsa"], "python") diff --git a/lib/spack/spack/test/build_distribution.py b/lib/spack/spack/test/build_distribution.py index e9d0723d91..490f539845 100644 --- a/lib/spack/spack/test/build_distribution.py +++ b/lib/spack/spack/test/build_distribution.py @@ -20,7 +20,6 @@ def test_build_tarball_overwrite(install_mockery, mock_fetch, monkeypatch, tmpdir): - with tmpdir.as_cwd(): spec = spack.spec.Spec("trivial-install-test-package").concretized() install(str(spec)) diff --git a/lib/spack/spack/test/build_environment.py b/lib/spack/spack/test/build_environment.py index 8ddeadd384..e0ab530fa8 100644 --- a/lib/spack/spack/test/build_environment.py +++ b/lib/spack/spack/test/build_environment.py @@ -17,11 +17,7 @@ import spack.package_base import spack.spec import spack.util.spack_yaml as syaml -from spack.build_environment import ( - _static_to_shared_library, - determine_number_of_jobs, - dso_suffix, -) +from spack.build_environment import _static_to_shared_library, determine_number_of_jobs, dso_suffix from spack.paths import build_env_path from spack.util.environment import EnvironmentModifications from spack.util.executable import Executable @@ -160,7 +156,6 @@ def test_static_to_shared_library(build_environment): @pytest.mark.regression("8345") @pytest.mark.usefixtures("config", "mock_packages") def test_cc_not_changed_by_modules(monkeypatch, working_env): - s = spack.spec.Spec("cmake") s.concretize() pkg = s.package diff --git a/lib/spack/spack/test/builder.py b/lib/spack/spack/test/builder.py index ff11aec185..40d32c6e79 100644 --- a/lib/spack/spack/test/builder.py +++ b/lib/spack/spack/test/builder.py @@ -63,32 +63,12 @@ def builder_test_repository(): # Generate custom phases using a GenericBuilder ( "custom-phases", - [ - ("CONFIGURE_CALLED", "1"), - ("INSTALL_CALLED", "1"), - ("LAST_PHASE", "INSTALL"), - ], + [("CONFIGURE_CALLED", "1"), ("INSTALL_CALLED", "1"), ("LAST_PHASE", "INSTALL")], ), # Old-style package, with phase defined in base builder - ( - "old-style-autotools@1.0", - [ - ("AFTER_AUTORECONF_1_CALLED", "1"), - ], - ), - ( - "old-style-autotools@2.0", - [ - ("AFTER_AUTORECONF_2_CALLED", "1"), - ], - ), - ( - "old-style-custom-phases", - [ - ("AFTER_CONFIGURE_CALLED", "1"), - ("TEST_VALUE", "0"), - ], - ), + ("old-style-autotools@1.0", [("AFTER_AUTORECONF_1_CALLED", "1")]), + ("old-style-autotools@2.0", [("AFTER_AUTORECONF_2_CALLED", "1")]), + ("old-style-custom-phases", [("AFTER_CONFIGURE_CALLED", "1"), ("TEST_VALUE", "0")]), ], ) @pytest.mark.usefixtures("builder_test_repository", "config") diff --git a/lib/spack/spack/test/cc.py b/lib/spack/spack/test/cc.py index afee60369d..3589eb49f8 100644 --- a/lib/spack/spack/test/cc.py +++ b/lib/spack/spack/test/cc.py @@ -514,7 +514,6 @@ def test_ccld_with_system_dirs(wrapper_environment): SPACK_RPATH_DIRS="xlib:ylib:zlib", SPACK_LINK_DIRS="xlib:ylib:zlib", ): - sys_path_args = [ "-I/usr/include", "-L/usr/local/lib", @@ -551,7 +550,6 @@ def test_ccld_with_system_dirs_isystem(wrapper_environment): SPACK_RPATH_DIRS="xlib:ylib:zlib", SPACK_LINK_DIRS="xlib:ylib:zlib", ): - sys_path_args = [ "-isystem", "/usr/include", @@ -717,15 +715,9 @@ def test_keep_and_replace(wrapper_environment): werror_specific = ["-Werror=meh"] werror = ["-Werror"] werror_all = werror_specific + werror - with set_env( - SPACK_COMPILER_FLAGS_KEEP="", - SPACK_COMPILER_FLAGS_REPLACE="-Werror*|", - ): + with set_env(SPACK_COMPILER_FLAGS_KEEP="", SPACK_COMPILER_FLAGS_REPLACE="-Werror*|"): check_args_contents(cc, test_args + werror_all, ["-Wl,--end-group"], werror_all) - with set_env( - SPACK_COMPILER_FLAGS_KEEP="-Werror=*", - SPACK_COMPILER_FLAGS_REPLACE="-Werror*|", - ): + with set_env(SPACK_COMPILER_FLAGS_KEEP="-Werror=*", SPACK_COMPILER_FLAGS_REPLACE="-Werror*|"): check_args_contents(cc, test_args + werror_all, werror_specific, werror) with set_env( SPACK_COMPILER_FLAGS_KEEP="-Werror=*", diff --git a/lib/spack/spack/test/ci.py b/lib/spack/spack/test/ci.py index 927a283247..7d49c15c8d 100644 --- a/lib/spack/spack/test/ci.py +++ b/lib/spack/spack/test/ci.py @@ -84,7 +84,6 @@ def getcode(self): return self._resp_code def read(self, length=None): - if len(self._content) <= 0: return None @@ -103,11 +102,7 @@ def read(self, length=None): def test_download_and_extract_artifacts(tmpdir, monkeypatch, working_env): - os.environ.update( - { - "GITLAB_PRIVATE_TOKEN": "faketoken", - } - ) + os.environ.update({"GITLAB_PRIVATE_TOKEN": "faketoken"}) url = "https://www.nosuchurlexists.itsfake/artifacts.zip" working_dir = os.path.join(tmpdir.strpath, "repro") @@ -234,24 +229,14 @@ def __call__(self, *args, **kwargs): assert "Unable to merge {0}".format(c1) in err -@pytest.mark.parametrize( - "obj, proto", - [ - ({}, []), - ], -) +@pytest.mark.parametrize("obj, proto", [({}, [])]) def test_ci_opt_argument_checking(obj, proto): """Check that matches() and subkeys() return False when `proto` is not a dict.""" assert not ci_opt.matches(obj, proto) assert not ci_opt.subkeys(obj, proto) -@pytest.mark.parametrize( - "yaml", - [ - {"extends": 1}, - ], -) +@pytest.mark.parametrize("yaml", [{"extends": 1}]) def test_ci_opt_add_extends_non_sequence(yaml): """Check that add_extends() exits if 'extends' is not a sequence.""" yaml_copy = yaml.copy() @@ -263,10 +248,7 @@ def test_ci_workarounds(): fake_root_spec = "x" * 544 fake_spack_ref = "x" * 40 - common_variables = { - "SPACK_COMPILER_ACTION": "NONE", - "SPACK_IS_PR_PIPELINE": "False", - } + common_variables = {"SPACK_COMPILER_ACTION": "NONE", "SPACK_IS_PR_PIPELINE": "False"} common_before_script = [ 'git clone "https://github.com/spack/spack"', @@ -307,7 +289,6 @@ def make_build_job(name, deps, stage, use_artifact_buildcache, optimize, use_dep return {name: result} def make_rebuild_index_job(use_artifact_buildcache, optimize, use_dependencies): - result = { "stage": "stage-rebuild-index", "script": "spack buildcache update-index --mirror-url s3://mirror", diff --git a/lib/spack/spack/test/cmd/audit.py b/lib/spack/spack/test/cmd/audit.py index 43e0870c1c..493cf9ff36 100644 --- a/lib/spack/spack/test/cmd/audit.py +++ b/lib/spack/spack/test/cmd/audit.py @@ -35,7 +35,6 @@ def test_audit_configs(mutable_config, mock_packages): def test_audit_packages_https(mutable_config, mock_packages): - # Without providing --all should fail audit("packages-https", fail_on_error=False) # The mock configuration has duplicate definitions of some compilers diff --git a/lib/spack/spack/test/cmd/build_env.py b/lib/spack/spack/test/cmd/build_env.py index 705c7a8d56..2efc59fb8e 100644 --- a/lib/spack/spack/test/cmd/build_env.py +++ b/lib/spack/spack/test/cmd/build_env.py @@ -23,14 +23,7 @@ def test_error_when_multiple_specs_are_given(): assert "only takes one spec" in output -@pytest.mark.parametrize( - "args", - [ - ("--", "/bin/bash", "-c", "echo test"), - ("--",), - (), - ], -) +@pytest.mark.parametrize("args", [("--", "/bin/bash", "-c", "echo test"), ("--",), ()]) @pytest.mark.usefixtures("config", "mock_packages", "working_env") def test_build_env_requires_a_spec(args): output = build_env(*args, fail_on_error=False) diff --git a/lib/spack/spack/test/cmd/ci.py b/lib/spack/spack/test/cmd/ci.py index f5a3185599..5a05aa1d94 100644 --- a/lib/spack/spack/test/cmd/ci.py +++ b/lib/spack/spack/test/cmd/ci.py @@ -258,12 +258,7 @@ def _validate_needs_graph(yaml_contents, needs_graph, artifacts): def test_ci_generate_bootstrap_gcc( - tmpdir, - working_env, - mutable_mock_env_path, - install_mockery, - mock_packages, - ci_base_environment, + tmpdir, working_env, mutable_mock_env_path, install_mockery, mock_packages, ci_base_environment ): """Test that we can bootstrap a compiler and use it as the compiler for a spec in the environment""" @@ -300,21 +295,10 @@ def test_ci_generate_bootstrap_gcc( needs_graph = { "(bootstrap) conflict": [], - "(bootstrap) gcc": [ - "(bootstrap) conflict", - ], - "(specs) libelf": [ - "(bootstrap) gcc", - ], - "(specs) libdwarf": [ - "(bootstrap) gcc", - "(specs) libelf", - ], - "(specs) dyninst": [ - "(bootstrap) gcc", - "(specs) libelf", - "(specs) libdwarf", - ], + "(bootstrap) gcc": ["(bootstrap) conflict"], + "(specs) libelf": ["(bootstrap) gcc"], + "(specs) libdwarf": ["(bootstrap) gcc", "(specs) libelf"], + "(specs) dyninst": ["(bootstrap) gcc", "(specs) libelf", "(specs) libdwarf"], } with tmpdir.as_cwd(): @@ -331,12 +315,7 @@ def test_ci_generate_bootstrap_gcc( def test_ci_generate_bootstrap_artifacts_buildcache( - tmpdir, - working_env, - mutable_mock_env_path, - install_mockery, - mock_packages, - ci_base_environment, + tmpdir, working_env, mutable_mock_env_path, install_mockery, mock_packages, ci_base_environment ): """Test that we can bootstrap a compiler when artifacts buildcache is turned on""" @@ -373,18 +352,9 @@ def test_ci_generate_bootstrap_artifacts_buildcache( needs_graph = { "(bootstrap) conflict": [], - "(bootstrap) gcc": [ - "(bootstrap) conflict", - ], - "(specs) libelf": [ - "(bootstrap) gcc", - "(bootstrap) conflict", - ], - "(specs) libdwarf": [ - "(bootstrap) gcc", - "(bootstrap) conflict", - "(specs) libelf", - ], + "(bootstrap) gcc": ["(bootstrap) conflict"], + "(specs) libelf": ["(bootstrap) gcc", "(bootstrap) conflict"], + "(specs) libdwarf": ["(bootstrap) gcc", "(bootstrap) conflict", "(specs) libelf"], "(specs) dyninst": [ "(bootstrap) gcc", "(bootstrap) conflict", @@ -447,11 +417,7 @@ def test_ci_generate_with_cdash_token( mock_binary_index, ): """Make sure we it doesn't break if we configure cdash""" - os.environ.update( - { - "SPACK_CDASH_AUTH_TOKEN": "notreallyatokenbutshouldnotmatter", - } - ) + os.environ.update({"SPACK_CDASH_AUTH_TOKEN": "notreallyatokenbutshouldnotmatter"}) filename = str(tmpdir.join("spack.yaml")) with open(filename, "w") as f: f.write( @@ -598,12 +564,7 @@ def test_ci_generate_with_custom_scripts( def test_ci_generate_pkg_with_deps( - tmpdir, - working_env, - mutable_mock_env_path, - install_mockery, - mock_packages, - ci_base_environment, + tmpdir, working_env, mutable_mock_env_path, install_mockery, mock_packages, ci_base_environment ): """Test pipeline generation for a package w/ dependencies""" filename = str(tmpdir.join("spack.yaml")) @@ -670,10 +631,7 @@ def test_ci_generate_for_pr_pipeline( rebuilding the mirror index, even if that job is specifically configured""" os.environ.update( - { - "SPACK_PIPELINE_TYPE": "spack_pull_request", - "SPACK_PR_BRANCH": "fake-test-branch", - } + {"SPACK_PIPELINE_TYPE": "spack_pull_request", "SPACK_PR_BRANCH": "fake-test-branch"} ) filename = str(tmpdir.join("spack.yaml")) with open(filename, "w") as f: @@ -928,7 +886,6 @@ def test_ci_rebuild_mock_success( monkeypatch, broken_tests, ): - pkg_name = "archive-files" rebuild_env = create_rebuild_env(tmpdir, pkg_name, broken_tests) @@ -1129,11 +1086,7 @@ def test_ci_generate_mirror_override( """Ensure that protected pipelines using --buildcache-destination do not skip building specs that are not in the override mirror when they are found in the main mirror.""" - os.environ.update( - { - "SPACK_PIPELINE_TYPE": "spack_protected_branch", - } - ) + os.environ.update({"SPACK_PIPELINE_TYPE": "spack_protected_branch"}) working_dir = tmpdir.join("working_dir") @@ -1727,12 +1680,7 @@ def fake_get_mirrors_for_spec(spec=None, mirrors_to_check=None, index_only=False if spec.name == "gcc": return [] else: - return [ - { - "spec": spec, - "mirror_url": mirror_url, - } - ] + return [{"spec": spec, "mirror_url": mirror_url}] with tmpdir.as_cwd(): env_cmd("create", "test", "./spack.yaml") @@ -1766,12 +1714,7 @@ def fake_get_mirrors_for_spec(spec=None, mirrors_to_check=None, index_only=False # not otherwise need to be rebuilt (thanks to DAG pruning), they # both end up in the generated pipeline because the compiler they # depend on is bootstrapped, and *does* need to be rebuilt. - needs_graph = { - "(bootstrap) gcc": [], - "(specs) b": [ - "(bootstrap) gcc", - ], - } + needs_graph = {"(bootstrap) gcc": [], "(specs) b": ["(bootstrap) gcc"]} _validate_needs_graph(new_yaml_contents, needs_graph, False) @@ -1788,11 +1731,7 @@ def test_ci_generate_prune_untouched( ): """Test pipeline generation with pruning works to eliminate specs that were not affected by a change""" - os.environ.update( - { - "SPACK_PRUNE_UNTOUCHED": "TRUE", # enables pruning of untouched specs - } - ) + os.environ.update({"SPACK_PRUNE_UNTOUCHED": "TRUE"}) # enables pruning of untouched specs mirror_url = "https://my.fake.mirror" filename = str(tmpdir.join("spack.yaml")) with open(filename, "w") as f: @@ -2216,14 +2155,7 @@ def fake_download_and_extract_artifacts(url, work_dir): @pytest.mark.parametrize( - "subcmd", - [ - (""), - ("generate"), - ("rebuild-index"), - ("rebuild"), - ("reproduce-build"), - ], + "subcmd", [(""), ("generate"), ("rebuild-index"), ("rebuild"), ("reproduce-build")] ) def test_ci_help(subcmd, capsys): """Make sure `spack ci` --help describes the (sub)command help.""" diff --git a/lib/spack/spack/test/cmd/clean.py b/lib/spack/spack/test/cmd/clean.py index 43484a680d..51a4e104c2 100644 --- a/lib/spack/spack/test/cmd/clean.py +++ b/lib/spack/spack/test/cmd/clean.py @@ -22,7 +22,6 @@ @pytest.fixture() def mock_calls_for_clean(monkeypatch): - counts = {} class Counter(object): @@ -61,7 +60,6 @@ def __call__(self, *args, **kwargs): ], ) def test_function_calls(command_line, effects, mock_calls_for_clean): - # Call the command with the supplied command line clean(command_line) diff --git a/lib/spack/spack/test/cmd/commands.py b/lib/spack/spack/test/cmd/commands.py index 24f11e84ae..1477aa4859 100644 --- a/lib/spack/spack/test/cmd/commands.py +++ b/lib/spack/spack/test/cmd/commands.py @@ -195,7 +195,7 @@ def test_update_completion_arg(tmpdir, monkeypatch): "format": "bash", "header": str(mock_infile), "update": str(mock_bashfile), - }, + } } # make a mock completion file missing the --update-completion argument diff --git a/lib/spack/spack/test/cmd/compiler.py b/lib/spack/spack/test/cmd/compiler.py index bdb61abf93..796285a184 100644 --- a/lib/spack/spack/test/cmd/compiler.py +++ b/lib/spack/spack/test/cmd/compiler.py @@ -271,10 +271,7 @@ def test_compiler_find_path_order(no_compilers_yaml, working_env, clangdir): shutil.copy("gfortran-8", "first_in_path/gfortran-8") # the first_in_path folder should be searched first - os.environ["PATH"] = "{0}:{1}".format( - str(clangdir.join("first_in_path")), - str(clangdir), - ) + os.environ["PATH"] = "{0}:{1}".format(str(clangdir.join("first_in_path")), str(clangdir)) compiler("find", "--scope=site") diff --git a/lib/spack/spack/test/cmd/config.py b/lib/spack/spack/test/cmd/config.py index 86e03028bd..081e1dfefb 100644 --- a/lib/spack/spack/test/cmd/config.py +++ b/lib/spack/spack/test/cmd/config.py @@ -33,10 +33,7 @@ def _create_config(scope=None, data={}, section="packages"): def config_yaml_v015(mutable_config): """Create a packages.yaml in the old format""" old_data = { - "config": { - "install_tree": "/fake/path", - "install_path_scheme": "{name}-{version}", - } + "config": {"install_tree": "/fake/path", "install_path_scheme": "{name}-{version}"} } return functools.partial(_create_config, data=old_data, section="config") @@ -232,7 +229,6 @@ def test_config_add_update_dict(mutable_empty_config): def test_config_with_c_argument(mutable_empty_config): - # I don't know how to add a spack argument to a Spack Command, so we test this way config_file = "config:install_root:root:/path/to/config.yaml" parser = spack.main.make_argument_parser() diff --git a/lib/spack/spack/test/cmd/create.py b/lib/spack/spack/test/cmd/create.py index f8bc61adf5..ed7a6404bb 100644 --- a/lib/spack/spack/test/cmd/create.py +++ b/lib/spack/spack/test/cmd/create.py @@ -143,11 +143,7 @@ def test_create_template(mock_test_repo, args, name, expected): @pytest.mark.parametrize( - "name,expected", - [ - (" ", "name must be provided"), - ("bad#name", "name can only contain"), - ], + "name,expected", [(" ", "name must be provided"), ("bad#name", "name can only contain")] ) def test_create_template_bad_name(mock_test_repo, name, expected): """Test template creation with bad name options.""" @@ -184,11 +180,7 @@ def test_build_system_guesser_octave(): @pytest.mark.parametrize( - "url,expected", - [ - ("testname", "testname"), - ("file://example.com/archive.tar.gz", "archive"), - ], + "url,expected", [("testname", "testname"), ("file://example.com/archive.tar.gz", "archive")] ) def test_get_name_urls(url, expected): """Test get_name with different URLs.""" diff --git a/lib/spack/spack/test/cmd/env.py b/lib/spack/spack/test/cmd/env.py index 19b53c0573..dc183a84f4 100644 --- a/lib/spack/spack/test/cmd/env.py +++ b/lib/spack/spack/test/cmd/env.py @@ -627,7 +627,6 @@ def test_env_view_external_prefix(tmpdir_factory, mutable_database, mock_package test_scope = spack.config.InternalConfigScope("env-external-test", data=external_config_dict) with spack.config.override(test_scope): - e = ev.create("test", initial_yaml) e.concretize() # Note: normally installing specs in a test environment requires doing @@ -2763,12 +2762,7 @@ def test_query_develop_specs(): @pytest.mark.parametrize("method", [spack.cmd.env.env_activate, spack.cmd.env.env_deactivate]) @pytest.mark.parametrize( - "env,no_env,env_dir", - [ - ("b", False, None), - (None, True, None), - (None, False, "path/"), - ], + "env,no_env,env_dir", [("b", False, None), (None, True, None), (None, False, "path/")] ) def test_activation_and_deactiviation_ambiguities(method, env, no_env, env_dir, capsys): """spack [-e x | -E | -D x/] env [activate | deactivate] y are ambiguous""" @@ -3071,15 +3065,7 @@ def test_read_legacy_lockfile_and_reconcretize(mock_stage, mock_fetch, install_m # This prunes all build deps ( ["--use-buildcache=only"], - [ - "dtlink1", - "dtlink3", - "dtlink4", - "dtlink5", - "dtrun1", - "dtrun3", - "dttop", - ], + ["dtlink1", "dtlink3", "dtlink4", "dtlink5", "dtrun1", "dtrun3", "dttop"], ), # Test whether pruning of build deps is correct if we explicitly include one # that is also a dependency of a root. diff --git a/lib/spack/spack/test/cmd/extensions.py b/lib/spack/spack/test/cmd/extensions.py index c7f638fe44..c1bfc2b153 100644 --- a/lib/spack/spack/test/cmd/extensions.py +++ b/lib/spack/spack/test/cmd/extensions.py @@ -15,14 +15,7 @@ @pytest.fixture def python_database(mock_packages, mutable_database): - specs = [ - Spec(s).concretized() - for s in [ - "python", - "py-extension1", - "py-extension2", - ] - ] + specs = [Spec(s).concretized() for s in ["python", "py-extension1", "py-extension2"]] for spec in specs: spec.package.do_install(fake=True, explicit=True) diff --git a/lib/spack/spack/test/cmd/external.py b/lib/spack/spack/test/cmd/external.py index 9f3ff2f688..12b9d405c6 100644 --- a/lib/spack/spack/test/cmd/external.py +++ b/lib/spack/spack/test/cmd/external.py @@ -383,13 +383,7 @@ def test_new_entries_are_reported_correctly( assert "No new external packages detected" in output -@pytest.mark.parametrize( - "command_args", - [ - ("-t", "build-tools"), - ("-t", "build-tools", "cmake"), - ], -) +@pytest.mark.parametrize("command_args", [("-t", "build-tools"), ("-t", "build-tools", "cmake")]) def test_use_tags_for_detection(command_args, mock_executable, mutable_config, monkeypatch): # Prepare an environment to detect a fake cmake cmake_exe = mock_executable("cmake", output="echo cmake version 3.19.1") diff --git a/lib/spack/spack/test/cmd/find.py b/lib/spack/spack/test/cmd/find.py index 17153f998f..5c520a97e1 100644 --- a/lib/spack/spack/test/cmd/find.py +++ b/lib/spack/spack/test/cmd/find.py @@ -90,7 +90,6 @@ def test_query_arguments(): @pytest.mark.db @pytest.mark.usefixtures("database", "mock_display") def test_tag1(parser, specs): - args = parser.parse_args(["--tag", "tag1"]) spack.cmd.find.find(parser, args) @@ -196,12 +195,7 @@ def test_find_json_deps(database): @pytest.mark.db def test_display_json(database, capsys): specs = [ - Spec(s).concretized() - for s in [ - "mpileaks ^zmpi", - "mpileaks ^mpich", - "mpileaks ^mpich2", - ] + Spec(s).concretized() for s in ["mpileaks ^zmpi", "mpileaks ^mpich", "mpileaks ^mpich2"] ] cmd.display_specs_as_json(specs) @@ -216,12 +210,7 @@ def test_display_json(database, capsys): @pytest.mark.db def test_display_json_deps(database, capsys): specs = [ - Spec(s).concretized() - for s in [ - "mpileaks ^zmpi", - "mpileaks ^mpich", - "mpileaks ^mpich2", - ] + Spec(s).concretized() for s in ["mpileaks ^zmpi", "mpileaks ^mpich", "mpileaks ^mpich2"] ] cmd.display_specs_as_json(specs, deps=True) @@ -237,31 +226,19 @@ def test_display_json_deps(database, capsys): def test_find_format(database, config): output = find("--format", "{name}-{^mpi.name}", "mpileaks") assert set(output.strip().split("\n")) == set( - [ - "mpileaks-zmpi", - "mpileaks-mpich", - "mpileaks-mpich2", - ] + ["mpileaks-zmpi", "mpileaks-mpich", "mpileaks-mpich2"] ) output = find("--format", "{name}-{version}-{compiler.name}-{^mpi.name}", "mpileaks") assert "installed package" not in output assert set(output.strip().split("\n")) == set( - [ - "mpileaks-2.3-gcc-zmpi", - "mpileaks-2.3-gcc-mpich", - "mpileaks-2.3-gcc-mpich2", - ] + ["mpileaks-2.3-gcc-zmpi", "mpileaks-2.3-gcc-mpich", "mpileaks-2.3-gcc-mpich2"] ) output = find("--format", "{name}-{^mpi.name}-{hash:7}", "mpileaks") elements = output.strip().split("\n") assert set(e[:-7] for e in elements) == set( - [ - "mpileaks-zmpi-", - "mpileaks-mpich-", - "mpileaks-mpich2-", - ] + ["mpileaks-zmpi-", "mpileaks-mpich-", "mpileaks-mpich2-"] ) # hashes are in base32 @@ -317,12 +294,7 @@ def test_find_very_long(database, config): output = find("-L", "--no-groups", "mpileaks") specs = [ - Spec(s).concretized() - for s in [ - "mpileaks ^zmpi", - "mpileaks ^mpich", - "mpileaks ^mpich2", - ] + Spec(s).concretized() for s in ["mpileaks ^zmpi", "mpileaks ^mpich", "mpileaks ^mpich2"] ] assert set(output.strip().split("\n")) == set( diff --git a/lib/spack/spack/test/cmd/info.py b/lib/spack/spack/test/cmd/info.py index 5f43fcc06d..801a69cbde 100644 --- a/lib/spack/spack/test/cmd/info.py +++ b/lib/spack/spack/test/cmd/info.py @@ -59,11 +59,7 @@ def test_info_noversion(mock_packages, print_buffer): @pytest.mark.parametrize( - "pkg_query,expected", - [ - ("zlib", "False"), - ("gcc", "True (version, variants)"), - ], + "pkg_query,expected", [("zlib", "False"), ("gcc", "True (version, variants)")] ) def test_is_externally_detectable(pkg_query, expected, parser, print_buffer): args = parser.parse_args(["--detectable", pkg_query]) diff --git a/lib/spack/spack/test/cmd/install.py b/lib/spack/spack/test/cmd/install.py index dd95967dbe..8074cfe0dc 100644 --- a/lib/spack/spack/test/cmd/install.py +++ b/lib/spack/spack/test/cmd/install.py @@ -51,7 +51,6 @@ def noop(*args, **kwargs): def test_install_package_and_dependency( tmpdir, mock_packages, mock_archive, mock_fetch, config, install_mockery ): - log = "test" with tmpdir.as_cwd(): install("--log-format=junit", "--log-file={0}".format(log), "libdwarf") @@ -96,7 +95,6 @@ def check(pkg): def test_install_package_already_installed( tmpdir, mock_packages, mock_archive, mock_fetch, config, install_mockery ): - with tmpdir.as_cwd(): install("libdwarf") install("--log-format=junit", "--log-file=test.xml", "libdwarf") @@ -242,11 +240,7 @@ def test_install_overwrite(mock_packages, mock_archive, mock_fetch, config, inst def test_install_overwrite_not_installed( - mock_packages, - mock_archive, - mock_fetch, - config, - install_mockery, + mock_packages, mock_archive, mock_fetch, config, install_mockery ): # Try to install a spec and then to reinstall it. spec = Spec("libdwarf") @@ -342,11 +336,7 @@ def test_install_overwrite_multiple( @pytest.mark.usefixtures( - "mock_packages", - "mock_archive", - "mock_fetch", - "config", - "install_mockery", + "mock_packages", "mock_archive", "mock_fetch", "config", "install_mockery" ) def test_install_conflicts(conflict_spec): # Make sure that spec with conflicts raises a SpackError @@ -355,11 +345,7 @@ def test_install_conflicts(conflict_spec): @pytest.mark.usefixtures( - "mock_packages", - "mock_archive", - "mock_fetch", - "config", - "install_mockery", + "mock_packages", "mock_archive", "mock_fetch", "config", "install_mockery" ) def test_install_invalid_spec(invalid_spec): # Make sure that invalid specs raise a SpackError @@ -378,7 +364,6 @@ def test_install_invalid_spec(invalid_spec): ], ) def test_install_from_file(spec, concretize, error_code, tmpdir): - if concretize: spec.concretize() @@ -508,7 +493,6 @@ def just_throw(*args, **kwargs): ], ) def test_install_mix_cli_and_files(clispecs, filespecs, tmpdir): - args = clispecs for spec in filespecs: @@ -556,10 +540,7 @@ def test_cdash_report_concretization_error( assert "" in content # The message is different based on using the # new or the old concretizer - expected_messages = ( - "Conflicts in concretized spec", - "conflicts with", - ) + expected_messages = ("Conflicts in concretized spec", "conflicts with") assert any(x in content for x in expected_messages) @@ -650,7 +631,6 @@ def test_cdash_install_from_spec_json( # capfd interferes with Spack's capturing with capfd.disabled(): with tmpdir.as_cwd(): - spec_json_path = str(tmpdir.join("spec.json")) pkg_spec = Spec("a") diff --git a/lib/spack/spack/test/cmd/maintainers.py b/lib/spack/spack/test/cmd/maintainers.py index e3452a5667..93b75da167 100644 --- a/lib/spack/spack/test/cmd/maintainers.py +++ b/lib/spack/spack/test/cmd/maintainers.py @@ -66,11 +66,7 @@ def test_all(mock_packages, capfd): with capfd.disabled(): out = split(maintainers("--all", "maintainers-1")) - assert out == [ - "maintainers-1:", - "user1,", - "user2", - ] + assert out == ["maintainers-1:", "user1,", "user2"] def test_all_by_user(mock_packages, capfd): diff --git a/lib/spack/spack/test/cmd/mirror.py b/lib/spack/spack/test/cmd/mirror.py index a6f8830734..8c355e8f50 100644 --- a/lib/spack/spack/test/cmd/mirror.py +++ b/lib/spack/spack/test/cmd/mirror.py @@ -159,13 +159,7 @@ def test_mirror_crud(mutable_config, capsys): assert "Removed mirror" in output # Test S3 connection info token - mirror( - "add", - "--s3-access-token", - "aaaaaazzzzz", - "mirror", - "s3://spack-public", - ) + mirror("add", "--s3-access-token", "aaaaaazzzzz", "mirror", "s3://spack-public") output = mirror("remove", "mirror") assert "Removed mirror" in output @@ -334,12 +328,7 @@ def test_exclude_specs_from_user(self, cli_args, not_expected, config): specs = spack.cmd.mirror.concrete_specs_from_user(MockMirrorArgs(**cli_args)) assert not any(s.satisfies(y) for s in specs for y in not_expected) - @pytest.mark.parametrize( - "abstract_specs", - [ - ("bowtie", "callpath"), - ], - ) + @pytest.mark.parametrize("abstract_specs", [("bowtie", "callpath")]) def test_specs_from_cli_are_the_same_as_from_file(self, abstract_specs, config, tmpdir): args = MockMirrorArgs(specs=" ".join(abstract_specs)) specs_from_cli = spack.cmd.mirror.concrete_specs_from_user(args) @@ -353,12 +342,7 @@ def test_specs_from_cli_are_the_same_as_from_file(self, abstract_specs, config, @pytest.mark.parametrize( "input_specs,nversions", - [ - ("callpath", 1), - ("mpich", 4), - ("callpath mpich", 3), - ("callpath mpich", "all"), - ], + [("callpath", 1), ("mpich", 4), ("callpath mpich", 3), ("callpath mpich", "all")], ) def test_versions_per_spec_produces_concrete_specs(self, input_specs, nversions, config): args = MockMirrorArgs(specs=input_specs, versions_per_spec=nversions) diff --git a/lib/spack/spack/test/cmd/test.py b/lib/spack/spack/test/cmd/test.py index b76d0494df..ed36d711f8 100644 --- a/lib/spack/spack/test/cmd/test.py +++ b/lib/spack/spack/test/cmd/test.py @@ -33,7 +33,6 @@ def test_test_package_not_installed( install_mockery_mutable_config, mock_test_stage, ): - output = spack_test("run", "libdwarf") assert "No installed packages match spec libdwarf" in output diff --git a/lib/spack/spack/test/compilers/basics.py b/lib/spack/spack/test/compilers/basics.py index 30de8a8e40..0c5660efca 100644 --- a/lib/spack/spack/test/compilers/basics.py +++ b/lib/spack/spack/test/compilers/basics.py @@ -715,19 +715,12 @@ def test_compiler_get_real_version(working_env, monkeypatch, tmpdir): # Add compiler to config compiler_info = { "spec": "gcc@foo", - "paths": { - "cc": gcc, - "cxx": None, - "f77": None, - "fc": None, - }, + "paths": {"cc": gcc, "cxx": None, "f77": None, "fc": None}, "flags": {}, "operating_system": "fake", "target": "fake", "modules": ["turn_on"], - "environment": { - "set": {"CMP_VER": test_version}, - }, + "environment": {"set": {"CMP_VER": test_version}}, "extra_rpaths": [], } compiler_dict = {"compiler": compiler_info} @@ -768,19 +761,12 @@ def test_compiler_get_real_version_fails(working_env, monkeypatch, tmpdir): # Add compiler to config compiler_info = { "spec": "gcc@foo", - "paths": { - "cc": gcc, - "cxx": None, - "f77": None, - "fc": None, - }, + "paths": {"cc": gcc, "cxx": None, "f77": None, "fc": None}, "flags": {}, "operating_system": "fake", "target": "fake", "modules": ["turn_on"], - "environment": { - "set": {"CMP_VER": test_version}, - }, + "environment": {"set": {"CMP_VER": test_version}}, "extra_rpaths": [], } compiler_dict = {"compiler": compiler_info} @@ -829,12 +815,7 @@ def test_compiler_flags_use_real_version(working_env, monkeypatch, tmpdir): # Add compiler to config compiler_info = { "spec": "gcc@foo", - "paths": { - "cc": gcc, - "cxx": None, - "f77": None, - "fc": None, - }, + "paths": {"cc": gcc, "cxx": None, "f77": None, "fc": None}, "flags": {}, "operating_system": "fake", "target": "fake", diff --git a/lib/spack/spack/test/concretize.py b/lib/spack/spack/test/concretize.py index 3e816dc63e..bd54b57dc4 100644 --- a/lib/spack/spack/test/concretize.py +++ b/lib/spack/spack/test/concretize.py @@ -407,13 +407,7 @@ def test_concretize_dependent_with_singlevalued_variant_type(self): s = Spec("singlevalue-variant-dependent-type") s.concretize() - @pytest.mark.parametrize( - "spec,version", - [ - ("dealii", "develop"), - ("xsdk", "0.4.0"), - ], - ) + @pytest.mark.parametrize("spec,version", [("dealii", "develop"), ("xsdk", "0.4.0")]) def concretize_difficult_packages(self, a, b): """Test a couple of large packages that are often broken due to current limitations in the concretizer""" @@ -582,7 +576,6 @@ def test_find_spec_children(self): assert "c" == find_spec(s["b"], lambda s: "+foo" in s).name def test_find_spec_sibling(self): - s = Spec.from_literal({"a": {"b +foo": {"c": None, "d": None}, "e +foo": None}}) assert "e" == find_spec(s["b"], lambda s: "+foo" in s).name @@ -710,7 +703,6 @@ def test_regression_issue_7941(self): ], ) def test_simultaneous_concretization_of_specs(self, abstract_specs): - abstract_specs = [Spec(x) for x in abstract_specs] concrete_specs = spack.concretize.concretize_specs_together(*abstract_specs) @@ -918,9 +910,7 @@ def test_external_package_and_compiler_preferences(self, spec_str, expected): pytest.xfail("Known failure of the original concretizer") packages_yaml = { - "all": { - "compiler": ["clang", "gcc"], - }, + "all": {"compiler": ["clang", "gcc"]}, "cmake": { "externals": [{"spec": "cmake@3.4.3", "prefix": "/usr"}], "buildable": False, @@ -1976,9 +1966,7 @@ def test_external_python_extension_find_dependency_from_config(self, python_spec "buildable": False, "externals": [{"spec": "py-extension1@2.0", "prefix": fake_path}], }, - "python": { - "externals": [{"spec": python_spec, "prefix": fake_path}], - }, + "python": {"externals": [{"spec": python_spec, "prefix": fake_path}]}, } spack.config.set("packages", external_conf) diff --git a/lib/spack/spack/test/concretize_preferences.py b/lib/spack/spack/test/concretize_preferences.py index e1084811e0..2a5ccd1f96 100644 --- a/lib/spack/spack/test/concretize_preferences.py +++ b/lib/spack/spack/test/concretize_preferences.py @@ -277,6 +277,7 @@ def test_external_module(self, monkeypatch): The specific code for parsing the module is tested elsewhere. This just tests that the preference is accounted for""" + # make sure this doesn't give us an external first. def mock_module(cmd, module): return "prepend-path PATH /dummy/path" diff --git a/lib/spack/spack/test/concretize_requirements.py b/lib/spack/spack/test/concretize_requirements.py index c7b3a3f4fd..965d85e93d 100644 --- a/lib/spack/spack/test/concretize_requirements.py +++ b/lib/spack/spack/test/concretize_requirements.py @@ -75,7 +75,7 @@ def create_test_repo(tmpdir, mutable_config): ) packages_dir = tmpdir.join("packages") - for (pkg_name, pkg_str) in [_pkgx, _pkgy, _pkgv]: + for pkg_name, pkg_str in [_pkgx, _pkgy, _pkgv]: pkg_dir = packages_dir.ensure(pkg_name, dir=True) pkg_file = pkg_dir.join("package.py") with open(str(pkg_file), "w") as f: @@ -372,11 +372,7 @@ def test_requirements_on_virtual(mpi_requirement, concretize_scope, mock_package @pytest.mark.parametrize( "mpi_requirement,specific_requirement", - [ - ("mpich", "@3.0.3"), - ("mpich2", "%clang"), - ("zmpi", "%gcc"), - ], + [("mpich", "@3.0.3"), ("mpich2", "%clang"), ("zmpi", "%gcc")], ) def test_requirements_on_virtual_and_on_package( mpi_requirement, specific_requirement, concretize_scope, mock_packages diff --git a/lib/spack/spack/test/config.py b/lib/spack/spack/test/config.py index 1c798f2abc..3ff5a52728 100644 --- a/lib/spack/spack/test/config.py +++ b/lib/spack/spack/test/config.py @@ -145,10 +145,7 @@ def check_compiler_config(comps, *compiler_names): { "compiler": { "paths": {"cc": "/gcc422", "cxx": "/g++422", "f77": "gfortran", "fc": "gfortran"}, - "flags": { - "cppflags": "-O0 -fpic", - "fflags": "-f77", - }, + "flags": {"cppflags": "-O0 -fpic", "fflags": "-f77"}, "modules": None, "spec": "gcc@4.2.2", "operating_system": "CNL10", @@ -191,10 +188,7 @@ def check_compiler_config(comps, *compiler_names): { "compiler": { "paths": {"cc": "/icc123", "cxx": "/icp123", "f77": "ifort", "fc": "ifort"}, - "flags": { - "cppflags": "-O3", - "fflags": "-f77rtl", - }, + "flags": {"cppflags": "-O3", "fflags": "-f77rtl"}, "modules": None, "spec": "icc@12.3", "operating_system": "CNL10", @@ -298,7 +292,6 @@ def test_add_config_path_with_enumerated_type(mutable_config): def test_add_config_filename(mock_low_high_config, tmpdir): - config_yaml = tmpdir.join("config-filename.yaml") config_yaml.ensure() with config_yaml.open("w") as f: @@ -586,21 +579,9 @@ def test_read_config_override_list(mock_low_high_config, write_config_file): def test_ordereddict_merge_order(): """ "Test that source keys come before dest keys in merge_yaml results.""" - source = syaml.syaml_dict( - [ - ("k1", "v1"), - ("k2", "v2"), - ("k3", "v3"), - ] - ) + source = syaml.syaml_dict([("k1", "v1"), ("k2", "v2"), ("k3", "v3")]) - dest = syaml.syaml_dict( - [ - ("k4", "v4"), - ("k3", "WRONG"), - ("k5", "v5"), - ] - ) + dest = syaml.syaml_dict([("k4", "v4"), ("k3", "WRONG"), ("k5", "v5")]) result = spack.config.merge_yaml(dest, source) assert "WRONG" not in result.values() @@ -657,11 +638,7 @@ def test_mark_internal(): "int": 6, "numbers": [1, 2, 3], "string": "foo", - "dict": { - "more_numbers": [1, 2, 3], - "another_string": "foo", - "another_int": 7, - }, + "dict": {"more_numbers": [1, 2, 3], "another_string": "foo", "another_int": 7}, } } @@ -700,13 +677,7 @@ def test_internal_config_from_data(): # add an internal config initialized from an inline dict config.push_scope( spack.config.InternalConfigScope( - "_builtin", - { - "config": { - "verify_ssl": False, - "build_jobs": 6, - } - }, + "_builtin", {"config": {"verify_ssl": False, "build_jobs": 6}} ) ) @@ -719,13 +690,7 @@ def test_internal_config_from_data(): # push one on top and see what happens. config.push_scope( spack.config.InternalConfigScope( - "higher", - { - "config": { - "checksum": True, - "verify_ssl": True, - } - }, + "higher", {"config": {"checksum": True, "verify_ssl": True}} ) ) @@ -1336,13 +1301,7 @@ def test_config_collect_urls(mutable_empty_config, mock_spider_configs, url, isf ], ) def test_config_fetch_remote_configs( - tmpdir, - mutable_empty_config, - mock_collect_urls, - mock_curl_configs, - url, - isfile, - fail, + tmpdir, mutable_empty_config, mock_collect_urls, mock_curl_configs, url, isfile, fail ): def _has_content(filename): # The first element of all configuration files for this test happen to @@ -1399,10 +1358,7 @@ def _collect(base_url): @pytest.mark.parametrize( "url,skip", - [ - (github_url.format("tree"), True), - ("{0}/compilers.yaml".format(gitlab_url), True), - ], + [(github_url.format("tree"), True), ("{0}/compilers.yaml".format(gitlab_url), True)], ) def test_config_fetch_remote_configs_skip( tmpdir, mutable_empty_config, mock_collect_urls, mock_curl_configs, url, skip diff --git a/lib/spack/spack/test/conftest.py b/lib/spack/spack/test/conftest.py index bf6e4e6b35..9a7b3a6a9a 100644 --- a/lib/spack/spack/test/conftest.py +++ b/lib/spack/spack/test/conftest.py @@ -716,9 +716,7 @@ def configuration_dir(tmpdir_factory, linux_os): def _create_mock_configuration_scopes(configuration_dir): """Create the configuration scopes used in `config` and `mutable_config`.""" - scopes = [ - spack.config.InternalConfigScope("_builtin", spack.config.config_defaults), - ] + scopes = [spack.config.InternalConfigScope("_builtin", spack.config.config_defaults)] scopes += [ spack.config.ConfigScope(name, str(configuration_dir.join(name))) for name in ["site", "system", "user"] @@ -1277,12 +1275,7 @@ def get_date(): return format_date(timestamp) checks = { - "default": Bunch( - file=r1_file, - branch=None, - date=None, - args={"cvs": url}, - ), + "default": Bunch(file=r1_file, branch=None, date=None, args={"cvs": url}), "branch": Bunch( file=r1_file, branch="mock-branch", @@ -1298,11 +1291,7 @@ def get_date(): } test = Bunch( - checks=checks, - url=url, - get_branch=get_branch, - get_date=get_date, - path=str(repodir), + checks=checks, url=url, get_branch=get_branch, get_date=get_date, path=str(repodir) ) yield test @@ -1402,12 +1391,7 @@ def mock_git_repository(git, tmpdir_factory): git("tag", tag) try: - default_branch = git( - "config", - "--get", - "init.defaultBranch", - output=str, - ).strip() + default_branch = git("config", "--get", "init.defaultBranch", output=str).strip() except Exception: default_branch = "master" git("checkout", default_branch) diff --git a/lib/spack/spack/test/cray_manifest.py b/lib/spack/spack/test/cray_manifest.py index 0815116eda..4ffff0b926 100644 --- a/lib/spack/spack/test/cray_manifest.py +++ b/lib/spack/spack/test/cray_manifest.py @@ -130,10 +130,7 @@ def spec_json(self): """The compiler spec only lists the name/version, not arch/executables. """ - return { - "name": self.name, - "version": self.version, - } + return {"name": self.name, "version": self.version} _common_arch = JsonArchEntry(platform="linux", os="centos8", target="haswell").to_dict() @@ -265,10 +262,7 @@ def test_translate_compiler_name(): nvidia_compiler = JsonCompilerEntry( name="nvidia", version="19.1", - executables={ - "cc": "/path/to/compiler/nvc", - "cxx": "/path/to/compiler/nvc++", - }, + executables={"cc": "/path/to/compiler/nvc", "cxx": "/path/to/compiler/nvc++"}, ) compiler = compiler_from_entry(nvidia_compiler.compiler_json()) diff --git a/lib/spack/spack/test/directory_layout.py b/lib/spack/spack/test/directory_layout.py index ade7303f01..323c081e64 100644 --- a/lib/spack/spack/test/directory_layout.py +++ b/lib/spack/spack/test/directory_layout.py @@ -13,10 +13,7 @@ import spack.paths import spack.repo -from spack.directory_layout import ( - DirectoryLayout, - InvalidDirectoryLayoutParametersError, -) +from spack.directory_layout import DirectoryLayout, InvalidDirectoryLayoutParametersError from spack.spec import Spec from spack.util.path import path_to_os_path diff --git a/lib/spack/spack/test/environment.py b/lib/spack/spack/test/environment.py index db59e71fea..2f363dfdca 100644 --- a/lib/spack/spack/test/environment.py +++ b/lib/spack/spack/test/environment.py @@ -9,10 +9,7 @@ import pytest from spack.environment import Environment -from spack.environment.environment import ( - SpackEnvironmentViewError, - _error_on_nonempty_view_dir, -) +from spack.environment.environment import SpackEnvironmentViewError, _error_on_nonempty_view_dir def test_environment_pickle(tmpdir): diff --git a/lib/spack/spack/test/environment_modifications.py b/lib/spack/spack/test/environment_modifications.py index 10cb5e5f8c..42ce72ad67 100644 --- a/lib/spack/spack/test/environment_modifications.py +++ b/lib/spack/spack/test/environment_modifications.py @@ -362,7 +362,6 @@ def test_preserve_environment(prepare_environment_for_tests): ) @pytest.mark.usefixtures("prepare_environment_for_tests") def test_environment_from_sourcing_files(files, expected, deleted): - env = environment.environment_after_sourcing_files(*files) # Test that variables that have been modified are still there and contain @@ -393,7 +392,6 @@ def test_clear(env): ], ) def test_sanitize_literals(env, exclude, include): - after = environment.sanitize(env, exclude, include) # Check that all the included variables are there @@ -430,7 +428,6 @@ def test_sanitize_literals(env, exclude, include): ], ) def test_sanitize_regex(env, exclude, include, expected, deleted): - after = environment.sanitize(env, exclude, include) assert all(x in after for x in expected) @@ -481,15 +478,11 @@ def test_sanitize_regex(env, exclude, include, expected, deleted): ( {"FOO": "foo", "BAR": "bar"}, {"FOO": "baz", "BAR": "baz"}, - [ - environment.SetEnv("FOO", "baz"), - environment.SetEnv("BAR", "baz"), - ], + [environment.SetEnv("FOO", "baz"), environment.SetEnv("BAR", "baz")], ), ], ) def test_from_environment_diff(before, after, search_list): - mod = environment.EnvironmentModifications.from_environment_diff(before, after) for item in search_list: diff --git a/lib/spack/spack/test/git_fetch.py b/lib/spack/spack/test/git_fetch.py index 988742153a..bf647da55e 100644 --- a/lib/spack/spack/test/git_fetch.py +++ b/lib/spack/spack/test/git_fetch.py @@ -177,7 +177,6 @@ def test_fetch_pkg_attr_submodule_init( def test_adhoc_version_submodules( mock_git_repository, config, mutable_mock_repo, monkeypatch, mock_stage ): - t = mock_git_repository.checks["tag"] # Construct the package under test pkg_class = spack.repo.path.get_pkg_class("git-test") diff --git a/lib/spack/spack/test/hooks/absolutify_elf_sonames.py b/lib/spack/spack/test/hooks/absolutify_elf_sonames.py index c3e4da31cc..b2f4a63364 100644 --- a/lib/spack/spack/test/hooks/absolutify_elf_sonames.py +++ b/lib/spack/spack/test/hooks/absolutify_elf_sonames.py @@ -11,10 +11,7 @@ import llnl.util.filesystem as fs import spack.platforms -from spack.hooks.absolutify_elf_sonames import ( - SharedLibrariesVisitor, - find_and_patch_sonames, -) +from spack.hooks.absolutify_elf_sonames import SharedLibrariesVisitor, find_and_patch_sonames from spack.util.executable import Executable diff --git a/lib/spack/spack/test/llnl/util/file_list.py b/lib/spack/spack/test/llnl/util/file_list.py index 7e85b78044..bbf9a161df 100644 --- a/lib/spack/spack/test/llnl/util/file_list.py +++ b/lib/spack/spack/test/llnl/util/file_list.py @@ -9,13 +9,7 @@ import pytest -from llnl.util.filesystem import ( - HeaderList, - LibraryList, - find, - find_headers, - find_libraries, -) +from llnl.util.filesystem import HeaderList, LibraryList, find, find_headers, find_libraries import spack.paths @@ -80,7 +74,6 @@ def test_repr(self, library_list): assert library_list == x def test_joined_and_str(self, library_list): - s1 = library_list.joined() expected = " ".join( [ @@ -109,7 +102,6 @@ def test_joined_and_str(self, library_list): assert s3 == expected def test_flags(self, library_list): - search_flags = library_list.search_flags assert "-L/dir1" in search_flags assert "-L/dir2" in search_flags @@ -306,7 +298,6 @@ def test_library_type_search(lib_list, kwargs): ], ) def test_searching_order(search_fn, search_list, root, kwargs): - # Test search result = search_fn(search_list, root, **kwargs) diff --git a/lib/spack/spack/test/llnl/util/filesystem.py b/lib/spack/spack/test/llnl/util/filesystem.py index 86c9f91c48..bbadfcbca9 100644 --- a/lib/spack/spack/test/llnl/util/filesystem.py +++ b/lib/spack/spack/test/llnl/util/filesystem.py @@ -315,7 +315,6 @@ def test_paths_containing_libs(dirs_with_libfiles): def test_move_transaction_commit(tmpdir): - fake_library = tmpdir.mkdir("lib").join("libfoo.so") fake_library.write("Just some fake content.") @@ -330,7 +329,6 @@ def test_move_transaction_commit(tmpdir): def test_move_transaction_rollback(tmpdir): - fake_library = tmpdir.mkdir("lib").join("libfoo.so") fake_library.write("Initial content.") @@ -812,28 +810,10 @@ def test_visit_directory_tree_follow_all(noncyclical_dir_structure): j("c", "file_2"), j("file_3"), ] - assert visitor.dirs_before == [ - j("a"), - j("a", "d"), - j("b", "d"), - j("c"), - ] - assert visitor.dirs_after == [ - j("a", "d"), - j("a"), - j("b", "d"), - j("c"), - ] - assert visitor.symlinked_dirs_before == [ - j("a", "to_c"), - j("b"), - j("b", "to_c"), - ] - assert visitor.symlinked_dirs_after == [ - j("a", "to_c"), - j("b", "to_c"), - j("b"), - ] + assert visitor.dirs_before == [j("a"), j("a", "d"), j("b", "d"), j("c")] + assert visitor.dirs_after == [j("a", "d"), j("a"), j("b", "d"), j("c")] + assert visitor.symlinked_dirs_before == [j("a", "to_c"), j("b"), j("b", "to_c")] + assert visitor.symlinked_dirs_after == [j("a", "to_c"), j("b", "to_c"), j("b")] @pytest.mark.skipif(sys.platform == "win32", reason="Requires symlinks") @@ -849,20 +829,9 @@ def test_visit_directory_tree_follow_dirs(noncyclical_dir_structure): j("c", "file_2"), j("file_3"), ] - assert visitor.dirs_before == [ - j("a"), - j("a", "d"), - j("c"), - ] - assert visitor.dirs_after == [ - j("a", "d"), - j("a"), - j("c"), - ] - assert visitor.symlinked_dirs_before == [ - j("a", "to_c"), - j("b"), - ] + assert visitor.dirs_before == [j("a"), j("a", "d"), j("c")] + assert visitor.dirs_after == [j("a", "d"), j("a"), j("c")] + assert visitor.symlinked_dirs_before == [j("a", "to_c"), j("b")] assert not visitor.symlinked_dirs_after @@ -872,17 +841,10 @@ def test_visit_directory_tree_follow_none(noncyclical_dir_structure): visitor = RegisterVisitor(root, follow_dirs=False, follow_symlink_dirs=False) fs.visit_directory_tree(root, visitor) j = os.path.join - assert visitor.files == [ - j("file_3"), - ] - assert visitor.dirs_before == [ - j("a"), - j("c"), - ] + assert visitor.files == [j("file_3")] + assert visitor.dirs_before == [j("a"), j("c")] assert not visitor.dirs_after - assert visitor.symlinked_dirs_before == [ - j("b"), - ] + assert visitor.symlinked_dirs_before == [j("b")] assert not visitor.symlinked_dirs_after diff --git a/lib/spack/spack/test/llnl/util/lang.py b/lib/spack/spack/test/llnl/util/lang.py index 95cc327dcc..d913ecc264 100644 --- a/lib/spack/spack/test/llnl/util/lang.py +++ b/lib/spack/spack/test/llnl/util/lang.py @@ -239,21 +239,14 @@ def test_unequal_args(args1, kwargs1, args2, kwargs2): "args1,kwargs1,args2,kwargs2", [ # Ensure that kwargs are stably sorted. - ((), {"a": 3, "b": 4}, (), {"b": 4, "a": 3}), + ((), {"a": 3, "b": 4}, (), {"b": 4, "a": 3}) ], ) def test_equal_args(args1, kwargs1, args2, kwargs2): assert stable_args(*args1, **kwargs1) == stable_args(*args2, **kwargs2) -@pytest.mark.parametrize( - "args, kwargs", - [ - ((1,), {}), - ((), {"a": 3}), - ((1,), {"a": 3}), - ], -) +@pytest.mark.parametrize("args, kwargs", [((1,), {}), ((), {"a": 3}), ((1,), {"a": 3})]) def test_memoized(args, kwargs): @memoized def f(*args, **kwargs): @@ -265,10 +258,7 @@ def f(*args, **kwargs): assert f.cache[key] == "return-value" -@pytest.mark.parametrize( - "args, kwargs", - [(([1],), {}), ((), {"a": [1]})], -) +@pytest.mark.parametrize("args, kwargs", [(([1],), {}), ((), {"a": [1]})]) def test_memoized_unhashable(args, kwargs): """Check that an exception is raised clearly""" diff --git a/lib/spack/spack/test/llnl/util/link_tree.py b/lib/spack/spack/test/llnl/util/link_tree.py index 391e060537..3ae39bbb79 100644 --- a/lib/spack/spack/test/llnl/util/link_tree.py +++ b/lib/spack/spack/test/llnl/util/link_tree.py @@ -103,7 +103,6 @@ def test_merge_to_new_directory_relative(stage, link_tree): def test_merge_to_existing_directory(stage, link_tree): with working_dir(stage.path): - touchp("dest/x") touchp("dest/a/b/y") diff --git a/lib/spack/spack/test/llnl/util/tty/log.py b/lib/spack/spack/test/llnl/util/tty/log.py index 9b37912d3d..b5767d1862 100644 --- a/lib/spack/spack/test/llnl/util/tty/log.py +++ b/lib/spack/spack/test/llnl/util/tty/log.py @@ -450,10 +450,7 @@ def mock_shell_v_v_no_termios(proc, ctl, **kwargs): @pytest.mark.skipif(not termios, reason="requires termios support") @pytest.mark.parametrize( "test_fn,termios_on_or_off", - [ - (mock_shell_v_v, lang.nullcontext), - (mock_shell_v_v_no_termios, no_termios), - ], + [(mock_shell_v_v, lang.nullcontext), (mock_shell_v_v_no_termios, no_termios)], ) @pytest.mark.xfail(reason="Fails almost consistently when run with coverage and xdist") def test_foreground_background_output(test_fn, capfd, termios_on_or_off, tmpdir): diff --git a/lib/spack/spack/test/mirror.py b/lib/spack/spack/test/mirror.py index cd5a7da7fe..8fa32c4893 100644 --- a/lib/spack/spack/test/mirror.py +++ b/lib/spack/spack/test/mirror.py @@ -123,7 +123,6 @@ def test_hg_mirror(mock_hg_repository): def test_all_mirror(mock_git_repository, mock_svn_repository, mock_hg_repository, mock_archive): - set_up_package("git-test", mock_git_repository, "git") set_up_package("svn-test", mock_svn_repository, "svn") set_up_package("hg-test", mock_hg_repository, "hg") @@ -133,13 +132,7 @@ def test_all_mirror(mock_git_repository, mock_svn_repository, mock_hg_repository @pytest.mark.parametrize( - "mirror", - [ - spack.mirror.Mirror( - "https://example.com/fetch", - "https://example.com/push", - ), - ], + "mirror", [spack.mirror.Mirror("https://example.com/fetch", "https://example.com/push")] ) def test_roundtrip_mirror(mirror): mirror_yaml = mirror.to_yaml() @@ -174,11 +167,10 @@ def test_invalid_json_mirror(invalid_json, error_message): spack.mirror.MirrorCollection( mirrors={ "example-mirror": spack.mirror.Mirror( - "https://example.com/fetch", - "https://example.com/push", - ).to_dict(), - }, - ), + "https://example.com/fetch", "https://example.com/push" + ).to_dict() + } + ) ], ) def test_roundtrip_mirror_collection(mirror_collection): diff --git a/lib/spack/spack/test/modules/common.py b/lib/spack/spack/test/modules/common.py index 53b5b71ad3..691a50dd54 100644 --- a/lib/spack/spack/test/modules/common.py +++ b/lib/spack/spack/test/modules/common.py @@ -22,14 +22,7 @@ def test_update_dictionary_extending_list(): target = {"foo": {"a": 1, "b": 2, "d": 4}, "bar": [1, 2, 4], "baz": "foobar"} - update = { - "foo": { - "c": 3, - }, - "bar": [3], - "baz": "foobaz", - "newkey": {"d": 4}, - } + update = {"foo": {"c": 3}, "bar": [3], "baz": "foobaz", "newkey": {"d": 4}} spack.modules.common.update_dictionary_extending_lists(target, update) assert len(target) == 4 assert len(target["foo"]) == 4 diff --git a/lib/spack/spack/test/modules/lmod.py b/lib/spack/spack/test/modules/lmod.py index fbd8be49a7..9ca0c3aa50 100644 --- a/lib/spack/spack/test/modules/lmod.py +++ b/lib/spack/spack/test/modules/lmod.py @@ -41,10 +41,7 @@ def provider(request): return request.param -@pytest.mark.usefixtures( - "config", - "mock_packages", -) +@pytest.mark.usefixtures("config", "mock_packages") class TestLmod(object): def test_file_layout(self, compiler, provider, factory, module_configuration): """Tests the layout of files in the hierarchy is the one expected.""" @@ -254,12 +251,7 @@ def no_op_set(*args, **kwargs): assert writer.conf.core_compilers @pytest.mark.parametrize( - "spec_str", - [ - "mpileaks target=nocona", - "mpileaks target=core2", - "mpileaks target=x86_64", - ], + "spec_str", ["mpileaks target=nocona", "mpileaks target=core2", "mpileaks target=x86_64"] ) @pytest.mark.regression("13005") def test_only_generic_microarchitectures_in_root( diff --git a/lib/spack/spack/test/modules/tcl.py b/lib/spack/spack/test/modules/tcl.py index 2ea9f1ccd6..145e5e6156 100644 --- a/lib/spack/spack/test/modules/tcl.py +++ b/lib/spack/spack/test/modules/tcl.py @@ -218,7 +218,6 @@ def test_conflicts(self, modulefile_content, module_configuration): modulefile_content("mpileaks") def test_module_index(self, module_configuration, factory, tmpdir_factory): - module_configuration("suffix") w1, s1 = factory("mpileaks") diff --git a/lib/spack/spack/test/package_class.py b/lib/spack/spack/test/package_class.py index fff839932f..6f5d650231 100644 --- a/lib/spack/spack/test/package_class.py +++ b/lib/spack/spack/test/package_class.py @@ -61,11 +61,7 @@ def test_possible_dependencies(mock_packages, mpileaks_possible_deps): def test_possible_direct_dependencies(mock_packages, mpileaks_possible_deps): pkg_cls = spack.repo.path.get_pkg_class("mpileaks") deps = pkg_cls.possible_dependencies(transitive=False, expand_virtuals=False) - assert { - "callpath": set(), - "mpi": set(), - "mpileaks": {"callpath", "mpi"}, - } == deps + assert {"callpath": set(), "mpi": set(), "mpileaks": {"callpath", "mpi"}} == deps def test_possible_dependencies_virtual(mock_packages, mpi_names): @@ -101,10 +97,9 @@ def test_possible_dependencies_with_deptypes(mock_packages): "dtlink2": set(), } == dtbuild1.possible_dependencies(deptype=("build")) - assert { - "dtbuild1": {"dtlink2"}, - "dtlink2": set(), - } == dtbuild1.possible_dependencies(deptype=("link")) + assert {"dtbuild1": {"dtlink2"}, "dtlink2": set()} == dtbuild1.possible_dependencies( + deptype=("link") + ) def test_possible_dependencies_with_multiple_classes(mock_packages, mpileaks_possible_deps): diff --git a/lib/spack/spack/test/packaging.py b/lib/spack/spack/test/packaging.py index 16a5753e60..75891ce94c 100644 --- a/lib/spack/spack/test/packaging.py +++ b/lib/spack/spack/test/packaging.py @@ -252,7 +252,6 @@ def test_relocate_links(tmpdir): def test_needs_relocation(): - assert needs_binary_relocation("application", "x-sharedlib") assert needs_binary_relocation("application", "x-executable") assert not needs_binary_relocation("application", "x-octet-stream") diff --git a/lib/spack/spack/test/pattern.py b/lib/spack/spack/test/pattern.py index 7d89a87f50..ccf43c96f1 100644 --- a/lib/spack/spack/test/pattern.py +++ b/lib/spack/spack/test/pattern.py @@ -67,7 +67,6 @@ class Composite: def test_composite_interface_calls(interface, composite): - composite.add() assert interface.counter == 3 @@ -77,7 +76,6 @@ def test_composite_interface_calls(interface, composite): def test_composite_wrong_container(interface): - with pytest.raises(TypeError): @pattern.composite(interface=interface, container=2) @@ -86,7 +84,6 @@ class CompositeFromInterface: def test_composite_no_methods(): - with pytest.raises(TypeError): @pattern.composite() diff --git a/lib/spack/spack/test/relocate_text.py b/lib/spack/spack/test/relocate_text.py index 9f97e7e83f..a92497ce16 100644 --- a/lib/spack/spack/test/relocate_text.py +++ b/lib/spack/spack/test/relocate_text.py @@ -152,9 +152,7 @@ def replace_and_expect(prefix_map, before, after=None, suffix_safety_size=7): # Too short matching suffix, identical string length error_msg = "Cannot replace {!r} with {!r} in the C-string {!r}.".format( - b"pkg-gwixwaxlgczp6", - b"pkg-zkesfrzlgczp6", - b"pkg-gwixwaxlgczp6", + b"pkg-gwixwaxlgczp6", b"pkg-zkesfrzlgczp6", b"pkg-gwixwaxlgczp6" ) with pytest.raises(relocate_text.CannotShrinkCString, match=error_msg): replace_and_expect( @@ -169,9 +167,7 @@ def replace_and_expect(prefix_map, before, after=None, suffix_safety_size=7): # at a distance where we cant keep a long enough suffix, and one where we can, # so we should expect failure when the first null is used. error_msg = "Cannot replace {!r} with {!r} in the C-string {!r}.".format( - b"pkg-abcdef", - b"pkg-xyzabc", - b"pkg-abcdef", + b"pkg-abcdef", b"pkg-xyzabc", b"pkg-abcdef" ) with pytest.raises(relocate_text.CannotShrinkCString, match=error_msg): replace_and_expect( @@ -231,11 +227,7 @@ def replace_and_expect(prefix_to_prefix, before: bytes, after: bytes): b"Install path: /replacement.", ) - replace_and_expect( - [(b"/my/prefix", b"/replacement")], - b"#!/my/prefix", - b"#!/replacement", - ) + replace_and_expect([(b"/my/prefix", b"/replacement")], b"#!/my/prefix", b"#!/replacement") def test_relocate_text_filters_redundant_entries(): diff --git a/lib/spack/spack/test/schema.py b/lib/spack/spack/test/schema.py index c096b9461c..d7f4e524ff 100644 --- a/lib/spack/spack/test/schema.py +++ b/lib/spack/spack/test/schema.py @@ -35,11 +35,7 @@ def module_suffixes_schema(): "properties": { "suffixes": { "validate_spec": True, - "patternProperties": { - r"\w[\w-]*": { - "type": "string", - } - }, + "patternProperties": {r"\w[\w-]*": {"type": "string"}}, } }, } diff --git a/lib/spack/spack/test/spack_yaml.py b/lib/spack/spack/test/spack_yaml.py index a6d7e34438..de5e6814d9 100644 --- a/lib/spack/spack/test/spack_yaml.py +++ b/lib/spack/spack/test/spack_yaml.py @@ -31,7 +31,6 @@ def data(): def test_parse(data): - expected = { "config_file": syaml.syaml_dict( [ @@ -52,7 +51,6 @@ def test_parse(data): def test_dict_order(data): - expected_order = ["x86_64", "some_list", "another_list", "some_key"] assert list(data["config_file"].keys()) == expected_order diff --git a/lib/spack/spack/test/spec_dag.py b/lib/spack/spack/test/spec_dag.py index 5afc831096..5c437da6ba 100644 --- a/lib/spack/spack/test/spec_dag.py +++ b/lib/spack/spack/test/spec_dag.py @@ -342,9 +342,7 @@ def test_normalize_a_lot(self): spec.normalize() spec.normalize() - def test_normalize_with_virtual_spec( - self, - ): + def test_normalize_with_virtual_spec(self): dag = Spec.from_literal( { "mpileaks": { @@ -484,7 +482,7 @@ def test_normalize_mpileaks(self): mpich: None, }, mpich: None, - }, + } } ) @@ -826,7 +824,6 @@ def check_diamond_deptypes(self, spec): ].deptypes == ("build", "link", "run") def check_diamond_normalized_dag(self, spec): - dag = Spec.from_literal( { "dt-diamond": { diff --git a/lib/spack/spack/test/spec_list.py b/lib/spack/spack/test/spec_list.py index 3595ddfd76..7df87542b0 100644 --- a/lib/spack/spack/test/spec_list.py +++ b/lib/spack/spack/test/spec_list.py @@ -23,12 +23,7 @@ class TestSpecList(object): "mpileaks", "zmpi@1.0", "mpich@3.0", - { - "matrix": [ - ["hypre"], - ["%gcc@4.5.0", "%clang@3.3"], - ] - }, + {"matrix": [["hypre"], ["%gcc@4.5.0", "%clang@3.3"]]}, "libelf", ] diff --git a/lib/spack/spack/test/spec_semantics.py b/lib/spack/spack/test/spec_semantics.py index c09ddeb920..d60df890ba 100644 --- a/lib/spack/spack/test/spec_semantics.py +++ b/lib/spack/spack/test/spec_semantics.py @@ -42,7 +42,6 @@ def _specify(spec_like): def check_satisfies(target_spec, constraint_spec, target_concrete=False): - target = make_spec(target_spec, target_concrete) constraint = _specify(constraint_spec) @@ -55,7 +54,6 @@ def check_satisfies(target_spec, constraint_spec, target_concrete=False): def check_unsatisfiable(target_spec, constraint_spec, target_concrete=False): - target = make_spec(target_spec, target_concrete) constraint = _specify(constraint_spec) @@ -325,7 +323,6 @@ def test_indirect_unsatisfied_single_valued_variant(self): assert "a@1.0" not in spec def test_unsatisfiable_multi_value_variant(self): - # Semantics for a multi-valued variant is different # Depending on whether the spec is concrete or not diff --git a/lib/spack/spack/test/spec_syntax.py b/lib/spack/spack/test/spec_syntax.py index 56d85bfca2..62396d57ef 100644 --- a/lib/spack/spack/test/spec_syntax.py +++ b/lib/spack/spack/test/spec_syntax.py @@ -403,9 +403,7 @@ def _specfile_for(spec_str, filename): # Key value pairs with ":" and "," in the value ( r"target=:broadwell,icelake", - [ - Token(TokenType.KEY_VALUE_PAIR, value="target=:broadwell,icelake"), - ], + [Token(TokenType.KEY_VALUE_PAIR, value="target=:broadwell,icelake")], r"arch=None-None-:broadwell,icelake", ), # Hash pair version followed by a variant @@ -480,13 +478,7 @@ def _specfile_for(spec_str, filename): [Token(TokenType.VERSION, value="@1.2 : 1.4 , 1.6")], "@1.2:1.4,1.6", ), - ( - "@1.2 : develop", - [ - Token(TokenType.VERSION, value="@1.2 : develop"), - ], - "@1.2:develop", - ), + ("@1.2 : develop", [Token(TokenType.VERSION, value="@1.2 : develop")], "@1.2:develop"), ( "@1.2 : develop = foo", [ @@ -522,10 +514,7 @@ def _specfile_for(spec_str, filename): ), ( "@:0.4 % nvhpc", - [ - Token(TokenType.VERSION, value="@:0.4"), - Token(TokenType.COMPILER, value="% nvhpc"), - ], + [Token(TokenType.VERSION, value="@:0.4"), Token(TokenType.COMPILER, value="% nvhpc")], "@:0.4%nvhpc", ), ], @@ -847,39 +836,23 @@ def test_error_conditions(text, exc_cls): [ # Specfile related errors pytest.param( - "/bogus/path/libdwarf.yaml", - spack.spec.NoSuchSpecFileError, - marks=FAIL_ON_WINDOWS, - ), - pytest.param( - "../../libdwarf.yaml", - spack.spec.NoSuchSpecFileError, - marks=FAIL_ON_WINDOWS, - ), - pytest.param( - "./libdwarf.yaml", - spack.spec.NoSuchSpecFileError, - marks=FAIL_ON_WINDOWS, + "/bogus/path/libdwarf.yaml", spack.spec.NoSuchSpecFileError, marks=FAIL_ON_WINDOWS ), + pytest.param("../../libdwarf.yaml", spack.spec.NoSuchSpecFileError, marks=FAIL_ON_WINDOWS), + pytest.param("./libdwarf.yaml", spack.spec.NoSuchSpecFileError, marks=FAIL_ON_WINDOWS), pytest.param( "libfoo ^/bogus/path/libdwarf.yaml", spack.spec.NoSuchSpecFileError, marks=FAIL_ON_WINDOWS, ), pytest.param( - "libfoo ^../../libdwarf.yaml", - spack.spec.NoSuchSpecFileError, - marks=FAIL_ON_WINDOWS, + "libfoo ^../../libdwarf.yaml", spack.spec.NoSuchSpecFileError, marks=FAIL_ON_WINDOWS ), pytest.param( - "libfoo ^./libdwarf.yaml", - spack.spec.NoSuchSpecFileError, - marks=FAIL_ON_WINDOWS, + "libfoo ^./libdwarf.yaml", spack.spec.NoSuchSpecFileError, marks=FAIL_ON_WINDOWS ), pytest.param( - "/bogus/path/libdwarf.yamlfoobar", - spack.spec.SpecFilenameError, - marks=FAIL_ON_WINDOWS, + "/bogus/path/libdwarf.yamlfoobar", spack.spec.SpecFilenameError, marks=FAIL_ON_WINDOWS ), pytest.param( "libdwarf^/bogus/path/libelf.yamlfoobar ^/path/to/bogus.yaml", @@ -887,34 +860,20 @@ def test_error_conditions(text, exc_cls): marks=FAIL_ON_WINDOWS, ), pytest.param( - "c:\\bogus\\path\\libdwarf.yaml", - spack.spec.NoSuchSpecFileError, - marks=FAIL_ON_UNIX, - ), - pytest.param( - "..\\..\\libdwarf.yaml", - spack.spec.NoSuchSpecFileError, - marks=FAIL_ON_UNIX, - ), - pytest.param( - ".\\libdwarf.yaml", - spack.spec.NoSuchSpecFileError, - marks=FAIL_ON_UNIX, + "c:\\bogus\\path\\libdwarf.yaml", spack.spec.NoSuchSpecFileError, marks=FAIL_ON_UNIX ), + pytest.param("..\\..\\libdwarf.yaml", spack.spec.NoSuchSpecFileError, marks=FAIL_ON_UNIX), + pytest.param(".\\libdwarf.yaml", spack.spec.NoSuchSpecFileError, marks=FAIL_ON_UNIX), pytest.param( "libfoo ^c:\\bogus\\path\\libdwarf.yaml", spack.spec.NoSuchSpecFileError, marks=FAIL_ON_UNIX, ), pytest.param( - "libfoo ^..\\..\\libdwarf.yaml", - spack.spec.NoSuchSpecFileError, - marks=FAIL_ON_UNIX, + "libfoo ^..\\..\\libdwarf.yaml", spack.spec.NoSuchSpecFileError, marks=FAIL_ON_UNIX ), pytest.param( - "libfoo ^.\\libdwarf.yaml", - spack.spec.NoSuchSpecFileError, - marks=FAIL_ON_UNIX, + "libfoo ^.\\libdwarf.yaml", spack.spec.NoSuchSpecFileError, marks=FAIL_ON_UNIX ), pytest.param( "c:\\bogus\\path\\libdwarf.yamlfoobar", diff --git a/lib/spack/spack/test/spec_yaml.py b/lib/spack/spack/test/spec_yaml.py index 48826dc493..ff614c0d68 100644 --- a/lib/spack/spack/test/spec_yaml.py +++ b/lib/spack/spack/test/spec_yaml.py @@ -252,13 +252,7 @@ def test_ordered_read_not_required_for_consistent_dag_hash(config, mock_packages assert spec.dag_hash() == round_trip_reversed_json_spec.dag_hash() -@pytest.mark.parametrize( - "module", - [ - spack.spec, - spack.version, - ], -) +@pytest.mark.parametrize("module", [spack.spec, spack.version]) def test_hashes_use_no_python_dicts(module): """Coarse check to make sure we don't use dicts in Spec.to_node_dict(). @@ -479,15 +473,7 @@ def test_legacy_yaml(tmpdir, install_mockery, mock_packages): ] ), ), - ( - "compiler", - collections.OrderedDict( - [ - ("name", "apple-clang"), - ("version", "13.0.0"), - ] - ), - ), + ("compiler", collections.OrderedDict([("name", "apple-clang"), ("version", "13.0.0")])), ("name", "zlib"), ("namespace", "builtin"), ( diff --git a/lib/spack/spack/test/stage.py b/lib/spack/spack/test/stage.py index 06ca3732a6..1cc1f20472 100644 --- a/lib/spack/spack/test/stage.py +++ b/lib/spack/spack/test/stage.py @@ -198,6 +198,7 @@ def tmp_build_stage_dir(tmpdir, clear_stage_root): @pytest.fixture def mock_stage_archive(tmp_build_stage_dir): """Create the directories and files for the staged mock archive.""" + # Mock up a stage area that looks like this: # # tmpdir/ test_files_dir @@ -385,7 +386,6 @@ def check_stage_dir_perms(prefix, path): @pytest.mark.usefixtures("mock_packages") class TestStage(object): - stage_name = "spack-test-stage" def test_setup_and_destroy_name_with_tmp(self, mock_stage_archive): @@ -444,7 +444,6 @@ def test_composite_stage_with_noexpand_resource( @pytest.mark.disable_clean_stage_check def test_composite_stage_with_expand_resource(self, composite_stage_with_expanding_resource): - ( composite_stage, root_stage, diff --git a/lib/spack/spack/test/test_suite.py b/lib/spack/spack/test/test_suite.py index b0e28a1474..3bebfd3da5 100644 --- a/lib/spack/spack/test/test_suite.py +++ b/lib/spack/spack/test/test_suite.py @@ -89,10 +89,7 @@ def test_test_uninstalled(mock_packages, install_mockery, mock_test_stage): @pytest.mark.parametrize( "arguments,status,msg", - [ - ({}, "SKIPPED", "Skipped"), - ({"externals": True}, "NO-TESTS", "No tests"), - ], + [({}, "SKIPPED", "Skipped"), ({"externals": True}, "NO-TESTS", "No tests")], ) def test_test_external( mock_packages, install_mockery, mock_test_stage, monkeypatch, arguments, status, msg @@ -146,7 +143,6 @@ def test_test_spec_run_once(mock_packages, install_mockery, mock_test_stage): def test_test_spec_passes(mock_packages, install_mockery, mock_test_stage, monkeypatch): - spec = spack.spec.Spec("simple-standalone-test").concretized() monkeypatch.setattr(spack.spec.Spec, "installed", _true) test_suite = spack.install_test.TestSuite([spec]) diff --git a/lib/spack/spack/test/traverse.py b/lib/spack/spack/test/traverse.py index 1334f33883..dae944ffc3 100644 --- a/lib/spack/spack/test/traverse.py +++ b/lib/spack/spack/test/traverse.py @@ -145,16 +145,7 @@ def test_breadth_first_traversal(abstract_specs_dtuse): def test_breadth_first_deptype_traversal(abstract_specs_dtuse): s = abstract_specs_dtuse["dtuse"] - names = [ - "dtuse", - "dttop", - "dtbuild1", - "dtlink1", - "dtbuild2", - "dtlink2", - "dtlink3", - "dtlink4", - ] + names = ["dtuse", "dttop", "dtbuild1", "dtlink1", "dtbuild2", "dtlink2", "dtlink3", "dtlink4"] traversal = traverse.traverse_nodes([s], order="breadth", key=id, deptype=("build", "link")) assert [x.name for x in traversal] == names @@ -243,23 +234,13 @@ def test_breadth_first_versus_depth_first_tree(abstract_specs_chain): assert [ (depth, edge.spec.name) for (depth, edge) in traverse.traverse_tree([s], cover="nodes", depth_first=False) - ] == [ - (0, "chain-a"), - (1, "chain-b"), - (1, "chain-c"), - (1, "chain-d"), - ] + ] == [(0, "chain-a"), (1, "chain-b"), (1, "chain-c"), (1, "chain-d")] # DFS will disover all nodes along the chain a -> b -> c -> d. assert [ (depth, edge.spec.name) for (depth, edge) in traverse.traverse_tree([s], cover="nodes", depth_first=True) - ] == [ - (0, "chain-a"), - (1, "chain-b"), - (2, "chain-c"), - (3, "chain-d"), - ] + ] == [(0, "chain-a"), (1, "chain-b"), (2, "chain-c"), (3, "chain-d")] # When covering all edges, we should never exceed depth 2 in BFS. assert [ @@ -402,15 +383,7 @@ def test_traverse_edges_topo(abstract_specs_toposort): # See figure above, we have 7 edges (excluding artifical ones to the root) assert set(edges) == set( - [ - ("A", "B"), - ("A", "C"), - ("B", "F"), - ("B", "G"), - ("C", "D"), - ("D", "B"), - ("E", "D"), - ] + [("A", "B"), ("A", "C"), ("B", "F"), ("B", "G"), ("C", "D"), ("D", "B"), ("E", "D")] ) # Verify that all in-edges precede all out-edges diff --git a/lib/spack/spack/test/util/elf.py b/lib/spack/spack/test/util/elf.py index aef9afeebf..b80072d015 100644 --- a/lib/spack/spack/test/util/elf.py +++ b/lib/spack/spack/test/util/elf.py @@ -29,10 +29,7 @@ def skip_unless_linux(f): @skip_unless_linux @pytest.mark.parametrize( "linker_flag,is_runpath", - [ - ("-Wl,--disable-new-dtags", False), - ("-Wl,--enable-new-dtags", True), - ], + [("-Wl,--disable-new-dtags", False), ("-Wl,--enable-new-dtags", True)], ) def test_elf_parsing_shared_linking(linker_flag, is_runpath, tmpdir): gcc = spack.util.executable.which("gcc") @@ -159,9 +156,6 @@ def test_elf_get_and_replace_rpaths(binary_with_rpaths): elf.replace_rpath_in_place_or_raise( executable, OrderedDict( - [ - (b"/short-a", b"/very/long/prefix-a"), - (b"/short-b", b"/very/long/prefix-b"), - ] + [(b"/short-a", b"/very/long/prefix-a"), (b"/short-b", b"/very/long/prefix-b")] ), ) diff --git a/lib/spack/spack/test/variant.py b/lib/spack/spack/test/variant.py index f352c43655..18daec359f 100644 --- a/lib/spack/spack/test/variant.py +++ b/lib/spack/spack/test/variant.py @@ -25,7 +25,6 @@ class TestMultiValuedVariant(object): def test_initialization(self): - # Basic properties a = MultiValuedVariant("foo", "bar,baz") assert repr(a) == "MultiValuedVariant('foo', 'bar,baz')" @@ -70,7 +69,6 @@ def test_initialization(self): assert eval(repr(d)) == a def test_satisfies(self): - a = MultiValuedVariant("foo", "bar,baz") b = MultiValuedVariant("foo", "bar") c = MultiValuedVariant("fee", "bar,baz") @@ -104,7 +102,6 @@ def test_satisfies(self): assert not d.satisfies(almost_d_bv) def test_compatible(self): - a = MultiValuedVariant("foo", "bar,baz") b = MultiValuedVariant("foo", "True") c = MultiValuedVariant("fee", "bar,baz") @@ -139,7 +136,6 @@ def test_compatible(self): assert not c.compatible(b_bv) def test_constrain(self): - # Try to constrain on a value with less constraints than self a = MultiValuedVariant("foo", "bar,baz") b = MultiValuedVariant("foo", "bar") @@ -189,7 +185,6 @@ def test_constrain(self): assert not a.constrain(d_bv) def test_yaml_entry(self): - a = MultiValuedVariant("foo", "bar,baz,barbaz") b = MultiValuedVariant("foo", "bar, baz, barbaz") expected = ("foo", sorted(["bar", "baz", "barbaz"])) @@ -205,7 +200,6 @@ def test_yaml_entry(self): class TestSingleValuedVariant(object): def test_initialization(self): - # Basic properties a = SingleValuedVariant("foo", "bar") assert repr(a) == "SingleValuedVariant('foo', 'bar')" @@ -262,7 +256,6 @@ def test_satisfies(self): assert not e.satisfies(almost_e_bv) def test_compatible(self): - a = SingleValuedVariant("foo", "bar") b = SingleValuedVariant("fee", "bar") c = SingleValuedVariant("foo", "baz") @@ -317,7 +310,6 @@ def test_compatible(self): assert not e.compatible(almost_e_bv) def test_constrain(self): - # Try to constrain on a value equal to self a = SingleValuedVariant("foo", "bar") b = SingleValuedVariant("foo", "bar") @@ -449,7 +441,6 @@ def test_satisfies(self): assert d.satisfies(d_sv) def test_compatible(self): - a = BoolValuedVariant("foo", True) b = BoolValuedVariant("fee", True) c = BoolValuedVariant("foo", False) @@ -523,7 +514,6 @@ def test_constrain(self): assert not a.constrain(v) def test_yaml_entry(self): - a = BoolValuedVariant("foo", "True") expected = ("foo", True) assert a.yaml_entry() == expected diff --git a/lib/spack/spack/test/versions.py b/lib/spack/spack/test/versions.py index 07590e89ca..586908b791 100644 --- a/lib/spack/spack/test/versions.py +++ b/lib/spack/spack/test/versions.py @@ -16,14 +16,7 @@ import spack.package_base import spack.spec -from spack.version import ( - GitVersion, - Version, - VersionBase, - VersionList, - VersionRange, - ver, -) +from spack.version import GitVersion, Version, VersionBase, VersionList, VersionRange, ver def assert_ver_lt(a, b): diff --git a/lib/spack/spack/test/web.py b/lib/spack/spack/test/web.py index ba9b1e40f1..4cc5277cd0 100644 --- a/lib/spack/spack/test/web.py +++ b/lib/spack/spack/test/web.py @@ -224,11 +224,7 @@ def test_list_url(tmpdir): class MockPages(object): def search(self, *args, **kwargs): - return [ - {"Key": "keyone"}, - {"Key": "keytwo"}, - {"Key": "keythree"}, - ] + return [{"Key": "keyone"}, {"Key": "keytwo"}, {"Key": "keythree"}] class MockPaginator(object): diff --git a/lib/spack/spack/util/elf.py b/lib/spack/spack/util/elf.py index ef19ddd341..c5b5223512 100644 --- a/lib/spack/spack/util/elf.py +++ b/lib/spack/spack/util/elf.py @@ -46,30 +46,12 @@ ProgramHeader32 = namedtuple( "ProgramHeader32", - [ - "p_type", - "p_offset", - "p_vaddr", - "p_paddr", - "p_filesz", - "p_memsz", - "p_flags", - "p_align", - ], + ["p_type", "p_offset", "p_vaddr", "p_paddr", "p_filesz", "p_memsz", "p_flags", "p_align"], ) ProgramHeader64 = namedtuple( "ProgramHeader64", - [ - "p_type", - "p_flags", - "p_offset", - "p_vaddr", - "p_paddr", - "p_filesz", - "p_memsz", - "p_align", - ], + ["p_type", "p_flags", "p_offset", "p_vaddr", "p_paddr", "p_filesz", "p_memsz", "p_align"], ) @@ -516,8 +498,7 @@ def __init__(self, old, new): self.new = new super(ElfDynamicSectionUpdateFailed, self).__init__( "New rpath {} is longer than old rpath {}".format( - new.decode("utf-8"), - old.decode("utf-8"), + new.decode("utf-8"), old.decode("utf-8") ) ) diff --git a/lib/spack/spack/util/environment.py b/lib/spack/spack/util/environment.py index 1f019cbbab..c85b882253 100644 --- a/lib/spack/spack/util/environment.py +++ b/lib/spack/spack/util/environment.py @@ -1004,12 +1004,7 @@ def _source_single_file(file_and_args, environment): # Try to source the file source_file_arguments = " ".join( - [ - source_file, - suppress_output, - concatenate_on_success, - dump_environment, - ] + [source_file, suppress_output, concatenate_on_success, dump_environment] ) output = shell(source_file_arguments, output=str, env=environment, ignore_quotes=True) return json.loads(output) diff --git a/lib/spack/spack/util/executable.py b/lib/spack/spack/util/executable.py index 35a82026ac..4e026b565c 100644 --- a/lib/spack/spack/util/executable.py +++ b/lib/spack/spack/util/executable.py @@ -196,12 +196,7 @@ def streamify(arg, mode): try: proc = subprocess.Popen( - cmd, - stdin=istream, - stderr=estream, - stdout=ostream, - env=env, - close_fds=False, + cmd, stdin=istream, stderr=estream, stdout=ostream, env=env, close_fds=False ) out, err = proc.communicate() diff --git a/lib/spack/spack/util/gcs.py b/lib/spack/spack/util/gcs.py index e1f972ff23..9feb489192 100644 --- a/lib/spack/spack/util/gcs.py +++ b/lib/spack/spack/util/gcs.py @@ -160,7 +160,6 @@ class GCSBlob(object): """ def __init__(self, url, client=None): - self.url = url if url.scheme != "gs": raise ValueError( diff --git a/lib/spack/spack/util/package_hash.py b/lib/spack/spack/util/package_hash.py index b5115f6aa6..b60a576674 100644 --- a/lib/spack/spack/util/package_hash.py +++ b/lib/spack/spack/util/package_hash.py @@ -309,10 +309,7 @@ def canonical_source(spec, filter_multimethods=True, source=None): AST if they are known statically to be unused. Supply False to disable. source (str): Optionally provide a string to read python code from. """ - return unparse( - package_ast(spec, filter_multimethods, source=source), - py_ver_consistent=True, - ) + return unparse(package_ast(spec, filter_multimethods, source=source), py_ver_consistent=True) def package_hash(spec, source=None): diff --git a/lib/spack/spack/util/spack_yaml.py b/lib/spack/spack/util/spack_yaml.py index 651713d121..84e22bee07 100644 --- a/lib/spack/spack/util/spack_yaml.py +++ b/lib/spack/spack/util/spack_yaml.py @@ -51,12 +51,7 @@ class syaml_int(int): #: mapping from syaml type -> primitive type -syaml_types = { - syaml_str: str, - syaml_int: int, - syaml_dict: dict, - syaml_list: list, -} +syaml_types = {syaml_str: str, syaml_int: int, syaml_dict: dict, syaml_list: list} markable_types = set(syaml_types) | set([yaml.comments.CommentedSeq, yaml.comments.CommentedMap]) diff --git a/lib/spack/spack/util/unparse/unparser.py b/lib/spack/spack/util/unparse/unparser.py index c24cf8ee1a..9ca8eb90a9 100644 --- a/lib/spack/spack/util/unparse/unparser.py +++ b/lib/spack/spack/util/unparse/unparser.py @@ -614,12 +614,7 @@ def _write_str_avoiding_backslashes(self, string, quote_types=_ALL_QUOTES): """Write string literal value w/a best effort attempt to avoid backslashes.""" string, quote_types = self._str_literal_helper(string, quote_types=quote_types) quote_type = quote_types[0] - self.write( - "{quote_type}{string}{quote_type}".format( - quote_type=quote_type, - string=string, - ) - ) + self.write("{quote_type}{string}{quote_type}".format(quote_type=quote_type, string=string)) # expr def visit_Bytes(self, node): @@ -664,12 +659,7 @@ def visit_JoinedStr(self, node): new_buffer.append(value) value = "".join(new_buffer) quote_type = quote_types[0] - self.write( - "{quote_type}{value}{quote_type}".format( - quote_type=quote_type, - value=value, - ) - ) + self.write("{quote_type}{value}{quote_type}".format(quote_type=quote_type, value=value)) def visit_FormattedValue(self, node): # FormattedValue(expr value, int? conversion, expr? format_spec) @@ -698,10 +688,7 @@ def _fstring_FormattedValue(self, node, write): write("{") expr = StringIO() - unparser = type(self)( - py_ver_consistent=self._py_ver_consistent, - _avoid_backslashes=True, - ) + unparser = type(self)(py_ver_consistent=self._py_ver_consistent, _avoid_backslashes=True) unparser.set_precedence(pnext(_Precedence.TEST), node.value) unparser.visit(node.value, expr) expr = expr.getvalue().rstrip("\n") @@ -940,15 +927,9 @@ def visit_Compare(self, node): self.write(" " + self.cmpops[o.__class__.__name__] + " ") self.dispatch(e) - boolops = { - "And": "and", - "Or": "or", - } + boolops = {"And": "and", "Or": "or"} - boolop_precedence = { - "and": _Precedence.AND, - "or": _Precedence.OR, - } + boolop_precedence = {"and": _Precedence.AND, "or": _Precedence.OR} def visit_BoolOp(self, node): operator = self.boolops[node.op.__class__.__name__] @@ -1224,11 +1205,7 @@ def write_key_pattern_pair(pair): with self.delimit("{", "}"): keys = node.keys - interleave( - lambda: self.write(", "), - write_key_pattern_pair, - zip(keys, node.patterns), - ) + interleave(lambda: self.write(", "), write_key_pattern_pair, zip(keys, node.patterns)) rest = node.rest if rest is not None: if keys: @@ -1252,9 +1229,7 @@ def write_attr_pattern(pair): if patterns: self.write(", ") interleave( - lambda: self.write(", "), - write_attr_pattern, - zip(attrs, node.kwd_patterns), + lambda: self.write(", "), write_attr_pattern, zip(attrs, node.kwd_patterns) ) def visit_MatchAs(self, node): diff --git a/lib/spack/spack/util/url.py b/lib/spack/spack/util/url.py index c353d21f41..cacee8f1fb 100644 --- a/lib/spack/spack/util/url.py +++ b/lib/spack/spack/util/url.py @@ -147,11 +147,7 @@ def join(base_url, path, *extra, **kwargs): last_abs_component = None scheme = "" for i in range(n - 1, -1, -1): - obj = urllib.parse.urlparse( - paths[i], - scheme="", - allow_fragments=False, - ) + obj = urllib.parse.urlparse(paths[i], scheme="", allow_fragments=False) scheme = obj.scheme @@ -161,11 +157,7 @@ def join(base_url, path, *extra, **kwargs): # Without a scheme, we have to go back looking for the # next-last component that specifies a scheme. for j in range(i - 1, -1, -1): - obj = urllib.parse.urlparse( - paths[j], - scheme="", - allow_fragments=False, - ) + obj = urllib.parse.urlparse(paths[j], scheme="", allow_fragments=False) if obj.scheme: paths[i] = "{SM}://{NL}{PATH}".format( @@ -181,11 +173,7 @@ def join(base_url, path, *extra, **kwargs): if last_abs_component is not None: paths = paths[last_abs_component:] if len(paths) == 1: - result = urllib.parse.urlparse( - paths[0], - scheme="file", - allow_fragments=False, - ) + result = urllib.parse.urlparse(paths[0], scheme="file", allow_fragments=False) # another subtlety: If the last argument to join() is an absolute # file:// URL component with a relative path, the relative path @@ -250,12 +238,7 @@ def _join(base_url, path, *extra, **kwargs): return format( urllib.parse.ParseResult( - scheme=scheme, - netloc=netloc, - path=base_path, - params=params, - query=query, - fragment=None, + scheme=scheme, netloc=netloc, path=base_path, params=params, query=query, fragment=None ) ) diff --git a/lib/spack/spack/version.py b/lib/spack/spack/version.py index f389dfc067..2048e794cc 100644 --- a/lib/spack/spack/version.py +++ b/lib/spack/spack/version.py @@ -229,11 +229,7 @@ class VersionBase(object): """ - __slots__ = [ - "version", - "separators", - "string", - ] + __slots__ = ["version", "separators", "string"] def __init__(self, string: str) -> None: if not isinstance(string, str): diff --git a/pyproject.toml b/pyproject.toml index fa7bd81d69..c469a16be4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -81,8 +81,10 @@ extend-exclude = ''' | ^opt/ )/ ''' +skip_magic_trailing_comma = true [tool.isort] +line_length = 99 profile = "black" sections = [ "FUTURE", @@ -232,4 +234,4 @@ setuptools = "pkg_resources" [tool.vendoring.license.fallback-urls] CacheControl = "https://raw.githubusercontent.com/ionrock/cachecontrol/v0.12.6/LICENSE.txt" distlib = "https://bitbucket.org/pypa/distlib/raw/master/LICENSE.txt" -webencodings = "https://github.com/SimonSapin/python-webencodings/raw/master/LICENSE" \ No newline at end of file +webencodings = "https://github.com/SimonSapin/python-webencodings/raw/master/LICENSE" diff --git a/share/spack/qa/flake8_formatter.py b/share/spack/qa/flake8_formatter.py index 93cb4cf3fb..b05dc8f4a1 100644 --- a/share/spack/qa/flake8_formatter.py +++ b/share/spack/qa/flake8_formatter.py @@ -17,14 +17,9 @@ # exemptions applied only to package.py files. r"package.py$": { # Allow 'from spack.package import *' in packages, but no other wildcards - "F403": [ - r"^from spack.package import \*$", - r"^from spack.package_defs import \*$", - ], + "F403": [r"^from spack.package import \*$", r"^from spack.package_defs import \*$"], # Exempt '@when' decorated functions from redefinition errors. - "F811": [ - r"^\s*@when\(.*\)", - ], + "F811": [r"^\s*@when\(.*\)"], }, # exemptions applied to all files. r".py$": { @@ -52,7 +47,7 @@ def __init__(self, options): self.error_seen = False super().__init__(options) - def after_init(self): # type: () -> None + def after_init(self) -> None: """Overriding to keep format string from being unset in Default""" pass @@ -65,7 +60,7 @@ def beginning(self, filename): for code, pat_arr in errors.items(): self.spack_errors[code].extend(pat_arr) - def handle(self, error): # type: (Violation) -> None + def handle(self, error: Violation) -> None: """Handle an error reported by Flake8. This defaults to calling :meth:`format`, :meth:`show_source`, and @@ -75,8 +70,6 @@ def handle(self, error): # type: (Violation) -> None :param error: This will be an instance of :class:`~flake8.style_guide.Violation`. - :type error: - flake8.style_guide.Violation """ # print(error.code) diff --git a/var/spack/repos/builtin.mock/packages/a/package.py b/var/spack/repos/builtin.mock/packages/a/package.py index 5b776dbf2b..52b02cbe64 100644 --- a/var/spack/repos/builtin.mock/packages/a/package.py +++ b/var/spack/repos/builtin.mock/packages/a/package.py @@ -16,9 +16,7 @@ class A(AutotoolsPackage): 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) 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 f910fde80f..5ae2c2c387 100644 --- a/var/spack/repos/builtin.mock/packages/attributes-foo/package.py +++ b/var/spack/repos/builtin.mock/packages/attributes-foo/package.py @@ -14,7 +14,6 @@ class AttributesFoo(BundlePackage): provides("baz") def install(self, spec, prefix): - lib_suffix = ".so" if sys.platform == "win32": lib_suffix = ".dll" 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 7252dbdeee..660fd947cf 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 @@ -30,6 +30,6 @@ class DepDiamondPatchMid2(Package): patch( "http://example.com/urlpatch.patch", sha256="mid21234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234", - ), + ) ], ) 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 ba0457103c..fdc7407d9d 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 @@ -39,14 +39,8 @@ class GitUrlTopLevel(Package): sha256="0000000000000000000000000000000000000000000000000000000000000022", url="https://www.example.com/foo2.2.tar.gz", ) - version( - "2.1", - sha256="0000000000000000000000000000000000000000000000000000000000000021", - ) - version( - "2.0", - "0000000000000000000000000000000000000000000000000000000000000020", - ) + version("2.1", sha256="0000000000000000000000000000000000000000000000000000000000000021") + version("2.0", "0000000000000000000000000000000000000000000000000000000000000020") # These result in a FetcherConflict b/c we can't tell what to use version( 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 3673385a8a..a1f439de6e 100644 --- a/var/spack/repos/builtin.mock/packages/simple-inheritance/package.py +++ b/var/spack/repos/builtin.mock/packages/simple-inheritance/package.py @@ -7,7 +7,6 @@ class BaseWithDirectives(Package): - depends_on("cmake", type="build") depends_on("mpi") variant("openblas", description="Activates openblas", default=True) diff --git a/var/spack/repos/builtin/packages/abacus/package.py b/var/spack/repos/builtin/packages/abacus/package.py index bdf2a68e50..68ee2f4894 100644 --- a/var/spack/repos/builtin/packages/abacus/package.py +++ b/var/spack/repos/builtin/packages/abacus/package.py @@ -22,22 +22,10 @@ class Abacus(MakefilePackage): url = "https://github.com/abacusmodeling/abacus-develop/archive/refs/tags/v2.2.1.tar.gz" version("develop", branch="develop") - version( - "2.2.3", - sha256="88dbf6a3bdd907df3e097637ec8e51fde13e2f5e0b44f3667443195481320edf", - ) - version( - "2.2.2", - sha256="4a7cf2ec6e43dd5c53d5f877a941367074f4714d93c1977a719782957916169e", - ) - version( - "2.2.1", - sha256="14feca1d8d1ce025d3f263b85ebfbebc1a1efff704b6490e95b07603c55c1d63", - ) - version( - "2.2.0", - sha256="09d4a2508d903121d29813a85791eeb3a905acbe1c5664b8a88903f8eda64b8f", - ) + version("2.2.3", sha256="88dbf6a3bdd907df3e097637ec8e51fde13e2f5e0b44f3667443195481320edf") + version("2.2.2", sha256="4a7cf2ec6e43dd5c53d5f877a941367074f4714d93c1977a719782957916169e") + version("2.2.1", sha256="14feca1d8d1ce025d3f263b85ebfbebc1a1efff704b6490e95b07603c55c1d63") + version("2.2.0", sha256="09d4a2508d903121d29813a85791eeb3a905acbe1c5664b8a88903f8eda64b8f") variant("openmp", default=True, description="Enable OpenMP support") @@ -53,7 +41,6 @@ class Abacus(MakefilePackage): build_directory = "source" def edit(self, spec, prefix): - if "+openmp" in spec: inc_var = "_openmp-" system_var = "ELPA_LIB = -L${ELPA_LIB_DIR} -lelpa_openmp -Wl, -rpath=${ELPA_LIB_DIR}" diff --git a/var/spack/repos/builtin/packages/abinit/package.py b/var/spack/repos/builtin/packages/abinit/package.py index fcf8207555..81a82317ba 100644 --- a/var/spack/repos/builtin/packages/abinit/package.py +++ b/var/spack/repos/builtin/packages/abinit/package.py @@ -125,7 +125,6 @@ class Abinit(AutotoolsPackage): patch("fix_for_fujitsu.v9.patch", when="@9: %fj") def configure_args(self): - spec = self.spec options = [] diff --git a/var/spack/repos/builtin/packages/ace/package.py b/var/spack/repos/builtin/packages/ace/package.py index d249cd37e2..c2a1363d29 100644 --- a/var/spack/repos/builtin/packages/ace/package.py +++ b/var/spack/repos/builtin/packages/ace/package.py @@ -22,7 +22,6 @@ class Ace(MakefilePackage): version("6.5.0", "b6f9ec922fbdcecb4348e16d851d0d1f135df1836dfe77d2e0b64295ddb83066") def edit(self, spec, prefix): - # Dictionary mapping: compiler-name : ACE config-label supported = {"intel": "_icc", "gcc": ""} diff --git a/var/spack/repos/builtin/packages/acts/package.py b/var/spack/repos/builtin/packages/acts/package.py index 6b0dcbb735..aabaf8d438 100644 --- a/var/spack/repos/builtin/packages/acts/package.py +++ b/var/spack/repos/builtin/packages/acts/package.py @@ -202,12 +202,7 @@ class Acts(CMakePackage, CudaPackage): description="Enable memory profiling using gperftools", when="@19.3:", ) - variant( - "sycl", - default=False, - description="Build the SyCL plugin", - when="@1:", - ) + variant("sycl", default=False, description="Build the SyCL plugin", when="@1:") variant("tgeo", default=False, description="Build the TGeo plugin", when="+identification") # Variants that only affect Acts examples for now @@ -241,12 +236,7 @@ class Acts(CMakePackage, CudaPackage): description="Build python bindings for the examples", when="@14: +examples", ) - variant( - "svg", - default=False, - description="Build ActSVG display plugin", - when="@20.1:", - ) + variant("svg", default=False, description="Build ActSVG display plugin", when="@20.1:") variant( "tbb", default=True, diff --git a/var/spack/repos/builtin/packages/actsvg/package.py b/var/spack/repos/builtin/packages/actsvg/package.py index c3ba3a87a9..efd7de6dfc 100644 --- a/var/spack/repos/builtin/packages/actsvg/package.py +++ b/var/spack/repos/builtin/packages/actsvg/package.py @@ -20,16 +20,8 @@ class Actsvg(CMakePackage): version("0.4.26", sha256="a1dfad15b616cac8191a355c1a87544571c36349400e3de56b9e5be6fa73714c") - variant( - "examples", - default=False, - description="Build the example applications", - ) - variant( - "meta", - default=True, - description="Build the meta level interface", - ) + variant("examples", default=False, description="Build the example applications") + variant("meta", default=True, description="Build the meta level interface") depends_on("boost +program_options", type="test") depends_on("boost +program_options", when="+examples") diff --git a/var/spack/repos/builtin/packages/adios/package.py b/var/spack/repos/builtin/packages/adios/package.py index 3fb84d099e..06e3923477 100644 --- a/var/spack/repos/builtin/packages/adios/package.py +++ b/var/spack/repos/builtin/packages/adios/package.py @@ -118,7 +118,6 @@ def validate(self, spec): raise RuntimeError(msg) def with_or_without_hdf5(self, activated): - if activated: return "--with-phdf5={0}".format(self.spec["hdf5"].prefix) diff --git a/var/spack/repos/builtin/packages/admixtools/package.py b/var/spack/repos/builtin/packages/admixtools/package.py index 8eec09aabf..f0461d8c34 100644 --- a/var/spack/repos/builtin/packages/admixtools/package.py +++ b/var/spack/repos/builtin/packages/admixtools/package.py @@ -42,7 +42,6 @@ def edit(self, spec, prefix): def install(self, spec, prefix): with working_dir("src"): - make("install") install_tree("bin", prefix.bin) install("twtable", prefix.bin) diff --git a/var/spack/repos/builtin/packages/amber/package.py b/var/spack/repos/builtin/packages/amber/package.py index 86f34f8221..cb0e552cf3 100644 --- a/var/spack/repos/builtin/packages/amber/package.py +++ b/var/spack/repos/builtin/packages/amber/package.py @@ -201,11 +201,7 @@ def install(self, spec, prefix): # Base configuration conf = Executable("./configure") - base_args = [ - "--skip-python", - "--with-netcdf", - self.spec["netcdf-fortran"].prefix, - ] + base_args = ["--skip-python", "--with-netcdf", self.spec["netcdf-fortran"].prefix] if self.spec.satisfies("~x11"): base_args += ["-noX11"] diff --git a/var/spack/repos/builtin/packages/amdfftw/package.py b/var/spack/repos/builtin/packages/amdfftw/package.py index e72148f131..6e77c5a11b 100644 --- a/var/spack/repos/builtin/packages/amdfftw/package.py +++ b/var/spack/repos/builtin/packages/amdfftw/package.py @@ -240,7 +240,6 @@ def configure(self, spec, prefix): # Different precisions must be configured and compiled one at a time configure = Executable("../configure") for precision in self.selected_precisions: - opts = (enable_precision[precision] or []) + options[:] # SIMD optimizations are available only for float and double diff --git a/var/spack/repos/builtin/packages/amrvis/package.py b/var/spack/repos/builtin/packages/amrvis/package.py index 2c1e513d53..88be340a38 100644 --- a/var/spack/repos/builtin/packages/amrvis/package.py +++ b/var/spack/repos/builtin/packages/amrvis/package.py @@ -71,10 +71,7 @@ def edit(self, spec, prefix): # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85440 if self.spec.target.family not in ["x86_64", "ppc64le"]: comps = join_path("amrex", "Tools", "GNUMake", "comps") - maks = [ - join_path(comps, "gnu.mak"), - join_path(comps, "llvm.mak"), - ] + maks = [join_path(comps, "gnu.mak"), join_path(comps, "llvm.mak")] for mak in maks: filter_file("-lquadmath", "", mak) diff --git a/var/spack/repos/builtin/packages/anaconda3/package.py b/var/spack/repos/builtin/packages/anaconda3/package.py index 15dfbc5d31..4c0196fe90 100644 --- a/var/spack/repos/builtin/packages/anaconda3/package.py +++ b/var/spack/repos/builtin/packages/anaconda3/package.py @@ -190,7 +190,6 @@ class Anaconda3(Package): ) def install(self, spec, prefix): - dir, anaconda_script = split(self.stage.archive_file) bash = which("bash") bash(anaconda_script, "-b", "-f", "-p", self.prefix) diff --git a/var/spack/repos/builtin/packages/apr-util/package.py b/var/spack/repos/builtin/packages/apr-util/package.py index ece78261c0..26a66a057c 100644 --- a/var/spack/repos/builtin/packages/apr-util/package.py +++ b/var/spack/repos/builtin/packages/apr-util/package.py @@ -35,9 +35,7 @@ class AprUtil(AutotoolsPackage): @property def libs(self): return find_libraries( - ["libaprutil-{0}".format(self.version.up_to(1))], - root=self.prefix, - recursive=True, + ["libaprutil-{0}".format(self.version.up_to(1))], root=self.prefix, recursive=True ) def configure_args(self): @@ -55,12 +53,7 @@ def configure_args(self): ] if "+crypto" in spec: - args.extend( - [ - "--with-crypto", - "--with-openssl={0}".format(spec["openssl"].prefix), - ] - ) + args.extend(["--with-crypto", "--with-openssl={0}".format(spec["openssl"].prefix)]) else: args.append("--without-crypto") @@ -77,25 +70,14 @@ def configure_args(self): if "+sqlite" in spec: if spec.satisfies("^sqlite@3.0:3"): args.extend( - [ - "--with-sqlite3={0}".format(spec["sqlite"].prefix), - "--without-sqlite2", - ] + ["--with-sqlite3={0}".format(spec["sqlite"].prefix), "--without-sqlite2"] ) elif spec.satisfies("^sqlite@2.0:2"): args.extend( - [ - "--with-sqlite2={0}".format(spec["sqlite"].prefix), - "--without-sqlite3", - ] + ["--with-sqlite2={0}".format(spec["sqlite"].prefix), "--without-sqlite3"] ) else: - args.extend( - [ - "--without-sqlite2", - "--without-sqlite3", - ] - ) + args.extend(["--without-sqlite2", "--without-sqlite3"]) if "+odbc" in spec: args.append("--with-odbc={0}".format(spec["unixodbc"].prefix)) diff --git a/var/spack/repos/builtin/packages/apr/package.py b/var/spack/repos/builtin/packages/apr/package.py index 8e4f7f9353..bfaa863442 100644 --- a/var/spack/repos/builtin/packages/apr/package.py +++ b/var/spack/repos/builtin/packages/apr/package.py @@ -23,7 +23,5 @@ class Apr(AutotoolsPackage): @property def libs(self): return find_libraries( - ["libapr-{0}".format(self.version.up_to(1))], - root=self.prefix, - recursive=True, + ["libapr-{0}".format(self.version.up_to(1))], root=self.prefix, recursive=True ) diff --git a/var/spack/repos/builtin/packages/arbor/package.py b/var/spack/repos/builtin/packages/arbor/package.py index c50c69c272..41020a3eb3 100644 --- a/var/spack/repos/builtin/packages/arbor/package.py +++ b/var/spack/repos/builtin/packages/arbor/package.py @@ -42,18 +42,12 @@ class Arbor(CMakePackage, CudaPackage): url="https://github.com/arbor-sim/arbor/releases/download/v0.5.2/arbor-v0.5.2-full.tar.gz", ) - variant( - "assertions", - default=False, - description="Enable arb_assert() assertions in code.", - ) + variant("assertions", default=False, description="Enable arb_assert() assertions in code.") variant("doc", default=False, description="Build documentation.") variant("mpi", default=False, description="Enable MPI support") variant("python", default=True, description="Enable Python frontend support") variant( - "vectorize", - default=False, - description="Enable vectorization of computational kernels", + "vectorize", default=False, description="Enable vectorization of computational kernels" ) variant( "gpu_rng", diff --git a/var/spack/repos/builtin/packages/arm-forge/package.py b/var/spack/repos/builtin/packages/arm-forge/package.py index 02147d6fd3..952b6f42b1 100644 --- a/var/spack/repos/builtin/packages/arm-forge/package.py +++ b/var/spack/repos/builtin/packages/arm-forge/package.py @@ -161,11 +161,7 @@ class ArmForge(Package): description='Detect available PMU counters via "forge-probe" during install', ) - variant( - "accept-eula", - default=False, - description="Accept the EULA", - ) + variant("accept-eula", default=False, description="Accept the EULA") # forge-probe executes with "/usr/bin/env python" depends_on("python@2.7:", type="build", when="+probe") diff --git a/var/spack/repos/builtin/packages/armpl-gcc/package.py b/var/spack/repos/builtin/packages/armpl-gcc/package.py index 045f7df8f1..7358dcd65d 100644 --- a/var/spack/repos/builtin/packages/armpl-gcc/package.py +++ b/var/spack/repos/builtin/packages/armpl-gcc/package.py @@ -208,7 +208,6 @@ def lib_suffix(self): @property def blas_libs(self): - armpl_prefix = get_armpl_prefix(self.spec) libname = "libarmpl" + self.lib_suffix diff --git a/var/spack/repos/builtin/packages/asagi/package.py b/var/spack/repos/builtin/packages/asagi/package.py index 288475326a..9ae444580d 100644 --- a/var/spack/repos/builtin/packages/asagi/package.py +++ b/var/spack/repos/builtin/packages/asagi/package.py @@ -50,7 +50,6 @@ class Asagi(CMakePackage): conflicts("%gcc@5:", when="@:1.0.0") def cmake_args(self): - link_type = self.spec.variants["link_type"].value spec = self.spec args = [ diff --git a/var/spack/repos/builtin/packages/asdcplib/package.py b/var/spack/repos/builtin/packages/asdcplib/package.py index 002c23258e..0f35b9a177 100644 --- a/var/spack/repos/builtin/packages/asdcplib/package.py +++ b/var/spack/repos/builtin/packages/asdcplib/package.py @@ -24,7 +24,6 @@ class Asdcplib(AutotoolsPackage): depends_on("openssl", type=("build", "link")) def configure_args(self): - spec = self.spec args = ["--with-openssl={0}".format(spec["openssl"].prefix)] diff --git a/var/spack/repos/builtin/packages/asio/package.py b/var/spack/repos/builtin/packages/asio/package.py index 544b264d17..f722b756cb 100644 --- a/var/spack/repos/builtin/packages/asio/package.py +++ b/var/spack/repos/builtin/packages/asio/package.py @@ -42,17 +42,9 @@ class Asio(AutotoolsPackage): description="Use the specified C++ standard when building.", ) - variant( - "separate_compilation", - default=False, - description="Compile Asio sources separately", - ) + variant("separate_compilation", default=False, description="Compile Asio sources separately") - variant( - "boost_coroutine", - default=False, - description="Enable support for Boost.Coroutine.", - ) + variant("boost_coroutine", default=False, description="Enable support for Boost.Coroutine.") depends_on("boost +context +coroutine", when="+boost_coroutine") variant("boost_regex", default=False, description="Enable support for Boost.Regex.") @@ -64,9 +56,7 @@ class Asio(AutotoolsPackage): def configure_args(self): variants = self.spec.variants - args = [ - "CXXFLAGS=-std=c++{0}".format(variants["cxxstd"].value), - ] + args = ["CXXFLAGS=-std=c++{0}".format(variants["cxxstd"].value)] if variants["separate_compilation"].value: args.append("--enable-separate-compilation") diff --git a/var/spack/repos/builtin/packages/augustus/package.py b/var/spack/repos/builtin/packages/augustus/package.py index e9796c576f..e10603e1e5 100644 --- a/var/spack/repos/builtin/packages/augustus/package.py +++ b/var/spack/repos/builtin/packages/augustus/package.py @@ -87,12 +87,7 @@ def edit(self, spec, prefix): makefiles.append("auxprogs/checkTargetSortedness/Makefile") if self.version >= Version("3.4.0"): - makefiles.extend( - [ - "auxprogs/filterBam/src/Makefile", - "src/unittests/Makefile", - ] - ) + makefiles.extend(["auxprogs/filterBam/src/Makefile", "src/unittests/Makefile"]) for makefile in makefiles: filter_file("gcc", spack_cc, makefile, string=True) diff --git a/var/spack/repos/builtin/packages/autodiff/package.py b/var/spack/repos/builtin/packages/autodiff/package.py index 0b03242f42..9e8e1ce29d 100644 --- a/var/spack/repos/builtin/packages/autodiff/package.py +++ b/var/spack/repos/builtin/packages/autodiff/package.py @@ -34,9 +34,6 @@ def cmake_args(self): args = [ self.define("AUTODIFF_BUILD_TESTS", self.run_tests), self.define_from_variant("AUTODIFF_BUILD_PYTHON", "python"), - self.define_from_variant( - "AUTODIFF_BUILD_EXAMPLES", - "examples", - ), + self.define_from_variant("AUTODIFF_BUILD_EXAMPLES", "examples"), ] return args diff --git a/var/spack/repos/builtin/packages/autogen/package.py b/var/spack/repos/builtin/packages/autogen/package.py index 2f7358b5a3..2ecc434106 100644 --- a/var/spack/repos/builtin/packages/autogen/package.py +++ b/var/spack/repos/builtin/packages/autogen/package.py @@ -32,7 +32,7 @@ def configure_args(self): args = [ # `make check` fails without this # Adding a gettext dependency does not help - "--disable-nls", + "--disable-nls" ] if "+xml" in spec: diff --git a/var/spack/repos/builtin/packages/axom/package.py b/var/spack/repos/builtin/packages/axom/package.py index d02006d433..0b8bc8e61b 100644 --- a/var/spack/repos/builtin/packages/axom/package.py +++ b/var/spack/repos/builtin/packages/axom/package.py @@ -344,8 +344,7 @@ def initconfig_hardware_entries(self): if _existing_paths: entries.append( cmake_cache_string( - "BLT_CMAKE_IMPLICIT_LINK_DIRECTORIES_EXCLUDE", - ";".join(_existing_paths), + "BLT_CMAKE_IMPLICIT_LINK_DIRECTORIES_EXCLUDE", ";".join(_existing_paths) ) ) diff --git a/var/spack/repos/builtin/packages/bacio/package.py b/var/spack/repos/builtin/packages/bacio/package.py index f699d773fb..19dbcbdf49 100644 --- a/var/spack/repos/builtin/packages/bacio/package.py +++ b/var/spack/repos/builtin/packages/bacio/package.py @@ -14,12 +14,7 @@ class Bacio(CMakePackage): homepage = "https://noaa-emc.github.io/NCEPLIBS-bacio" url = "https://github.com/NOAA-EMC/NCEPLIBS-bacio/archive/refs/tags/v2.4.1.tar.gz" - maintainers( - "t-brown", - "edwardhartnett", - "AlexanderRichert-NOAA", - "Hang-Lei-NOAA", - ) + maintainers("t-brown", "edwardhartnett", "AlexanderRichert-NOAA", "Hang-Lei-NOAA") version("2.5.0", sha256="540a0ed73941d70dbf5d7b21d5d0a441e76fad2bfe37dfdfea0db3e98fc0fbfb") diff --git a/var/spack/repos/builtin/packages/bamaddrg/package.py b/var/spack/repos/builtin/packages/bamaddrg/package.py index 0ab0a108d9..eed427a22c 100644 --- a/var/spack/repos/builtin/packages/bamaddrg/package.py +++ b/var/spack/repos/builtin/packages/bamaddrg/package.py @@ -19,6 +19,5 @@ class Bamaddrg(MakefilePackage): depends_on("bamtools", type="build") def setup_build_environment(self, env): - env.set("BAMTOOLS_ROOT", self.spec["bamtools"].prefix) env.set("PREFIX", self.prefix) diff --git a/var/spack/repos/builtin/packages/berkeleygw/package.py b/var/spack/repos/builtin/packages/berkeleygw/package.py index ba3dd3ff6d..148942b50e 100644 --- a/var/spack/repos/builtin/packages/berkeleygw/package.py +++ b/var/spack/repos/builtin/packages/berkeleygw/package.py @@ -131,7 +131,6 @@ def edit(self, spec, prefix): filter_file("Precision : 8e-15", "Precision : 9e-15", "testsuite/GaAs-EPM/GaAs.test") def build(self, spec, prefix): - buildopts = [] paraflags = [] diff --git a/var/spack/repos/builtin/packages/binutils/package.py b/var/spack/repos/builtin/packages/binutils/package.py index 48b418bd73..00e3e2dff0 100644 --- a/var/spack/repos/builtin/packages/binutils/package.py +++ b/var/spack/repos/builtin/packages/binutils/package.py @@ -168,11 +168,7 @@ def test(self): class AutotoolsBuilder(spack.build_systems.autotools.AutotoolsBuilder): def configure_args(self): - known_targets = { - "x86_64": "x86_64", - "aarch64": "aarch64", - "ppc64le": "powerpc", - } + known_targets = {"x86_64": "x86_64", "aarch64": "aarch64", "ppc64le": "powerpc"} known_platforms = {"linux": "linux-gnu", "cray": "linux-gnu", "darwin": "apple-darwin"} family = str(self.spec.target.family) diff --git a/var/spack/repos/builtin/packages/blast-plus/package.py b/var/spack/repos/builtin/packages/blast-plus/package.py index e82407eddc..1e934b93fb 100644 --- a/var/spack/repos/builtin/packages/blast-plus/package.py +++ b/var/spack/repos/builtin/packages/blast-plus/package.py @@ -84,12 +84,7 @@ def patch(self): def configure_args(self): spec = self.spec - config_args = [ - "--with-bin-release", - "--without-debug", - "--with-mt", - "--without-boost", - ] + config_args = ["--with-bin-release", "--without-debug", "--with-mt", "--without-boost"] if spec.target.family != "aarch64": config_args.append("--with-64") diff --git a/var/spack/repos/builtin/packages/blast2go/package.py b/var/spack/repos/builtin/packages/blast2go/package.py index 0eb5a505ff..e277e34d5a 100644 --- a/var/spack/repos/builtin/packages/blast2go/package.py +++ b/var/spack/repos/builtin/packages/blast2go/package.py @@ -39,12 +39,7 @@ def install(self, spec, prefix): config_input_file = "spack-config.in" - config_input_data = [ - "o\n", - prefix.bin + "\n", - "n\n", - "n\n", - ] + config_input_data = ["o\n", prefix.bin + "\n", "n\n", "n\n"] with open(config_input_file, "w") as f: f.writelines(config_input_data) diff --git a/var/spack/repos/builtin/packages/blaze/package.py b/var/spack/repos/builtin/packages/blaze/package.py index 0e6abb6b79..0dfef19fe1 100644 --- a/var/spack/repos/builtin/packages/blaze/package.py +++ b/var/spack/repos/builtin/packages/blaze/package.py @@ -96,12 +96,9 @@ def cmake_args(self): self.define("BLAZE_SHARED_MEMORY_PARALLELIZATION", True), self.define( "BLAZE_SMP_THREADS", - { - "openmp": "OpenMP", - "cpp11": "C++11", - "boost": "Boost", - "hpx": "HPX", - }[self.spec.variants["smp"].value], + {"openmp": "OpenMP", "cpp11": "C++11", "boost": "Boost", "hpx": "HPX"}[ + self.spec.variants["smp"].value + ], ), ] ) diff --git a/var/spack/repos/builtin/packages/bohrium/package.py b/var/spack/repos/builtin/packages/bohrium/package.py index 65b9e06590..1ea1e30321 100644 --- a/var/spack/repos/builtin/packages/bohrium/package.py +++ b/var/spack/repos/builtin/packages/bohrium/package.py @@ -143,10 +143,7 @@ def cmake_args(self): # # Vector engines # - args += [ - "-DVE_OPENCL=" + str("+opencl" in spec), - "-DVE_CUDA=" + str("+cuda" in spec), - ] + args += ["-DVE_OPENCL=" + str("+opencl" in spec), "-DVE_CUDA=" + str("+cuda" in spec)] if "+openmp" in spec: args += [ diff --git a/var/spack/repos/builtin/packages/bowtie2/package.py b/var/spack/repos/builtin/packages/bowtie2/package.py index fc63f914fd..125db4e09e 100644 --- a/var/spack/repos/builtin/packages/bowtie2/package.py +++ b/var/spack/repos/builtin/packages/bowtie2/package.py @@ -47,9 +47,7 @@ def edit(self, spec, prefix): match = "^#!/usr/bin/env perl" perl = spec["perl"].command substitute = "#!{perl}".format(perl=perl) - files = [ - "bowtie2", - ] + files = ["bowtie2"] filter_file(match, substitute, *files, **kwargs) match = "^#!/usr/bin/env python.*" diff --git a/var/spack/repos/builtin/packages/bubblewrap/package.py b/var/spack/repos/builtin/packages/bubblewrap/package.py index 06ebc03578..334ccea698 100644 --- a/var/spack/repos/builtin/packages/bubblewrap/package.py +++ b/var/spack/repos/builtin/packages/bubblewrap/package.py @@ -26,11 +26,7 @@ class Bubblewrap(AutotoolsPackage): version("0.3.1", sha256="deca6b608c54df4be0669b8bb6d254858924588e9f86e116eb04656a3b6d4bf8") def configure_args(self): - return [ - "--disable-sudo", - "--disable-man", - "--without-bash-completion-dir", - ] + return ["--disable-sudo", "--disable-man", "--without-bash-completion-dir"] depends_on("pkgconfig", type="build") depends_on("libcap") diff --git a/var/spack/repos/builtin/packages/buddy/package.py b/var/spack/repos/builtin/packages/buddy/package.py index abc36f2e88..243d8a21f1 100644 --- a/var/spack/repos/builtin/packages/buddy/package.py +++ b/var/spack/repos/builtin/packages/buddy/package.py @@ -20,7 +20,5 @@ class Buddy(AutotoolsPackage): def configure_args(self): if platform.machine() == "aarch64": - config_args = [ - "--build=aarch64-unknown-linux-gnu", - ] + config_args = ["--build=aarch64-unknown-linux-gnu"] return config_args diff --git a/var/spack/repos/builtin/packages/bufr/package.py b/var/spack/repos/builtin/packages/bufr/package.py index 603fbcdaa0..29953734c7 100644 --- a/var/spack/repos/builtin/packages/bufr/package.py +++ b/var/spack/repos/builtin/packages/bufr/package.py @@ -17,13 +17,7 @@ class Bufr(CMakePackage): homepage = "https://noaa-emc.github.io/NCEPLIBS-bufr" url = "https://github.com/NOAA-EMC/NCEPLIBS-bufr/archive/refs/tags/bufr_v11.5.0.tar.gz" - maintainers( - "t-brown", - "AlexanderRichert-NOAA", - "edwardhartnett", - "Hang-Lei-NOAA", - "jbathegit", - ) + maintainers("t-brown", "AlexanderRichert-NOAA", "edwardhartnett", "Hang-Lei-NOAA", "jbathegit") version("11.7.1", sha256="6533ce6eaa6b02c0cb5424cfbc086ab120ccebac3894980a4daafd4dfadd71f8") version("11.7.0", sha256="6a76ae8e7682bbc790321bf80c2f9417775c5b01a5c4f10763df92e01b20b9ca") diff --git a/var/spack/repos/builtin/packages/camx/package.py b/var/spack/repos/builtin/packages/camx/package.py index 132a68310d..ebc9591156 100644 --- a/var/spack/repos/builtin/packages/camx/package.py +++ b/var/spack/repos/builtin/packages/camx/package.py @@ -124,10 +124,7 @@ def build_targets(self): # Set MPI. if "+mpi" in self.spec: mpi = self.spec["mpi"] - args += [ - "MPI={0}".format(mpi.name), - "MPI_INST={0}".format(mpi.prefix), - ] + args += ["MPI={0}".format(mpi.name), "MPI_INST={0}".format(mpi.prefix)] return args def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/cantera/package.py b/var/spack/repos/builtin/packages/cantera/package.py index d89533171f..09ee90e627 100644 --- a/var/spack/repos/builtin/packages/cantera/package.py +++ b/var/spack/repos/builtin/packages/cantera/package.py @@ -135,17 +135,11 @@ def build_args(self, spec, prefix): # Python module if "+python" in spec: args.extend( - [ - "python_package=full", - "python_cmd={0}".format(spec["python"].command.path), - ] + ["python_package=full", "python_cmd={0}".format(spec["python"].command.path)] ) if spec["python"].satisfies("@3:"): args.extend( - [ - "python3_package=y", - "python3_cmd={0}".format(spec["python"].command.path), - ] + ["python3_package=y", "python3_cmd={0}".format(spec["python"].command.path)] ) else: args.append("python3_package=n") diff --git a/var/spack/repos/builtin/packages/cbtf-lanl/package.py b/var/spack/repos/builtin/packages/cbtf-lanl/package.py index 4e521a653f..6a51853722 100644 --- a/var/spack/repos/builtin/packages/cbtf-lanl/package.py +++ b/var/spack/repos/builtin/packages/cbtf-lanl/package.py @@ -60,7 +60,6 @@ class CbtfLanl(CMakePackage): build_directory = "build_cbtf_lanl" def cmake_args(self): - spec = self.spec compile_flags = "-O2 -g -Wall" diff --git a/var/spack/repos/builtin/packages/cbtf/package.py b/var/spack/repos/builtin/packages/cbtf/package.py index 3783b8c5cb..86153ae645 100644 --- a/var/spack/repos/builtin/packages/cbtf/package.py +++ b/var/spack/repos/builtin/packages/cbtf/package.py @@ -66,7 +66,6 @@ class Cbtf(CMakePackage): build_directory = "build_cbtf" def cmake_args(self): - spec = self.spec # Boost_NO_SYSTEM_PATHS Set to TRUE to suppress searching @@ -77,7 +76,6 @@ def cmake_args(self): compile_flags = "-O2 -g -Wall" if spec.satisfies("+runtime"): - # Install message tag include file for use in Intel MIC # cbtf-krell build # FIXME diff --git a/var/spack/repos/builtin/packages/chameleon/package.py b/var/spack/repos/builtin/packages/chameleon/package.py index 19b8656bf5..d5539e91f1 100644 --- a/var/spack/repos/builtin/packages/chameleon/package.py +++ b/var/spack/repos/builtin/packages/chameleon/package.py @@ -71,7 +71,6 @@ class Chameleon(CMakePackage, CudaPackage): depends_on("lapack") def cmake_args(self): - spec = self.spec args = [ "-Wno-dev", diff --git a/var/spack/repos/builtin/packages/charmpp/package.py b/var/spack/repos/builtin/packages/charmpp/package.py index 8825968fcd..91876fbb13 100644 --- a/var/spack/repos/builtin/packages/charmpp/package.py +++ b/var/spack/repos/builtin/packages/charmpp/package.py @@ -226,7 +226,6 @@ def charmarch(self): # build-target=LIBS backend={0}'.format(b)) def install(self, spec, prefix): - if not ("backend=mpi" in self.spec) or not ("backend=netlrts" in self.spec): if "+pthreads" in self.spec: raise InstallError( diff --git a/var/spack/repos/builtin/packages/chemfiles/package.py b/var/spack/repos/builtin/packages/chemfiles/package.py index 0ce47ae8ae..99bb725e37 100644 --- a/var/spack/repos/builtin/packages/chemfiles/package.py +++ b/var/spack/repos/builtin/packages/chemfiles/package.py @@ -21,7 +21,5 @@ class Chemfiles(CMakePackage): variant("shared", default=False, description="Build shared libraries") def cmake_args(self): - args = [ - self.define_from_variant("BUILD_SHARED_LIBS", "shared"), - ] + args = [self.define_from_variant("BUILD_SHARED_LIBS", "shared")] return args diff --git a/var/spack/repos/builtin/packages/cli11/package.py b/var/spack/repos/builtin/packages/cli11/package.py index d90f31a968..12fb3a07ea 100644 --- a/var/spack/repos/builtin/packages/cli11/package.py +++ b/var/spack/repos/builtin/packages/cli11/package.py @@ -23,9 +23,5 @@ class Cli11(CMakePackage): depends_on("cmake@3.4:", type="build") def cmake_args(self): - args = [ - "-DCLI11_BUILD_EXAMPLES=OFF", - "-DCLI11_BUILD_DOCS=OFF", - "-DCLI11_BUILD_TESTS=OFF", - ] + args = ["-DCLI11_BUILD_EXAMPLES=OFF", "-DCLI11_BUILD_DOCS=OFF", "-DCLI11_BUILD_TESTS=OFF"] return args diff --git a/var/spack/repos/builtin/packages/clingo-bootstrap/package.py b/var/spack/repos/builtin/packages/clingo-bootstrap/package.py index c83059dc09..0d2914ae7d 100644 --- a/var/spack/repos/builtin/packages/clingo-bootstrap/package.py +++ b/var/spack/repos/builtin/packages/clingo-bootstrap/package.py @@ -54,7 +54,7 @@ def cmake_args(self): args.extend( [ # Avoid building the clingo executable - self.define("CLINGO_BUILD_APPS", "OFF"), + self.define("CLINGO_BUILD_APPS", "OFF") ] ) return args diff --git a/var/spack/repos/builtin/packages/cni-plugins/package.py b/var/spack/repos/builtin/packages/cni-plugins/package.py index 664b3b952c..06959db972 100644 --- a/var/spack/repos/builtin/packages/cni-plugins/package.py +++ b/var/spack/repos/builtin/packages/cni-plugins/package.py @@ -21,7 +21,6 @@ class CniPlugins(Package): def install(self, spec, prefix): utils = "github.com/containernetworking/plugins/pkg/utils/buildversion" which("./build_linux.sh")( - "-ldflags", - "-extldflags -static -X {0}.BuildVersion={1}".format(utils, self.version), + "-ldflags", "-extldflags -static -X {0}.BuildVersion={1}".format(utils, self.version) ) install_tree("bin", prefix.bin) diff --git a/var/spack/repos/builtin/packages/corenlp/package.py b/var/spack/repos/builtin/packages/corenlp/package.py index 6ab9051959..9aa82e1d6c 100644 --- a/var/spack/repos/builtin/packages/corenlp/package.py +++ b/var/spack/repos/builtin/packages/corenlp/package.py @@ -23,9 +23,7 @@ class Corenlp(Package): version("4.0.0", sha256="07195eed46dd39bdc364d3988da8ec6a5fc9fed8c17613cfe5a8b84d649c8f0f") - resources = [ - ("4.0.0", "f45bde062fb368d72f7d3c7ac1ddc6cfb61d3badc1152572bde17f1a5ed9ec94"), - ] + resources = [("4.0.0", "f45bde062fb368d72f7d3c7ac1ddc6cfb61d3badc1152572bde17f1a5ed9ec94")] for ver, checksum in resources: jarfile = "stanford-corenlp-{0}-models.jar".format(ver) resource( diff --git a/var/spack/repos/builtin/packages/cosma/package.py b/var/spack/repos/builtin/packages/cosma/package.py index c24d3a2805..04c126f439 100644 --- a/var/spack/repos/builtin/packages/cosma/package.py +++ b/var/spack/repos/builtin/packages/cosma/package.py @@ -72,7 +72,7 @@ def cosma_blas_cmake_arg(self): [("^blis", "BLIS"), ("^amdblis", "BLIS"), ("^atlas", "ATLAS")] ) - for (query, cmake_arg) in query_to_cmake_arg: + for query, cmake_arg in query_to_cmake_arg: if query in self.spec: return cmake_arg diff --git a/var/spack/repos/builtin/packages/cosmomc/package.py b/var/spack/repos/builtin/packages/cosmomc/package.py index 5b0754a5b0..619a58fe37 100644 --- a/var/spack/repos/builtin/packages/cosmomc/package.py +++ b/var/spack/repos/builtin/packages/cosmomc/package.py @@ -174,13 +174,7 @@ def check_install(self): exe = join_path(spec["mpi"].prefix.bin, "mpiexec") cosmomc = Executable(exe) with working_dir("spack-check", create=True): - for entry in [ - "camb", - "chains", - "data", - "paramnames", - "planck_covmats", - ]: + for entry in ["camb", "chains", "data", "paramnames", "planck_covmats"]: os.symlink(join_path(prefix.share, "cosmomc", entry), entry) inifile = join_path(prefix.share, "cosmomc", "test.ini") cosmomc(*(args + [inifile])) diff --git a/var/spack/repos/builtin/packages/costa/package.py b/var/spack/repos/builtin/packages/costa/package.py index 369bd27a20..48a6fb8ec9 100644 --- a/var/spack/repos/builtin/packages/costa/package.py +++ b/var/spack/repos/builtin/packages/costa/package.py @@ -13,11 +13,7 @@ class Costa(CMakePackage): Based on the paper: https://arxiv.org/abs/2106.06601 """ - maintainers( - "haampie", - "kabicm", - "RMeli", - ) + maintainers("haampie", "kabicm", "RMeli") homepage = "https://github.com/eth-cscs/COSTA" git = "https://github.com/eth-cscs/COSTA.git" diff --git a/var/spack/repos/builtin/packages/cp2k/package.py b/var/spack/repos/builtin/packages/cp2k/package.py index 43b0d8ecfc..d4a808c91c 100644 --- a/var/spack/repos/builtin/packages/cp2k/package.py +++ b/var/spack/repos/builtin/packages/cp2k/package.py @@ -301,16 +301,8 @@ def edit(self, spec, prefix): fftw_header_dir = fftw.headers.directories[0] optimization_flags = { - "gcc": [ - "-O2", - "-funroll-loops", - "-ftree-vectorize", - ], - "intel": [ - "-O2", - "-pc64", - "-unroll", - ], + "gcc": ["-O2", "-funroll-loops", "-ftree-vectorize"], + "intel": ["-O2", "-pc64", "-unroll"], "pgi": ["-fast"], "nvhpc": ["-fast"], "cce": ["-O2"], @@ -319,10 +311,7 @@ def edit(self, spec, prefix): } dflags = ["-DNDEBUG"] - cppflags = [ - "-D__FFTW3", - "-I{0}".format(fftw_header_dir), - ] + cppflags = ["-D__FFTW3", "-I{0}".format(fftw_header_dir)] # CP2K requires MPI 3 starting at version 2023.1 # and __MPI_VERSION is not supported anymore. @@ -347,12 +336,7 @@ def edit(self, spec, prefix): if "%intel" in spec: cflags.append("-fp-model precise") cxxflags.append("-fp-model precise") - fcflags += [ - "-fp-model precise", - "-heap-arrays 64", - "-g", - "-traceback", - ] + fcflags += ["-fp-model precise", "-heap-arrays 64", "-g", "-traceback"] elif "%gcc" in spec: fcflags += [ "-ffree-form", @@ -360,10 +344,7 @@ def edit(self, spec, prefix): "-ggdb", # make sure we get proper Fortran backtraces ] elif "%aocc" in spec: - fcflags += [ - "-ffree-form", - "-Mbackslash", - ] + fcflags += ["-ffree-form", "-Mbackslash"] elif "%pgi" in spec or "%nvhpc" in spec: fcflags += ["-Mfreeform", "-Mextend"] elif "%cce" in spec: @@ -411,13 +392,7 @@ def edit(self, spec, prefix): # Intel if "%intel" in spec: - cppflags.extend( - [ - "-D__INTEL", - "-D__HAS_ISO_C_BINDING", - "-D__USE_CP2K_TRACE", - ] - ) + cppflags.extend(["-D__INTEL", "-D__HAS_ISO_C_BINDING", "-D__USE_CP2K_TRACE"]) fcflags.extend(["-diag-disable 8290,8291,10010,10212,11060", "-free", "-fpp"]) # FFTW, LAPACK, BLAS @@ -478,10 +453,7 @@ def edit(self, spec, prefix): cppflags += ["-D__LIBINT"] if "@:6.9" in spec: - cppflags += [ - "-D__LIBINT_MAX_AM=6", - "-D__LIBDERIV_MAX_AM1=5", - ] + cppflags += ["-D__LIBINT_MAX_AM=6", "-D__LIBDERIV_MAX_AM1=5"] # libint-1.x.y has to be linked statically to work around # inconsistencies in its Fortran interface definition @@ -593,11 +565,7 @@ def edit(self, spec, prefix): acc_compiler_var = "OFFLOAD_CC" acc_flags_var = "OFFLOAD_FLAGS" - cppflags += [ - "-D__DBCSR_ACC", - "-D__GRID_CUDA", - "-DOFFLOAD_TARGET=cuda", - ] + cppflags += ["-D__DBCSR_ACC", "-D__GRID_CUDA", "-DOFFLOAD_TARGET=cuda"] libs += ["-lcublas"] if spec.satisfies("+cuda_fft"): @@ -624,12 +592,7 @@ def edit(self, spec, prefix): cuda_arch = spec.variants["cuda_arch"].value[0] if cuda_arch: - gpuver = { - "35": "K40", - "37": "K80", - "60": "P100", - "70": "V100", - }[cuda_arch] + gpuver = {"35": "K40", "37": "K80", "60": "P100", "70": "V100"}[cuda_arch] if cuda_arch == "35" and spec.satisfies("+cuda_arch_35_k20x"): gpuver = "K20X" @@ -649,12 +612,7 @@ def edit(self, spec, prefix): "The file LIBSMM_PATH pointed to does not " "exist. Note that it must be absolute path." ) - cppflags.extend( - [ - "-D__HAS_smm_dnn", - "-D__HAS_smm_vec", - ] - ) + cppflags.extend(["-D__HAS_smm_dnn", "-D__HAS_smm_vec"]) libs.append("-lsmm") elif "smm=libxsmm" in spec: diff --git a/var/spack/repos/builtin/packages/cray-fftw/package.py b/var/spack/repos/builtin/packages/cray-fftw/package.py index 2971f18932..fd29b14938 100644 --- a/var/spack/repos/builtin/packages/cray-fftw/package.py +++ b/var/spack/repos/builtin/packages/cray-fftw/package.py @@ -51,15 +51,11 @@ def install(self, spec, prefix): @property def libs(self): - # Reduce repetitions of entries query_parameters = list(llnl.util.lang.dedupe(self.spec.last_query.extra_parameters)) # List of all the suffixes associated with float precisions - precisions = [ - ("float", "f"), - ("double", ""), - ] + precisions = [("float", "f"), ("double", "")] # Retrieve the correct suffixes, or use double as a default suffixes = [v for k, v in precisions if k in query_parameters] or [""] diff --git a/var/spack/repos/builtin/packages/crtm-fix/package.py b/var/spack/repos/builtin/packages/crtm-fix/package.py index a44f40a935..1508ee81e2 100644 --- a/var/spack/repos/builtin/packages/crtm-fix/package.py +++ b/var/spack/repos/builtin/packages/crtm-fix/package.py @@ -15,11 +15,7 @@ class CrtmFix(Package): url = "ftp://ftp.ssec.wisc.edu/pub/s4/CRTM/fix_REL-2.3.0_emc.tgz" maintainers( - "BenjaminTJohnson", - "edwardhartnett", - "AlexanderRichert-NOAA", - "Hang-Lei-NOAA", - "climbfuji", + "BenjaminTJohnson", "edwardhartnett", "AlexanderRichert-NOAA", "Hang-Lei-NOAA", "climbfuji" ) version("2.4.0_emc", sha256="88d659ae5bc4434f7fafa232ff65b4c48442d2d1a25f8fc96078094fa572ac1a") diff --git a/var/spack/repos/builtin/packages/crtm/package.py b/var/spack/repos/builtin/packages/crtm/package.py index 3524d7da79..5e22a5faf2 100644 --- a/var/spack/repos/builtin/packages/crtm/package.py +++ b/var/spack/repos/builtin/packages/crtm/package.py @@ -26,9 +26,7 @@ class Crtm(CMakePackage): ) variant( - "fix", - default=False, - description='Download CRTM coeffecient or "fix" files (several GBs).', + "fix", default=False, description='Download CRTM coeffecient or "fix" files (several GBs).' ) variant( "build_type", diff --git a/var/spack/repos/builtin/packages/curl/package.py b/var/spack/repos/builtin/packages/curl/package.py index 64b1d47f14..aae1ab74ad 100644 --- a/var/spack/repos/builtin/packages/curl/package.py +++ b/var/spack/repos/builtin/packages/curl/package.py @@ -130,11 +130,7 @@ class Curl(NMakePackage, AutotoolsPackage): # https://github.com/curl/curl/pull/9054 patch("easy-lock-sched-header.patch", when="@7.84.0") - build_system( - "autotools", - conditional("nmake", when="platform=windows"), - default="autotools", - ) + build_system("autotools", conditional("nmake", when="platform=windows"), default="autotools") @classmethod def determine_version(cls, exe): @@ -189,13 +185,7 @@ def configure_args(self): # Make gnutls / openssl decide what certs are trusted. # TODO: certs for other tls options. if spec.satisfies("tls=gnutls") or spec.satisfies("tls=openssl"): - args.extend( - [ - "--without-ca-bundle", - "--without-ca-path", - "--with-ca-fallback", - ] - ) + args.extend(["--without-ca-bundle", "--without-ca-path", "--with-ca-fallback"]) # https://daniel.haxx.se/blog/2021/06/07/bye-bye-metalink-in-curl/ # We always disable it explicitly, but the flag is gone in newer diff --git a/var/spack/repos/builtin/packages/cutensor/package.py b/var/spack/repos/builtin/packages/cutensor/package.py index e77b799af5..15bc9fc22a 100644 --- a/var/spack/repos/builtin/packages/cutensor/package.py +++ b/var/spack/repos/builtin/packages/cutensor/package.py @@ -13,7 +13,7 @@ "Linux-x86_64": "4fdebe94f0ba3933a422cff3dd05a0ef7a18552ca274dd12564056993f55471d", "Linux-ppc64le": "ad736acc94e88673b04a3156d7d3a408937cac32d083acdfbd8435582cbe15db", "Linux-aarch64": "5b9ac479b1dadaf40464ff3076e45f2ec92581c07df1258a155b5bcd142f6090", - }, + } } diff --git a/var/spack/repos/builtin/packages/dakota/package.py b/var/spack/repos/builtin/packages/dakota/package.py index 64f6a5b59a..4d302d05c4 100644 --- a/var/spack/repos/builtin/packages/dakota/package.py +++ b/var/spack/repos/builtin/packages/dakota/package.py @@ -56,9 +56,7 @@ class Dakota(CMakePackage): def cmake_args(self): spec = self.spec - args = [ - self.define_from_variant("BUILD_SHARED_LIBS", "shared"), - ] + args = [self.define_from_variant("BUILD_SHARED_LIBS", "shared")] if "+mpi" in spec: args.extend( diff --git a/var/spack/repos/builtin/packages/damaris/package.py b/var/spack/repos/builtin/packages/damaris/package.py index 890015f244..413e3a4453 100644 --- a/var/spack/repos/builtin/packages/damaris/package.py +++ b/var/spack/repos/builtin/packages/damaris/package.py @@ -56,7 +56,6 @@ class Damaris(CMakePackage): depends_on("boost+thread+log+filesystem+date_time+python+numpy @1.67:", when="+python") def cmake_args(self): - args = [] if not self.spec.variants["static"].value: args.extend(["-DBUILD_SHARED_LIBS=ON"]) diff --git a/var/spack/repos/builtin/packages/darshan-runtime/package.py b/var/spack/repos/builtin/packages/darshan-runtime/package.py index ae0f66293a..f3eff99a7f 100644 --- a/var/spack/repos/builtin/packages/darshan-runtime/package.py +++ b/var/spack/repos/builtin/packages/darshan-runtime/package.py @@ -25,18 +25,9 @@ class DarshanRuntime(AutotoolsPackage): test_requires_compiler = True version("main", branch="main", submodules=True) - version( - "3.4.2", - sha256="b095c3b7c059a8eba4beb03ec092b60708780a3cae3fc830424f6f9ada811c6b", - ) - version( - "3.4.1", - sha256="77c0a4675d94a0f9df5710e5b8658cc9ef0f0981a6dafb114d0389b1af64774c", - ) - version( - "3.4.0", - sha256="7cc88b7c130ec3b574f6b73c63c3c05deec67b1350245de6d39ca91d4cff0842", - ) + version("3.4.2", sha256="b095c3b7c059a8eba4beb03ec092b60708780a3cae3fc830424f6f9ada811c6b") + version("3.4.1", sha256="77c0a4675d94a0f9df5710e5b8658cc9ef0f0981a6dafb114d0389b1af64774c") + version("3.4.0", sha256="7cc88b7c130ec3b574f6b73c63c3c05deec67b1350245de6d39ca91d4cff0842") version( "3.4.0-pre1", sha256="57d0fd40329b9f8a51bdc9d7635b646692b341d80339115ab203357321706c09" ) diff --git a/var/spack/repos/builtin/packages/darshan-util/package.py b/var/spack/repos/builtin/packages/darshan-util/package.py index 3ed550c0f6..f66504765d 100644 --- a/var/spack/repos/builtin/packages/darshan-util/package.py +++ b/var/spack/repos/builtin/packages/darshan-util/package.py @@ -21,18 +21,9 @@ class DarshanUtil(AutotoolsPackage): tags = ["e4s"] version("main", branch="main", submodules="True") - version( - "3.4.2", - sha256="b095c3b7c059a8eba4beb03ec092b60708780a3cae3fc830424f6f9ada811c6b", - ) - version( - "3.4.1", - sha256="77c0a4675d94a0f9df5710e5b8658cc9ef0f0981a6dafb114d0389b1af64774c", - ) - version( - "3.4.0", - sha256="7cc88b7c130ec3b574f6b73c63c3c05deec67b1350245de6d39ca91d4cff0842", - ) + version("3.4.2", sha256="b095c3b7c059a8eba4beb03ec092b60708780a3cae3fc830424f6f9ada811c6b") + version("3.4.1", sha256="77c0a4675d94a0f9df5710e5b8658cc9ef0f0981a6dafb114d0389b1af64774c") + version("3.4.0", sha256="7cc88b7c130ec3b574f6b73c63c3c05deec67b1350245de6d39ca91d4cff0842") version( "3.4.0-pre1", sha256="57d0fd40329b9f8a51bdc9d7635b646692b341d80339115ab203357321706c09" ) diff --git a/var/spack/repos/builtin/packages/dbcsr/package.py b/var/spack/repos/builtin/packages/dbcsr/package.py index b15db887f4..0da4477fad 100644 --- a/var/spack/repos/builtin/packages/dbcsr/package.py +++ b/var/spack/repos/builtin/packages/dbcsr/package.py @@ -124,12 +124,7 @@ def cmake_args(self): if self.spec.satisfies("+cuda"): cuda_arch = self.spec.variants["cuda_arch"].value[0] - gpu_map = { - "35": "K40", - "37": "K80", - "60": "P100", - "70": "V100", - } + gpu_map = {"35": "K40", "37": "K80", "60": "P100", "70": "V100"} if "@2.3:" in spec: gpu_map["80"] = "A100" diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index 5ba96c97b9..0aa6b35a3c 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -611,17 +611,9 @@ def cmake_args(self): # As a final step, collect CXX flags that may have been # added anywhere above: if len(cxx_flags_release) > 0 and "+optflags" in spec: - options.extend( - [ - self.define("CMAKE_CXX_FLAGS_RELEASE", " ".join(cxx_flags_release)), - ] - ) + options.extend([self.define("CMAKE_CXX_FLAGS_RELEASE", " ".join(cxx_flags_release))]) if len(cxx_flags) > 0: - options.extend( - [ - self.define("CMAKE_CXX_FLAGS", " ".join(cxx_flags)), - ] - ) + options.extend([self.define("CMAKE_CXX_FLAGS", " ".join(cxx_flags))]) # Add flags for machine vectorization, used when tutorials # and user code is built. diff --git a/var/spack/repos/builtin/packages/deconseq-standalone/package.py b/var/spack/repos/builtin/packages/deconseq-standalone/package.py index cdaf0ec257..f0904eb544 100644 --- a/var/spack/repos/builtin/packages/deconseq-standalone/package.py +++ b/var/spack/repos/builtin/packages/deconseq-standalone/package.py @@ -18,7 +18,6 @@ class DeconseqStandalone(Package): depends_on("perl@5:") def install(self, spec, prefix): - filter_file(r"#!/usr/bin/perl", "#!/usr/bin/env perl", "deconseq.pl") filter_file(r"#!/usr/bin/perl", "#!/usr/bin/env perl", "splitFasta.pl") diff --git a/var/spack/repos/builtin/packages/dia/package.py b/var/spack/repos/builtin/packages/dia/package.py index a88a9ebf22..c5b78a091a 100644 --- a/var/spack/repos/builtin/packages/dia/package.py +++ b/var/spack/repos/builtin/packages/dia/package.py @@ -40,7 +40,6 @@ def url_for_version(self, version): ) def install(self, spec, prefix): - # configure, build, install: options = [ "--prefix=%s" % prefix, diff --git a/var/spack/repos/builtin/packages/dihydrogen/package.py b/var/spack/repos/builtin/packages/dihydrogen/package.py index a8e853a95d..67c5544525 100644 --- a/var/spack/repos/builtin/packages/dihydrogen/package.py +++ b/var/spack/repos/builtin/packages/dihydrogen/package.py @@ -129,14 +129,7 @@ class Dihydrogen(CMakePackage, CudaPackage, ROCmPackage): # Idenfity versions of cuda_arch that are too old # from lib/spack/spack/build_systems/cuda.py - illegal_cuda_arch_values = [ - "10", - "11", - "12", - "13", - "20", - "21", - ] + illegal_cuda_arch_values = ["10", "11", "12", "13", "20", "21"] for value in illegal_cuda_arch_values: conflicts("cuda_arch=" + value) @@ -216,11 +209,7 @@ def cmake_args(self): ] ) if "platform=cray" in spec: - args.extend( - [ - "-DMPI_ASSUME_NO_BUILTIN_MPI=ON", - ] - ) + args.extend(["-DMPI_ASSUME_NO_BUILTIN_MPI=ON"]) archs = self.spec.variants["amdgpu_target"].value if archs != "none": arch_str = ",".join(archs) diff --git a/var/spack/repos/builtin/packages/dmlc-core/package.py b/var/spack/repos/builtin/packages/dmlc-core/package.py index 24c6797019..333e80d089 100644 --- a/var/spack/repos/builtin/packages/dmlc-core/package.py +++ b/var/spack/repos/builtin/packages/dmlc-core/package.py @@ -32,6 +32,4 @@ def patch(self): ) def cmake_args(self): - return [ - self.define_from_variant("USE_OPENMP", "openmp"), - ] + return [self.define_from_variant("USE_OPENMP", "openmp")] diff --git a/var/spack/repos/builtin/packages/docbook-xml/package.py b/var/spack/repos/builtin/packages/docbook-xml/package.py index a3fb9573fe..8434340af1 100644 --- a/var/spack/repos/builtin/packages/docbook-xml/package.py +++ b/var/spack/repos/builtin/packages/docbook-xml/package.py @@ -340,15 +340,7 @@ def config_docbook(self): ) # map all versions to current version - dtversions = [ - "4.1", - "4.1.1", - "4.1.2", - "4.2", - "4.3", - "4.4", - "4.5", - ] + dtversions = ["4.1", "4.1.1", "4.1.2", "4.2", "4.3", "4.4", "4.5"] for dtversion in dtversions: xmlcatalog( "--noout", diff --git a/var/spack/repos/builtin/packages/dock/package.py b/var/spack/repos/builtin/packages/dock/package.py index bfa34492ae..3d69f99dc2 100644 --- a/var/spack/repos/builtin/packages/dock/package.py +++ b/var/spack/repos/builtin/packages/dock/package.py @@ -33,12 +33,7 @@ def setup_build_environment(self, env): env.set("MPICH_HOME", self.spec["mpi"].prefix) def install(self, spec, prefix): - compiler_targets = { - "gcc": "gnu", - "intel": "intel", - "pgi": "pgi", - "sgi": "sgi", - } + compiler_targets = {"gcc": "gnu", "intel": "intel", "pgi": "pgi", "sgi": "sgi"} if self.compiler.name not in compiler_targets: template = "Unsupported compiler {0}! Supported compilers: {1}" diff --git a/var/spack/repos/builtin/packages/dos2unix/package.py b/var/spack/repos/builtin/packages/dos2unix/package.py index bf76004e23..d69304ec38 100644 --- a/var/spack/repos/builtin/packages/dos2unix/package.py +++ b/var/spack/repos/builtin/packages/dos2unix/package.py @@ -28,7 +28,7 @@ def build_targets(self): targets = [ "LDFLAGS_USER=-L{0} {1}".format( self.spec["gettext"].prefix.lib, self.spec["gettext"].libs.link_flags - ), + ) ] return targets diff --git a/var/spack/repos/builtin/packages/dust/package.py b/var/spack/repos/builtin/packages/dust/package.py index 8f5a2264db..af3041fba5 100644 --- a/var/spack/repos/builtin/packages/dust/package.py +++ b/var/spack/repos/builtin/packages/dust/package.py @@ -14,10 +14,7 @@ class Dust(Package): maintainers("fangohr") - version( - "0.7.5", - sha256="f892aaf7a0a7852e12d01b2ced6c2484fb6dc5fe7562abdf0c44a2d08aa52618", - ) + version("0.7.5", sha256="f892aaf7a0a7852e12d01b2ced6c2484fb6dc5fe7562abdf0c44a2d08aa52618") depends_on("rust") @@ -31,10 +28,7 @@ def install(self, spec, prefix): def check_install(self): print("Attempt to call 'dust' with '--version'") dust = Executable(join_path(self.spec["dust"].prefix.bin, "dust")) - output = dust( - "--version", - output=str.split, - ) + output = dust("--version", output=str.split) print("stdout received fromm dust is '{}".format(output)) assert "Dust " in output diff --git a/var/spack/repos/builtin/packages/e3sm-kernels/package.py b/var/spack/repos/builtin/packages/e3sm-kernels/package.py index c0bb15d738..0f1df42267 100644 --- a/var/spack/repos/builtin/packages/e3sm-kernels/package.py +++ b/var/spack/repos/builtin/packages/e3sm-kernels/package.py @@ -26,10 +26,7 @@ class E3smKernels(MakefilePackage): variant( "kernel", default="atmosphere", - values=( - "atmosphere", - "mmf-mpdata-tracer", - ), + values=("atmosphere", "mmf-mpdata-tracer"), description="Specify E3SM Kernel to Build", multi=False, ) diff --git a/var/spack/repos/builtin/packages/eagle/package.py b/var/spack/repos/builtin/packages/eagle/package.py index 3db4db3a97..9353da9042 100644 --- a/var/spack/repos/builtin/packages/eagle/package.py +++ b/var/spack/repos/builtin/packages/eagle/package.py @@ -43,11 +43,7 @@ def edit(self, spec, prefix): def install(self, spec, prefix): mkdirp(prefix.bin) - bins = [ - "eagle", - "eagle-rc", - "eagle-nm", - ] + bins = ["eagle", "eagle-rc", "eagle-nm"] for b in bins: install(b, prefix.bin) diff --git a/var/spack/repos/builtin/packages/easi/package.py b/var/spack/repos/builtin/packages/easi/package.py index 50bc264fd6..37d60dc448 100644 --- a/var/spack/repos/builtin/packages/easi/package.py +++ b/var/spack/repos/builtin/packages/easi/package.py @@ -45,7 +45,6 @@ class Easi(CMakePackage): conflicts("jit=impalajit", when="target=riscv64:") def cmake_args(self): - args = [] args.append(self.define_from_variant("ASAGI", "asagi")) spec = self.spec diff --git a/var/spack/repos/builtin/packages/ebms/package.py b/var/spack/repos/builtin/packages/ebms/package.py index 2a463faf9f..9ef56dbe3b 100644 --- a/var/spack/repos/builtin/packages/ebms/package.py +++ b/var/spack/repos/builtin/packages/ebms/package.py @@ -28,7 +28,6 @@ class Ebms(MakefilePackage): @property def build_targets(self): - targets = [] cflags = "-g -O3 -std=gnu99" diff --git a/var/spack/repos/builtin/packages/eccodes/package.py b/var/spack/repos/builtin/packages/eccodes/package.py index c98a6737dd..7afadcbe80 100644 --- a/var/spack/repos/builtin/packages/eccodes/package.py +++ b/var/spack/repos/builtin/packages/eccodes/package.py @@ -82,19 +82,15 @@ class Eccodes(CMakePackage): variant( "definitions", - values=disjoint_sets( - ("auto",), - ("default",) + tuple(_definitions.keys()), - ).with_default("auto"), + values=disjoint_sets(("auto",), ("default",) + tuple(_definitions.keys())).with_default( + "auto" + ), description="List of definitions to install", ) variant( "samples", - values=disjoint_sets( - ("auto",), - ("default",), - ).with_default("auto"), + values=disjoint_sets(("auto",), ("default",)).with_default("auto"), description="List of samples to install", ) diff --git a/var/spack/repos/builtin/packages/ecp-data-vis-sdk/package.py b/var/spack/repos/builtin/packages/ecp-data-vis-sdk/package.py index 59eefb3ec5..47c42aeb7f 100644 --- a/var/spack/repos/builtin/packages/ecp-data-vis-sdk/package.py +++ b/var/spack/repos/builtin/packages/ecp-data-vis-sdk/package.py @@ -114,10 +114,7 @@ class EcpDataVisSdk(BundlePackage, CudaPackage, ROCmPackage): dav_sdk_depends_on("hdf5@1.12: +shared+mpi", when="+hdf5", propagate=["fortran"]) # hdf5-vfd-gds needs cuda@11.7.1 or later, only enable when 11.7.1+ available. - depends_on( - "hdf5-vfd-gds@1.0.2:", - when="+cuda+hdf5^cuda@11.7.1:", - ) + depends_on("hdf5-vfd-gds@1.0.2:", when="+cuda+hdf5^cuda@11.7.1:") for cuda_arch in cuda_arch_variants: depends_on( "hdf5-vfd-gds@1.0.2: {0}".format(cuda_arch), diff --git a/var/spack/repos/builtin/packages/elfutils/package.py b/var/spack/repos/builtin/packages/elfutils/package.py index d72484b696..6f95eaf9cb 100644 --- a/var/spack/repos/builtin/packages/elfutils/package.py +++ b/var/spack/repos/builtin/packages/elfutils/package.py @@ -55,10 +55,7 @@ class Elfutils(AutotoolsPackage, SourcewarePackage): # libdebuginfod support # NB: For 0.181 and newer, this enables _both_ the client and server variant( - "debuginfod", - default=False, - description="Enable libdebuginfod support.", - when="@0.179:", + "debuginfod", default=False, description="Enable libdebuginfod support.", when="@0.179:" ) # elfutils-0.185-static-inline.patch diff --git a/var/spack/repos/builtin/packages/elmerfem/package.py b/var/spack/repos/builtin/packages/elmerfem/package.py index 4e5f92b2a1..fda948b73c 100644 --- a/var/spack/repos/builtin/packages/elmerfem/package.py +++ b/var/spack/repos/builtin/packages/elmerfem/package.py @@ -49,7 +49,6 @@ class Elmerfem(CMakePackage): depends_on("csa-c", when="+scatt2d") def cmake_args(self): - spec = self.spec args = ["-DWITH_ElmerIce=ON", "-DWITH_CONTRIB=ON"] @@ -86,12 +85,7 @@ def cmake_args(self): args.append("-DWITH_Hypre=OFF") if "+trilinos" in spec: - args.extend( - [ - "-DWITH_Trilinos=ON", - "-DCMAKE_CXX_STANDARD=11", - ] - ) + args.extend(["-DWITH_Trilinos=ON", "-DCMAKE_CXX_STANDARD=11"]) else: args.append("-DWITH_Trilinos=OFF") diff --git a/var/spack/repos/builtin/packages/esmf/package.py b/var/spack/repos/builtin/packages/esmf/package.py index 68f22501d4..a0ee9452ad 100644 --- a/var/spack/repos/builtin/packages/esmf/package.py +++ b/var/spack/repos/builtin/packages/esmf/package.py @@ -25,42 +25,17 @@ class Esmf(MakefilePackage): version("develop", branch="develop") # generate chksum with spack checksum esmf@x.y.z version("8.4.0", sha256="28531810bf1ae78646cda6494a53d455d194400f19dccd13d6361871de42ed0f") - version( - "8.3.1", - sha256="6c39261e55dcdf9781cdfa344417b9606f7f961889d5ec626150f992f04f146d", - ) - version( - "8.3.0", - sha256="0ff43ede83d1ac6beabd3d5e2a646f7574174b28a48d1b9f2c318a054ba268fd", - ) + version("8.3.1", sha256="6c39261e55dcdf9781cdfa344417b9606f7f961889d5ec626150f992f04f146d") + version("8.3.0", sha256="0ff43ede83d1ac6beabd3d5e2a646f7574174b28a48d1b9f2c318a054ba268fd") version("8.3.0b09", commit="5b7e546c4b") - version( - "8.2.0", - sha256="3693987aba2c8ae8af67a0e222bea4099a48afe09b8d3d334106f9d7fc311485", - ) - version( - "8.1.1", - sha256="58c2e739356f21a1b32673aa17a713d3c4af9d45d572f4ba9168c357d586dc75", - ) - version( - "8.0.1", - sha256="9172fb73f3fe95c8188d889ee72fdadb4f978b1d969e1d8e401e8d106def1d84", - ) - version( - "8.0.0", - sha256="051dca45f9803d7e415c0ea146df15ce487fb55f0fce18ca61d96d4dba0c8774", - ) - version( - "7.1.0r", - sha256="ae9a5edb8d40ae97a35cbd4bd00b77061f995c77c43d36334dbb95c18b00a889", - ) + version("8.2.0", sha256="3693987aba2c8ae8af67a0e222bea4099a48afe09b8d3d334106f9d7fc311485") + version("8.1.1", sha256="58c2e739356f21a1b32673aa17a713d3c4af9d45d572f4ba9168c357d586dc75") + version("8.0.1", sha256="9172fb73f3fe95c8188d889ee72fdadb4f978b1d969e1d8e401e8d106def1d84") + version("8.0.0", sha256="051dca45f9803d7e415c0ea146df15ce487fb55f0fce18ca61d96d4dba0c8774") + version("7.1.0r", sha256="ae9a5edb8d40ae97a35cbd4bd00b77061f995c77c43d36334dbb95c18b00a889") variant("mpi", default=True, description="Build with MPI support") - variant( - "external-lapack", - default=False, - description="Build with external LAPACK support", - ) + variant("external-lapack", default=False, description="Build with external LAPACK support") variant("netcdf", default=True, description="Build with NetCDF support") variant("pnetcdf", default=True, description="Build with pNetCDF support", when="+mpi") variant("xerces", default=True, description="Build with Xerces support") @@ -76,17 +51,9 @@ class Esmf(MakefilePackage): description="Build with external parallelio library", when="@8.3.b09", ) + variant("pio", default=True, description="Enable Internal ParallelIO support", when="@:8.2.99") variant( - "pio", - default=True, - description="Enable Internal ParallelIO support", - when="@:8.2.99", - ) - variant( - "pio", - default=True, - description="Enable Internal ParallelIO support", - when="@8.3.0b09", + "pio", default=True, description="Enable Internal ParallelIO support", when="@8.3.0b09" ) variant("debug", default=False, description="Make a debuggable version of the library") variant("shared", default=True, description="Build shared library") diff --git a/var/spack/repos/builtin/packages/expat/package.py b/var/spack/repos/builtin/packages/expat/package.py index 8f837e3d1d..bbe2d12d36 100644 --- a/var/spack/repos/builtin/packages/expat/package.py +++ b/var/spack/repos/builtin/packages/expat/package.py @@ -114,10 +114,7 @@ def url_for_version(self, version): def configure_args(self): spec = self.spec - args = [ - "--without-docbook", - "--enable-static", - ] + args = ["--without-docbook", "--enable-static"] if "+libbsd" in spec and "@2.2.1:" in spec: args.append("--with-libbsd") return args diff --git a/var/spack/repos/builtin/packages/faiss/package.py b/var/spack/repos/builtin/packages/faiss/package.py index 924ade2e6f..e476f09706 100644 --- a/var/spack/repos/builtin/packages/faiss/package.py +++ b/var/spack/repos/builtin/packages/faiss/package.py @@ -128,7 +128,6 @@ def configure_args(self): return args def build(self, pkg, spec, prefix): - make() if "+python" in self.spec: @@ -148,7 +147,6 @@ def build(self, pkg, spec, prefix): make("demo_ivfpq_indexing_gpu") def install(self, pkg, spec, prefix): - make("install") if "+python" in self.spec: @@ -185,7 +183,6 @@ def _prefix_and_install(file): @run_after("configure") def _fix_makefile(self): - # spack injects its own optimization flags makefile = FileFilter("makefile.inc") makefile.filter("CPUFLAGS = -mavx2 -mf16c", "#CPUFLAGS = -mavx2 -mf16c") diff --git a/var/spack/repos/builtin/packages/ffmpeg/package.py b/var/spack/repos/builtin/packages/ffmpeg/package.py index a286a67702..c0de7c2a0b 100644 --- a/var/spack/repos/builtin/packages/ffmpeg/package.py +++ b/var/spack/repos/builtin/packages/ffmpeg/package.py @@ -126,15 +126,7 @@ def configure_args(self): xlib_opts = [] if spec.satisfies("@2.5:"): - xlib_opts.extend( - [ - "libxcb", - "libxcb-shape", - "libxcb-shm", - "libxcb-xfixes", - "xlib", - ] - ) + xlib_opts.extend(["libxcb", "libxcb-shape", "libxcb-shm", "libxcb-xfixes", "xlib"]) config_args += self.enable_or_disable_meta("X", xlib_opts) diff --git a/var/spack/repos/builtin/packages/ffte/package.py b/var/spack/repos/builtin/packages/ffte/package.py index 55988d39af..8b5b36c788 100644 --- a/var/spack/repos/builtin/packages/ffte/package.py +++ b/var/spack/repos/builtin/packages/ffte/package.py @@ -70,10 +70,7 @@ def edit(self, spec, prefix): else: lbnm = "libfftempi.a" - for spc, vrf, rs, ip in ( - ("+vector", vf, "v", 2), - ("+cuda", cuf, "cu", 3), - ): + for spc, vrf, rs, ip in (("+vector", vf, "v", 2), ("+cuda", cuf, "cu", 3)): if spc in spec: for f in vrf: # replace with variant versions orgf = f[:ip].replace(rs, "") + f[ip:] diff --git a/var/spack/repos/builtin/packages/fftw/package.py b/var/spack/repos/builtin/packages/fftw/package.py index b01d45b836..9b87254451 100644 --- a/var/spack/repos/builtin/packages/fftw/package.py +++ b/var/spack/repos/builtin/packages/fftw/package.py @@ -41,7 +41,6 @@ class FftwBase(AutotoolsPackage): @property def libs(self): - # Reduce repetitions of entries query_parameters = list(llnl.util.lang.dedupe(self.spec.last_query.extra_parameters)) diff --git a/var/spack/repos/builtin/packages/flamemaster/package.py b/var/spack/repos/builtin/packages/flamemaster/package.py index b881417835..045ee12092 100644 --- a/var/spack/repos/builtin/packages/flamemaster/package.py +++ b/var/spack/repos/builtin/packages/flamemaster/package.py @@ -151,10 +151,7 @@ def setup_build_environment(self, env): def cmake_args(self): spec = self.spec - args = [ - "-DCMAKE_C_COMPILER=%s" % spack_cc, - "-DCMAKE_CXX_COMPILER=%s" % spack_cxx, - ] + args = ["-DCMAKE_C_COMPILER=%s" % spack_cc, "-DCMAKE_CXX_COMPILER=%s" % spack_cxx] if spec.variants["build_type"].value == "Release": cxx_flags_release = [] diff --git a/var/spack/repos/builtin/packages/flex/package.py b/var/spack/repos/builtin/packages/flex/package.py index c99c8ee4ae..115e18c501 100644 --- a/var/spack/repos/builtin/packages/flex/package.py +++ b/var/spack/repos/builtin/packages/flex/package.py @@ -124,7 +124,6 @@ def symlink_lex(self): (self.prefix.lib64, "libfl.a", "libl.a"), (self.prefix.lib64, "libfl." + dso, "libl." + dso), ): - if os.path.isdir(dir): with working_dir(dir): if os.path.isfile(flex) and not os.path.lexists(lex): diff --git a/var/spack/repos/builtin/packages/fms/package.py b/var/spack/repos/builtin/packages/fms/package.py index 39b96f30cf..b59e891b09 100644 --- a/var/spack/repos/builtin/packages/fms/package.py +++ b/var/spack/repos/builtin/packages/fms/package.py @@ -16,12 +16,7 @@ class Fms(CMakePackage): url = "https://github.com/NOAA-GFDL/FMS/archive/refs/tags/2022.04.tar.gz" git = "https://github.com/NOAA-GFDL/FMS.git" - maintainers( - "AlexanderRichert-NOAA", - "Hang-Lei-NOAA", - "edwardhartnett", - "rem1776", - ) + maintainers("AlexanderRichert-NOAA", "Hang-Lei-NOAA", "edwardhartnett", "rem1776") version("2022.04", sha256="f741479128afc2b93ca8291a4c5bcdb024a8cbeda1a26bf77a236c0f629e1b03") version("2022.03", sha256="42d2ac53d3c889a8177a6d7a132583364c0f6e5d5cbde0d980443b6797ad4838") diff --git a/var/spack/repos/builtin/packages/foam-extend/package.py b/var/spack/repos/builtin/packages/foam-extend/package.py index f2ec8e33ac..ac1c7be88e 100644 --- a/var/spack/repos/builtin/packages/foam-extend/package.py +++ b/var/spack/repos/builtin/packages/foam-extend/package.py @@ -93,10 +93,7 @@ class FoamExtend(Package): assets = [] # type: List[str] # Some user config settings - config = { - "label-size": False, # <- No int32/int64 support - "mplib": "USERMPI", # USERMPI - } + config = {"label-size": False, "mplib": "USERMPI"} # <- No int32/int64 support # USERMPI # The openfoam architecture, compiler information etc _foam_arch = None @@ -252,9 +249,7 @@ def configure(self, spec, prefix): """ # Content for etc/prefs.{csh,sh} self.etc_prefs = { - "000": { # Sort first - "compilerInstall": "System", - }, + "000": {"compilerInstall": "System"}, # Sort first "001": {}, "cmake": { "CMAKE_DIR": spec["cmake"].prefix, @@ -264,18 +259,9 @@ def configure(self, spec, prefix): "PYTHON_DIR": spec["python"].home, "PYTHON_BIN_DIR": spec["python"].home.bin, }, - "flex": { - "FLEX_SYSTEM": 1, - "FLEX_DIR": spec["flex"].prefix, - }, - "bison": { - "BISON_SYSTEM": 1, - "BISON_DIR": spec["flex"].prefix, - }, - "zlib": { - "ZLIB_SYSTEM": 1, - "ZLIB_DIR": spec["zlib"].prefix, - }, + "flex": {"FLEX_SYSTEM": 1, "FLEX_DIR": spec["flex"].prefix}, + "bison": {"BISON_SYSTEM": 1, "BISON_DIR": spec["flex"].prefix}, + "zlib": {"ZLIB_SYSTEM": 1, "ZLIB_DIR": spec["zlib"].prefix}, } # Adjust configuration via prefs - sort second self.etc_prefs["001"].update(self.foam_arch.foam_dict()) diff --git a/var/spack/repos/builtin/packages/fplo/package.py b/var/spack/repos/builtin/packages/fplo/package.py index ec3e78e5d7..c093e757cc 100644 --- a/var/spack/repos/builtin/packages/fplo/package.py +++ b/var/spack/repos/builtin/packages/fplo/package.py @@ -95,14 +95,7 @@ def edit(self, spec, prefix): def build(self, spec, prefix): mmakefile = Executable(join_path(self.build_directory, "install", "MMakefile")) - mmakefile_args = [ - "-f90", - spack_fc, - "-cc", - spack_cc, - "-c+", - spack_cxx, - ] + mmakefile_args = ["-f90", spack_fc, "-cc", spack_cc, "-c+", spack_cxx] with working_dir(self.build_directory): # copy contents of bin @@ -144,13 +137,6 @@ def perl_interpreter(self): with working_dir(self.prefix.bin): pattern = "^#!.*/usr/bin/perl" repl = "#!{0}".format(self.spec["perl"].command.path) - files = [ - "fconv2", - "fconvdens2", - "fdowngrad.pl", - "fout2in", - "grBhfat", - "grpop", - ] + files = ["fconv2", "fconvdens2", "fdowngrad.pl", "fout2in", "grBhfat", "grpop"] for file in files: filter_file(pattern, repl, *files, backup=False) diff --git a/var/spack/repos/builtin/packages/fujitsu-fftw/package.py b/var/spack/repos/builtin/packages/fujitsu-fftw/package.py index 975b0c6b89..b93ed50f92 100644 --- a/var/spack/repos/builtin/packages/fujitsu-fftw/package.py +++ b/var/spack/repos/builtin/packages/fujitsu-fftw/package.py @@ -117,7 +117,6 @@ def configure(self, spec, prefix): # Different precisions must be configured and compiled one at a time configure = Executable("../configure") for precision in self.selected_precisions: - opts = (enable_precision[precision] or []) + options[:] with working_dir(precision, create=True): configure(*opts) diff --git a/var/spack/repos/builtin/packages/g2/package.py b/var/spack/repos/builtin/packages/g2/package.py index 0cc2df8dc9..2ff605df20 100644 --- a/var/spack/repos/builtin/packages/g2/package.py +++ b/var/spack/repos/builtin/packages/g2/package.py @@ -16,12 +16,7 @@ class G2(CMakePackage): homepage = "https://noaa-emc.github.io/NCEPLIBS-g2" url = "https://github.com/NOAA-EMC/NCEPLIBS-g2/archive/refs/tags/v3.4.3.tar.gz" - maintainers( - "t-brown", - "AlexanderRichert-NOAA", - "Hang-Lei-NOAA", - "edwardhartnett", - ) + maintainers("t-brown", "AlexanderRichert-NOAA", "Hang-Lei-NOAA", "edwardhartnett") version("3.4.5", sha256="c18e991c56964953d778632e2d74da13c4e78da35e8d04cb742a2ca4f52737b6") version("3.4.3", sha256="679ea99b225f08b168cbf10f4b29f529b5b011232f298a5442ce037ea84de17c") diff --git a/var/spack/repos/builtin/packages/g2c/package.py b/var/spack/repos/builtin/packages/g2c/package.py index 6ff55ed20d..215a054ab2 100644 --- a/var/spack/repos/builtin/packages/g2c/package.py +++ b/var/spack/repos/builtin/packages/g2c/package.py @@ -14,11 +14,7 @@ class G2c(CMakePackage): homepage = "https://github.com/NOAA-EMC/NCEPLIBS-g2c" url = "https://github.com/NOAA-EMC/NCEPLIBS-g2c/archive/refs/tags/v1.6.4.tar.gz" - maintainers( - "AlexanderRichert-NOAA", - "Hang-Lei-NOAA", - "edwardhartnett", - ) + maintainers("AlexanderRichert-NOAA", "Hang-Lei-NOAA", "edwardhartnett") variant("png", default=True) variant("jasper", default=True) diff --git a/var/spack/repos/builtin/packages/g2tmpl/package.py b/var/spack/repos/builtin/packages/g2tmpl/package.py index dbcd7bfd9a..55318f8a05 100644 --- a/var/spack/repos/builtin/packages/g2tmpl/package.py +++ b/var/spack/repos/builtin/packages/g2tmpl/package.py @@ -14,12 +14,7 @@ class G2tmpl(CMakePackage): homepage = "https://github.com/NOAA-EMC/NCEPLIBS-g2tmpl" url = "https://github.com/NOAA-EMC/NCEPLIBS-g2tmpl/archive/refs/tags/v1.10.0.tar.gz" - maintainers( - "t-brown", - "edwardhartnett", - "AlexanderRichert-NOAA", - "Hang-Lei-NOAA", - ) + maintainers("t-brown", "edwardhartnett", "AlexanderRichert-NOAA", "Hang-Lei-NOAA") version("1.10.2", sha256="4063361369f3691f75288c801fa9d1a2414908b7d6c07bbf69d4165802e2a7fc") version("1.10.1", sha256="0be425e5128fabb89915a92261aa75c27a46a3e115e00c686fc311321e5d1e2a") diff --git a/var/spack/repos/builtin/packages/gate/package.py b/var/spack/repos/builtin/packages/gate/package.py index 68a2ef1910..bbf1effb57 100644 --- a/var/spack/repos/builtin/packages/gate/package.py +++ b/var/spack/repos/builtin/packages/gate/package.py @@ -53,19 +53,9 @@ def cmake_args(self): args = [] if "+rtk" in self.spec: - args.extend( - [ - "-DGATE_USE_ITK=ON", - "-DGATE_USE_RTK=ON", - ] - ) + args.extend(["-DGATE_USE_ITK=ON", "-DGATE_USE_RTK=ON"]) else: - args.extend( - [ - "-DGATE_USE_ITK=OFF", - "-DGATE_USE_RTK=OFF", - ] - ) + args.extend(["-DGATE_USE_ITK=OFF", "-DGATE_USE_RTK=OFF"]) return args diff --git a/var/spack/repos/builtin/packages/gatepet2stir/package.py b/var/spack/repos/builtin/packages/gatepet2stir/package.py index 77563b5751..420ea69ae0 100644 --- a/var/spack/repos/builtin/packages/gatepet2stir/package.py +++ b/var/spack/repos/builtin/packages/gatepet2stir/package.py @@ -25,9 +25,7 @@ def url_for_version(self, version): return url.format(version.underscored) def qmake_args(self): - args = [ - "QMAKE_LIBS=-ltcmalloc", - ] + args = ["QMAKE_LIBS=-ltcmalloc"] return args def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/gcc/package.py b/var/spack/repos/builtin/packages/gcc/package.py index 3675116952..ad77652ddb 100644 --- a/var/spack/repos/builtin/packages/gcc/package.py +++ b/var/spack/repos/builtin/packages/gcc/package.py @@ -765,17 +765,9 @@ def configure_args(self): # enable_bootstrap if spec.satisfies("+bootstrap"): - options.extend( - [ - "--enable-bootstrap", - ] - ) + options.extend(["--enable-bootstrap"]) else: - options.extend( - [ - "--disable-bootstrap", - ] - ) + options.extend(["--disable-bootstrap"]) # Configure include and lib directories explicitly for these # dependencies since the short GCC option assumes that libraries @@ -876,7 +868,6 @@ def nvptx_install(self): # self.build_directory = 'spack-build-nvptx' with working_dir("spack-build-nvptx", create=True): - options = [ "--prefix={0}".format(prefix), "--enable-languages={0}".format(",".join(spec.variants["languages"].value)), diff --git a/var/spack/repos/builtin/packages/gcta/package.py b/var/spack/repos/builtin/packages/gcta/package.py index a159ff68c7..f8c084d37a 100644 --- a/var/spack/repos/builtin/packages/gcta/package.py +++ b/var/spack/repos/builtin/packages/gcta/package.py @@ -53,10 +53,7 @@ def cmake_args(self): if self.spec.satisfies("@1.94.0beta:"): spectra = self.spec["spectra"].prefix.include boost = self.spec["boost"].prefix.include - deps = [ - self.define("SPECTRA_LIB", spectra), - self.define("BOOST_LIB", boost), - ] + deps = [self.define("SPECTRA_LIB", spectra), self.define("BOOST_LIB", boost)] args.extend(deps) if self.spec.satisfies("target=x86_64:"): diff --git a/var/spack/repos/builtin/packages/gdal/package.py b/var/spack/repos/builtin/packages/gdal/package.py index 53dfb9c6f2..b5e50e4f02 100644 --- a/var/spack/repos/builtin/packages/gdal/package.py +++ b/var/spack/repos/builtin/packages/gdal/package.py @@ -230,9 +230,7 @@ class Gdal(CMakePackage, AutotoolsPackage, PythonExtension): # Build system build_system( - conditional("cmake", when="@3.5:"), - conditional("autotools", when="@:3.5"), - default="cmake", + conditional("cmake", when="@3.5:"), conditional("autotools", when="@:3.5"), default="cmake" ) with when("build_system=cmake"): diff --git a/var/spack/repos/builtin/packages/gdbm/package.py b/var/spack/repos/builtin/packages/gdbm/package.py index 70cf5a54cb..a0882d5493 100644 --- a/var/spack/repos/builtin/packages/gdbm/package.py +++ b/var/spack/repos/builtin/packages/gdbm/package.py @@ -40,7 +40,6 @@ class Gdbm(AutotoolsPackage, GNUMirrorPackage): patch("gdbm.patch", when="@:1.18 %arm@21:") def configure_args(self): - # GDBM uses some non-standard GNU extensions, # enabled with -D_GNU_SOURCE. See: # https://patchwork.ozlabs.org/patch/771300/ diff --git a/var/spack/repos/builtin/packages/geant4-data/package.py b/var/spack/repos/builtin/packages/geant4-data/package.py index 84a40170e9..af43d0c768 100644 --- a/var/spack/repos/builtin/packages/geant4-data/package.py +++ b/var/spack/repos/builtin/packages/geant4-data/package.py @@ -78,12 +78,8 @@ class Geant4Data(BundlePackage): "g4incl@1.0", "g4ensdfstate@2.3", ], - "10.7.1:10.7": [ - "g4particlexs@3.1.1", - ], - "10.7.0": [ - "g4particlexs@3.1", - ], + "10.7.1:10.7": ["g4particlexs@3.1.1"], + "10.7.0": ["g4particlexs@3.1"], "10.6.0:10.6": [ "g4ndl@4.6", "g4emlow@7.9.1", @@ -121,12 +117,8 @@ class Geant4Data(BundlePackage): "g4abla@3.1", "g4ensdfstate@2.2", ], - "10.4.2:10.4": [ - "g4realsurface@2.1.1", - ], - "10.4.0:10.4.1": [ - "g4realsurface@2.1", - ], + "10.4.2:10.4": ["g4realsurface@2.1.1"], + "10.4.0:10.4.1": ["g4realsurface@2.1"], "10.3.0:10.3": [ "g4ndl@4.5", "g4emlow@6.50", @@ -137,14 +129,8 @@ class Geant4Data(BundlePackage): "g4abla@3.0", "g4ensdfstate@2.1", ], - "10.3.1:10.3": [ - "g4photonevaporation@4.3.2", - "g4radioactivedecay@5.1.1", - ], - "10.3.0": [ - "g4photonevaporation@4.3", - "g4radioactivedecay@5.1", - ], + "10.3.1:10.3": ["g4photonevaporation@4.3.2", "g4radioactivedecay@5.1.1"], + "10.3.0": ["g4photonevaporation@4.3", "g4radioactivedecay@5.1"], } for _vers, _dsets in _datasets.items(): diff --git a/var/spack/repos/builtin/packages/genie/package.py b/var/spack/repos/builtin/packages/genie/package.py index 2dc67f07dc..21c8310033 100644 --- a/var/spack/repos/builtin/packages/genie/package.py +++ b/var/spack/repos/builtin/packages/genie/package.py @@ -154,8 +154,4 @@ def _make(self, *args, **kwargs): @property def _make_args(self): - return [ - "CC=c++", - "CXX=c++", - "LD=c++", - ] + return ["CC=c++", "CXX=c++", "LD=c++"] diff --git a/var/spack/repos/builtin/packages/gfsio/package.py b/var/spack/repos/builtin/packages/gfsio/package.py index 6172151b36..5d284e07e3 100644 --- a/var/spack/repos/builtin/packages/gfsio/package.py +++ b/var/spack/repos/builtin/packages/gfsio/package.py @@ -15,12 +15,7 @@ class Gfsio(CMakePackage): homepage = "https://github.com/NOAA-EMC/NCEPLIBS-gfsio" url = "https://github.com/NOAA-EMC/NCEPLIBS-gfsio/archive/refs/tags/v1.4.1.tar.gz" - maintainers( - "t-brown", - "AlexanderRichert-NOAA", - "Hang-Lei-NOAA", - "edwardhartnett", - ) + maintainers("t-brown", "AlexanderRichert-NOAA", "Hang-Lei-NOAA", "edwardhartnett") version("1.4.1", sha256="eab106302f520600decc4f9665d7c6a55e7b4901fab6d9ef40f29702b89b69b1") diff --git a/var/spack/repos/builtin/packages/ghostscript/package.py b/var/spack/repos/builtin/packages/ghostscript/package.py index a2aa354b22..ebceb52397 100644 --- a/var/spack/repos/builtin/packages/ghostscript/package.py +++ b/var/spack/repos/builtin/packages/ghostscript/package.py @@ -87,11 +87,7 @@ def patch(self): ) def configure_args(self): - args = [ - "--disable-compile-inits", - "--enable-dynamic", - "--with-system-libtiff", - ] + args = ["--disable-compile-inits", "--enable-dynamic", "--with-system-libtiff"] if self.spec.satisfies("@9.53:"): args.extend(self.with_or_without("tesseract")) diff --git a/var/spack/repos/builtin/packages/git/package.py b/var/spack/repos/builtin/packages/git/package.py index 554f5010ab..940869fffa 100644 --- a/var/spack/repos/builtin/packages/git/package.py +++ b/var/spack/repos/builtin/packages/git/package.py @@ -324,7 +324,7 @@ class Git(AutotoolsPackage): deprecated=True, ) - for (_version, _sha256_manpage) in { + for _version, _sha256_manpage in { "2.39.1": "b2d1b2c6cba2343934792c4409a370a8c684add1b3c0f9b757e71189b1a2e80e", "2.38.3": "9e5c924f6f1c961e09d1a8926c2775a158a0375a3311205d7a6176a3ed522272", "2.38.1": "fcb27484406b64419a9f9890e95ef29af08e1f911d9d368546eddc59a18e245d", diff --git a/var/spack/repos/builtin/packages/glpk/package.py b/var/spack/repos/builtin/packages/glpk/package.py index 5aa6ab4310..8266cf1563 100644 --- a/var/spack/repos/builtin/packages/glpk/package.py +++ b/var/spack/repos/builtin/packages/glpk/package.py @@ -25,7 +25,6 @@ class Glpk(AutotoolsPackage, GNUMirrorPackage): depends_on("gmp", when="+gmp") def configure_args(self): - options = [] if "+gmp" in self.spec: diff --git a/var/spack/repos/builtin/packages/glvis/package.py b/var/spack/repos/builtin/packages/glvis/package.py index 361207580c..ba2ff74423 100644 --- a/var/spack/repos/builtin/packages/glvis/package.py +++ b/var/spack/repos/builtin/packages/glvis/package.py @@ -155,13 +155,7 @@ def common_args(self): if self.spec.satisfies("@4.0:"): # Spack will inject the necessary include dirs and link paths via # its compiler wrapper, so we can skip them: - result += [ - "GLM_DIR=", - "SDL_DIR=", - "GLEW_DIR=", - "FREETYPE_DIR=", - "OPENGL_DIR=", - ] + result += ["GLM_DIR=", "SDL_DIR=", "GLEW_DIR=", "FREETYPE_DIR=", "OPENGL_DIR="] # Spack will not inject include dirs like /usr/include/freetype2, # so we need to do it ourselves: if spec["freetype"].external: diff --git a/var/spack/repos/builtin/packages/gnutls/package.py b/var/spack/repos/builtin/packages/gnutls/package.py index 2b72654dba..862b7846e7 100644 --- a/var/spack/repos/builtin/packages/gnutls/package.py +++ b/var/spack/repos/builtin/packages/gnutls/package.py @@ -59,9 +59,7 @@ def setup_build_environment(self, env): def configure_args(self): spec = self.spec - args = [ - "--enable-static", - ] + args = ["--enable-static"] if spec.satisfies("@3.5:"): # use shipped libraries, might be turned into variants @@ -80,20 +78,10 @@ def configure_args(self): args.append("--disable-guile") if self.run_tests: - args.extend( - [ - "--enable-tests", - "--enable-valgrind-tests", - "--enable-full-test-suite", - ] - ) + args.extend(["--enable-tests", "--enable-valgrind-tests", "--enable-full-test-suite"]) else: args.extend( - [ - "--disable-tests", - "--disable-valgrind-tests", - "--disable-full-test-suite", - ] + ["--disable-tests", "--disable-valgrind-tests", "--disable-full-test-suite"] ) return args diff --git a/var/spack/repos/builtin/packages/go-bootstrap/package.py b/var/spack/repos/builtin/packages/go-bootstrap/package.py index 0a77c7ffc9..a787e7de36 100644 --- a/var/spack/repos/builtin/packages/go-bootstrap/package.py +++ b/var/spack/repos/builtin/packages/go-bootstrap/package.py @@ -79,10 +79,7 @@ def patch(self): # test files so that these tests don't cause false failures. # See: https://github.com/golang/go/issues/15694 test_suite_file = FileFilter(join_path("src", "run.bash")) - test_suite_file.filter( - r"^(.*)(\$GOROOT/src/cmd/api/run.go)(.*)$", - r"# \1\2\3", - ) + test_suite_file.filter(r"^(.*)(\$GOROOT/src/cmd/api/run.go)(.*)$", r"# \1\2\3") # Go uses a hardcoded limit of 4096 bytes for its printf functions. # This can cause environment variables to be truncated. diff --git a/var/spack/repos/builtin/packages/go-md2man/package.py b/var/spack/repos/builtin/packages/go-md2man/package.py index b7e3f70e3e..808f0e4891 100644 --- a/var/spack/repos/builtin/packages/go-md2man/package.py +++ b/var/spack/repos/builtin/packages/go-md2man/package.py @@ -34,7 +34,6 @@ def patch(self): ln("-s", self.stage.source_path, join_path("src", "github.com", "cpuguy83", "go-md2man")) def install(self, spec, prefix): - with working_dir("src"): env["GOPATH"] = self.stage.source_path env["GO111MODULE"] = "off" diff --git a/var/spack/repos/builtin/packages/go/package.py b/var/spack/repos/builtin/packages/go/package.py index 7c83a14416..24f874efa1 100644 --- a/var/spack/repos/builtin/packages/go/package.py +++ b/var/spack/repos/builtin/packages/go/package.py @@ -98,10 +98,7 @@ def determine_version(cls, exe): @when("@:1.4.3") def patch(self): test_suite_file = FileFilter(join_path("src", "run.bash")) - test_suite_file.filter( - r"^(.*)(\$GOROOT/src/cmd/api/run.go)(.*)$", - r"# \1\2\3", - ) + test_suite_file.filter(r"^(.*)(\$GOROOT/src/cmd/api/run.go)(.*)$", r"# \1\2\3") def install(self, spec, prefix): bash = which("bash") diff --git a/var/spack/repos/builtin/packages/gpi-2/package.py b/var/spack/repos/builtin/packages/gpi-2/package.py index 80e70bb7a5..79832f56e4 100644 --- a/var/spack/repos/builtin/packages/gpi-2/package.py +++ b/var/spack/repos/builtin/packages/gpi-2/package.py @@ -39,11 +39,9 @@ class Gpi2(AutotoolsPackage): variant("mpi", default=False, description="Enable MPI support") variant( "fabrics", - values=disjoint_sets( - ("auto",), - ("infiniband",), - ("ethernet",), - ).with_non_feature_values("auto", "none"), + values=disjoint_sets(("auto",), ("infiniband",), ("ethernet",)).with_non_feature_values( + "auto", "none" + ), description="List of fabrics that are enabled; " "'none' use GPI-2 default (infiniband), " "'infiniband' will use 'rdma-core' from Spack", diff --git a/var/spack/repos/builtin/packages/grid/package.py b/var/spack/repos/builtin/packages/grid/package.py index abfad00d81..e68e4955f7 100644 --- a/var/spack/repos/builtin/packages/grid/package.py +++ b/var/spack/repos/builtin/packages/grid/package.py @@ -89,12 +89,7 @@ def configure_args(self): # and what linker to use. In many case it'd end up building the # code with support for MPI but without using `mpicxx` or linking to # `-lmpi`, wreaking havoc. Forcing `CXX` to be mpicxx should help. - args.extend( - [ - "CC={0}".format(spec["mpi"].mpicc), - "CXX={0}".format(spec["mpi"].mpicxx), - ] - ) + args.extend(["CC={0}".format(spec["mpi"].mpicc), "CXX={0}".format(spec["mpi"].mpicxx)]) args += self.enable_or_disable("timers") args += self.enable_or_disable("chroma") diff --git a/var/spack/repos/builtin/packages/gromacs/package.py b/var/spack/repos/builtin/packages/gromacs/package.py index 6d6624d1a3..7f8309c851 100644 --- a/var/spack/repos/builtin/packages/gromacs/package.py +++ b/var/spack/repos/builtin/packages/gromacs/package.py @@ -143,16 +143,8 @@ class Gromacs(CMakePackage): when="+cp2k", msg="GROMACS and CP2K should use the same blas, please disable bundled blas", ) - conflicts( - "%intel", - when="@2022:", - msg="GROMACS %intel support was removed in version 2022", - ) - conflicts( - "%gcc@:8", - when="@2023:", - msg="GROMACS requires GCC 9 or later since version 2023", - ) + conflicts("%intel", when="@2022:", msg="GROMACS %intel support was removed in version 2022") + conflicts("%gcc@:8", when="@2023:", msg="GROMACS requires GCC 9 or later since version 2023") conflicts( "intel-oneapi-mkl@:2021.2", when="@2023:", @@ -326,7 +318,6 @@ def patch(self): ) def cmake_args(self): - options = [] if "+mpi" in self.spec: diff --git a/var/spack/repos/builtin/packages/gtkplus/package.py b/var/spack/repos/builtin/packages/gtkplus/package.py index afa34d2078..63a55f52e0 100644 --- a/var/spack/repos/builtin/packages/gtkplus/package.py +++ b/var/spack/repos/builtin/packages/gtkplus/package.py @@ -96,20 +96,10 @@ def meson_args(self): args = std_meson_args if self.spec.satisfies("platform=darwin"): - args.extend( - [ - "-Dx11_backend=false", - "-Dquartz_backend=true", - ] - ) + args.extend(["-Dx11_backend=false", "-Dquartz_backend=true"]) args.extend( - [ - "-Dgtk_doc=false", - "-Dman=false", - "-Dintrospection=true", - "-Dwayland_backend=false", - ] + ["-Dgtk_doc=false", "-Dman=false", "-Dintrospection=true", "-Dwayland_backend=false"] ) return args diff --git a/var/spack/repos/builtin/packages/hal/package.py b/var/spack/repos/builtin/packages/hal/package.py index f6a6d494ca..620adb7ee2 100644 --- a/var/spack/repos/builtin/packages/hal/package.py +++ b/var/spack/repos/builtin/packages/hal/package.py @@ -44,7 +44,6 @@ def setup_build_environment(self, env): env.set("sonLibRootDir", self.spec["sonlib"].prefix) def install(self, spec, prefix): - # First the easy bit install_tree("bin", prefix.bin) @@ -79,7 +78,6 @@ def install(self, spec, prefix): ] for folder in haldirs: - install_tree(folder, join_path(self.prefix, "hal", folder)) install("__init__.py", join_path(self.prefix, "hal")) @@ -97,7 +95,6 @@ def install(self, spec, prefix): ] for pyfile in halpyfiles: - install(pyfile, self.prefix.bin) # The hal directory is a python library so we set the path diff --git a/var/spack/repos/builtin/packages/halide/package.py b/var/spack/repos/builtin/packages/halide/package.py index 6765a56ec0..200b7f1b54 100644 --- a/var/spack/repos/builtin/packages/halide/package.py +++ b/var/spack/repos/builtin/packages/halide/package.py @@ -54,10 +54,7 @@ class Halide(CMakePackage, PythonExtension): depends_on("cmake@3.22:", type="build") depends_on("ninja", type="build") - depends_on( - "llvm@14.0.0:14+clang+lld build_type=Release", - type=("link", "run"), - ) + depends_on("llvm@14.0.0:14+clang+lld build_type=Release", type=("link", "run")) for v in _values: depends_on( "llvm targets={0}".format(v), type=("link", "run"), when="targets={0}".format(v) diff --git a/var/spack/repos/builtin/packages/hdf5-vfd-gds/package.py b/var/spack/repos/builtin/packages/hdf5-vfd-gds/package.py index bc846f411f..4d09d3d453 100644 --- a/var/spack/repos/builtin/packages/hdf5-vfd-gds/package.py +++ b/var/spack/repos/builtin/packages/hdf5-vfd-gds/package.py @@ -31,9 +31,7 @@ class Hdf5VfdGds(CMakePackage, CudaPackage): def cmake_args(self): # CMake options - args = [ - self.define("BUILD_TESTING", self.run_tests), - ] + args = [self.define("BUILD_TESTING", self.run_tests)] return args diff --git a/var/spack/repos/builtin/packages/hdf5/package.py b/var/spack/repos/builtin/packages/hdf5/package.py index 91dd15bfbb..9f8c6ead27 100644 --- a/var/spack/repos/builtin/packages/hdf5/package.py +++ b/var/spack/repos/builtin/packages/hdf5/package.py @@ -23,14 +23,7 @@ class Hdf5(CMakePackage): list_url = "https://support.hdfgroup.org/ftp/HDF5/releases" list_depth = 3 git = "https://github.com/HDFGroup/hdf5.git" - maintainers( - "lrknox", - "brtnfld", - "byrnHDF", - "gheber", - "hyoklee", - "lkurz", - ) + maintainers("lrknox", "brtnfld", "byrnHDF", "gheber", "hyoklee", "lkurz") tags = ["e4s", "windows"] executables = ["^h5cc$", "^h5pcc$"] @@ -442,11 +435,7 @@ def libs(self): "libhdf5_java", "libhdf5", ], - ("cxx", "hl"): [ - "libhdf5_hl_cpp", - "libhdf5_hl", - "libhdf5", - ], + ("cxx", "hl"): ["libhdf5_hl_cpp", "libhdf5_hl", "libhdf5"], ("fortran", "hl"): [ "libhdf5_hl_fortran", "libhdf5_hl_f90cstub", @@ -455,29 +444,11 @@ def libs(self): "libhdf5_f90cstub", "libhdf5", ], - ("hl",): [ - "libhdf5_hl", - "libhdf5", - ], - ("cxx", "fortran"): [ - "libhdf5_fortran", - "libhdf5_f90cstub", - "libhdf5_cpp", - "libhdf5", - ], - ("cxx",): [ - "libhdf5_cpp", - "libhdf5", - ], - ("fortran",): [ - "libhdf5_fortran", - "libhdf5_f90cstub", - "libhdf5", - ], - ("java",): [ - "libhdf5_java", - "libhdf5", - ], + ("hl",): ["libhdf5_hl", "libhdf5"], + ("cxx", "fortran"): ["libhdf5_fortran", "libhdf5_f90cstub", "libhdf5_cpp", "libhdf5"], + ("cxx",): ["libhdf5_cpp", "libhdf5"], + ("fortran",): ["libhdf5_fortran", "libhdf5_f90cstub", "libhdf5"], + ("java",): ["libhdf5_java", "libhdf5"], } # Turn the query into the appropriate key diff --git a/var/spack/repos/builtin/packages/heaptrack/package.py b/var/spack/repos/builtin/packages/heaptrack/package.py index 6e9ffdfb4e..4d935efe82 100644 --- a/var/spack/repos/builtin/packages/heaptrack/package.py +++ b/var/spack/repos/builtin/packages/heaptrack/package.py @@ -23,7 +23,6 @@ class Heaptrack(CMakePackage): depends_on("zstd") def cmake_args(self): - spec = self.spec cmake_args = [ diff --git a/var/spack/repos/builtin/packages/heffte/package.py b/var/spack/repos/builtin/packages/heffte/package.py index 90739c30c7..c19a92edd6 100644 --- a/var/spack/repos/builtin/packages/heffte/package.py +++ b/var/spack/repos/builtin/packages/heffte/package.py @@ -141,9 +141,7 @@ def test(self): # using the tests copied from /share/heffte/testing cmake_dir = self.test_suite.current_test_cache_dir.testing - options = [ - cmake_dir, - ] + options = [cmake_dir] if "+rocm" in self.spec: options.append( "-Dhip_DIR=" + join_path(self.spec["hip"].prefix, "lib", "cmake", "hip") diff --git a/var/spack/repos/builtin/packages/helics/package.py b/var/spack/repos/builtin/packages/helics/package.py index 532f636fe9..da6e1994a8 100644 --- a/var/spack/repos/builtin/packages/helics/package.py +++ b/var/spack/repos/builtin/packages/helics/package.py @@ -125,10 +125,7 @@ class Helics(CMakePackage): def cmake_args(self): spec = self.spec from_variant = self.define_from_variant - args = [ - "-DHELICS_BUILD_EXAMPLES=OFF", - "-DHELICS_BUILD_TESTS=OFF", - ] + args = ["-DHELICS_BUILD_EXAMPLES=OFF", "-DHELICS_BUILD_TESTS=OFF"] # HELICS core type CMake options # Options were renamed in v3 diff --git a/var/spack/repos/builtin/packages/hiop/package.py b/var/spack/repos/builtin/packages/hiop/package.py index 4a5632e1f1..9e2d45629e 100644 --- a/var/spack/repos/builtin/packages/hiop/package.py +++ b/var/spack/repos/builtin/packages/hiop/package.py @@ -89,14 +89,10 @@ class Hiop(CMakePackage, CudaPackage, ROCmPackage): depends_on("umpire {0}".format(rocm_dep), when="+raja {0}".format(rocm_dep)) depends_on("ginkgo {0}".format(rocm_dep), when="+ginkgo {0}".format(rocm_dep)) - magma_ver_constraints = ( - ("2.5.4", "0.4"), - ("2.6.1", "0.4.6"), - ("2.6.2", "0.5.4"), - ) + magma_ver_constraints = (("2.5.4", "0.4"), ("2.6.1", "0.4.6"), ("2.6.2", "0.5.4")) # Depends on Magma when +rocm or +cuda - for (magma_v, hiop_v) in magma_ver_constraints: + for magma_v, hiop_v in magma_ver_constraints: depends_on("magma@{0}:".format(magma_v), when="@{0}:+cuda".format(hiop_v)) depends_on("magma@{0}:".format(magma_v), when="@{0}:+rocm".format(hiop_v)) diff --git a/var/spack/repos/builtin/packages/hip/package.py b/var/spack/repos/builtin/packages/hip/package.py index 8fe976bed7..d135b3e48b 100644 --- a/var/spack/repos/builtin/packages/hip/package.py +++ b/var/spack/repos/builtin/packages/hip/package.py @@ -291,10 +291,7 @@ class Hip(CMakePackage): ".5.2.1.patch", when="@5.2.1:5.2.3", ) - patch( - "0013-remove-compiler-rt-linkage-for-host.5.3.0.patch", - when="@5.3.0:", - ) + patch("0013-remove-compiler-rt-linkage-for-host.5.3.0.patch", when="@5.3.0:") # See https://github.com/ROCm-Developer-Tools/HIP/pull/2141 patch("0002-Fix-detection-of-HIP_CLANG_ROOT.patch", when="@:3.9.0") diff --git a/var/spack/repos/builtin/packages/hipfft/package.py b/var/spack/repos/builtin/packages/hipfft/package.py index d7d39b78c1..b0058339ff 100644 --- a/var/spack/repos/builtin/packages/hipfft/package.py +++ b/var/spack/repos/builtin/packages/hipfft/package.py @@ -111,7 +111,7 @@ def setup_build_environment(self, env): def cmake_args(self): args = [ # Make sure find_package(HIP) finds the module. - self.define("BUILD_CLIENTS_SAMPLES", "OFF"), + self.define("BUILD_CLIENTS_SAMPLES", "OFF") ] if self.spec.satisfies("^cmake@3.21.0:3.21.2"): diff --git a/var/spack/repos/builtin/packages/hipsycl/package.py b/var/spack/repos/builtin/packages/hipsycl/package.py index bff4ead8b4..95e95f0c8a 100644 --- a/var/spack/repos/builtin/packages/hipsycl/package.py +++ b/var/spack/repos/builtin/packages/hipsycl/package.py @@ -27,17 +27,9 @@ class Hipsycl(CMakePackage): version("0.9.3", commit="51507bad524c33afe8b124804091b10fa25618dc", submodules=True) version("0.9.2", commit="49fd02499841ae884c61c738610e58c27ab51fdb", submodules=True) version("0.9.1", commit="fe8465cd5399a932f7221343c07c9942b0fe644c", submodules=True) - version( - "0.8.0", - commit="2daf8407e49dd32ebd1c266e8e944e390d28b22a", - submodules=True, - ) + version("0.8.0", commit="2daf8407e49dd32ebd1c266e8e944e390d28b22a", submodules=True) - variant( - "cuda", - default=False, - description="Enable CUDA backend for SYCL kernels", - ) + variant("cuda", default=False, description="Enable CUDA backend for SYCL kernels") depends_on("cmake@3.5:", type="build") depends_on("boost +filesystem", when="@:0.8") diff --git a/var/spack/repos/builtin/packages/hiredis/package.py b/var/spack/repos/builtin/packages/hiredis/package.py index ce7c203301..69191203bd 100644 --- a/var/spack/repos/builtin/packages/hiredis/package.py +++ b/var/spack/repos/builtin/packages/hiredis/package.py @@ -25,9 +25,7 @@ class Hiredis(MakefilePackage, CMakePackage): version("0.13.2", sha256="b0cf73ebe039fe25ecaaa881acdda8bdc393ed997e049b04fc20865835953694") build_system( - conditional("cmake", when="@1:"), - conditional("makefile", when="@:0"), - default="cmake", + conditional("cmake", when="@1:"), conditional("makefile", when="@:0"), default="cmake" ) variant("ssl", default=False, description="Builds with SSL enabled") @@ -45,10 +43,7 @@ class MakefileBuilder(spack.build_systems.makefile.MakefileBuilder): def build_targets(self): use_ssl = 1 if "+ssl" in self.spec else 0 run_test_async = 1 if "+test_async" in self.spec else 0 - return [ - "USE_SSL={0}".format(use_ssl), - "TEST_ASYNC={0}".format(run_test_async), - ] + return ["USE_SSL={0}".format(use_ssl), "TEST_ASYNC={0}".format(run_test_async)] def install(self, pkg, spec, prefix): make("PREFIX={0}".format(prefix), "install") diff --git a/var/spack/repos/builtin/packages/hisat2/package.py b/var/spack/repos/builtin/packages/hisat2/package.py index 68a9807038..53e7deb9ca 100644 --- a/var/spack/repos/builtin/packages/hisat2/package.py +++ b/var/spack/repos/builtin/packages/hisat2/package.py @@ -81,18 +81,13 @@ def filter_sbang(self): with working_dir(self.prefix.bin): pattern = "^#!.*/usr/bin/env python" repl = "#!{0}".format(self.spec["python"].command.path) - files = [ - "hisat2-build", - "hisat2-inspect", - ] + files = ["hisat2-build", "hisat2-inspect"] for file in files: filter_file(pattern, repl, *files, backup=False) pattern = "^#!.*/usr/bin/env perl" repl = "#!{0}".format(self.spec["perl"].command.path) - files = [ - "hisat2", - ] + files = ["hisat2"] for file in files: filter_file(pattern, repl, *files, backup=False) diff --git a/var/spack/repos/builtin/packages/hpctoolkit/package.py b/var/spack/repos/builtin/packages/hpctoolkit/package.py index 1a193d6ccc..bb87c841af 100644 --- a/var/spack/repos/builtin/packages/hpctoolkit/package.py +++ b/var/spack/repos/builtin/packages/hpctoolkit/package.py @@ -48,9 +48,7 @@ class Hpctoolkit(AutotoolsPackage): # version of hpcprof. Cray needs a separate option because an # external MPI module in packages.yaml doesn't work. variant( - "cray", - default=False, - description="Build hpcprof-mpi for Cray systems (requires --dirty).", + "cray", default=False, description="Build hpcprof-mpi for Cray systems (requires --dirty)." ) variant( diff --git a/var/spack/repos/builtin/packages/hpx/package.py b/var/spack/repos/builtin/packages/hpx/package.py index 9bb816079a..43bdcb50d0 100644 --- a/var/spack/repos/builtin/packages/hpx/package.py +++ b/var/spack/repos/builtin/packages/hpx/package.py @@ -105,8 +105,7 @@ class Hpx(CMakePackage, CudaPackage, ROCmPackage): depends_on("asio", when="@1.7:") for cxxstd in cxxstds: depends_on( - "asio cxxstd={0}".format(map_cxxstd(cxxstd)), - when="cxxstd={0} ^asio".format(cxxstd), + "asio cxxstd={0}".format(map_cxxstd(cxxstd)), when="cxxstd={0} ^asio".format(cxxstd) ) depends_on("gperftools", when="malloc=tcmalloc") diff --git a/var/spack/repos/builtin/packages/hypre/package.py b/var/spack/repos/builtin/packages/hypre/package.py index 151c859e53..e34b951c66 100644 --- a/var/spack/repos/builtin/packages/hypre/package.py +++ b/var/spack/repos/builtin/packages/hypre/package.py @@ -215,13 +215,7 @@ def configure_args(self): configure_args.extend(self.enable_or_disable("debug")) if "+cuda" in spec: - configure_args.extend( - [ - "--with-cuda", - "--enable-curand", - "--enable-cusparse", - ] - ) + configure_args.extend(["--with-cuda", "--enable-curand", "--enable-cusparse"]) cuda_arch_vals = spec.variants["cuda_arch"].value if cuda_arch_vals: cuda_arch_sorted = list(sorted(cuda_arch_vals, reverse=True)) @@ -234,13 +228,7 @@ def configure_args(self): else: configure_args.append("--enable-cub") else: - configure_args.extend( - [ - "--without-cuda", - "--disable-curand", - "--disable-cusparse", - ] - ) + configure_args.extend(["--without-cuda", "--disable-curand", "--disable-cusparse"]) if "@:2.20.99" in spec: configure_args.append("--disable-cub") @@ -264,13 +252,7 @@ def configure_args(self): rocm_arch = rocm_arch_sorted[0] configure_args.append("--with-gpu-arch={0}".format(rocm_arch)) else: - configure_args.extend( - [ - "--without-hip", - "--disable-rocrand", - "--disable-rocsparse", - ] - ) + configure_args.extend(["--without-hip", "--disable-rocrand", "--disable-rocsparse"]) if "+sycl" in spec: configure_args.append("--with-scyl") diff --git a/var/spack/repos/builtin/packages/ibm-java/package.py b/var/spack/repos/builtin/packages/ibm-java/package.py index 6ac099892d..de2b87b1ee 100644 --- a/var/spack/repos/builtin/packages/ibm-java/package.py +++ b/var/spack/repos/builtin/packages/ibm-java/package.py @@ -56,7 +56,7 @@ class IbmJava(Package): # There are separate tar files for big and little-endian machine # types. And no, this won't work cross platform. - for (ver, mach, sha) in version_list: + for ver, mach, sha in version_list: if mach == platform.machine(): version(ver, sha256=sha, expand=False) diff --git a/var/spack/repos/builtin/packages/idl/package.py b/var/spack/repos/builtin/packages/idl/package.py index 1954029c45..72552282cb 100644 --- a/var/spack/repos/builtin/packages/idl/package.py +++ b/var/spack/repos/builtin/packages/idl/package.py @@ -24,7 +24,6 @@ class Idl(Package): license_required = True def install(self, spec, prefix): - # replace default install dir to self.prefix by editing answer file filter_file("/usr/local/harris", prefix, "silent/idl_answer_file") @@ -33,7 +32,6 @@ def install(self, spec, prefix): install_script("-s", input="silent/idl_answer_file") def setup_run_environment(self, env): - # set necessary environment variables env.prepend_path("EXELIS_DIR", self.prefix) env.prepend_path("IDL_DIR", self.prefix.idl) diff --git a/var/spack/repos/builtin/packages/intel-llvm/package.py b/var/spack/repos/builtin/packages/intel-llvm/package.py index 21529eaae6..2338fe2c7f 100644 --- a/var/spack/repos/builtin/packages/intel-llvm/package.py +++ b/var/spack/repos/builtin/packages/intel-llvm/package.py @@ -35,7 +35,6 @@ def setup_run_environment(self, env): root_cmakelists_dir = "llvm" def cmake_args(self): - cmake_args = [] cmake_args.extend( diff --git a/var/spack/repos/builtin/packages/intel-oneapi-mpi/package.py b/var/spack/repos/builtin/packages/intel-oneapi-mpi/package.py index e04173b817..a7872d1034 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-mpi/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-mpi/package.py @@ -17,9 +17,7 @@ class IntelOneapiMpi(IntelOneApiLibraryPackage): """ - maintainers( - "rscohn2", - ) + maintainers("rscohn2") homepage = "https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/mpi-library.html" diff --git a/var/spack/repos/builtin/packages/ip/package.py b/var/spack/repos/builtin/packages/ip/package.py index 84dc95f72f..b92fc2b85d 100644 --- a/var/spack/repos/builtin/packages/ip/package.py +++ b/var/spack/repos/builtin/packages/ip/package.py @@ -14,12 +14,7 @@ class Ip(CMakePackage): homepage = "https://noaa-emc.github.io/NCEPLIBS-ip" url = "https://github.com/NOAA-EMC/NCEPLIBS-ip/archive/refs/tags/v3.3.3.tar.gz" - maintainers( - "t-brown", - "AlexanderRichert-NOAA", - "edwardhartnett", - "Hang-Lei-NOAA", - ) + maintainers("t-brown", "AlexanderRichert-NOAA", "edwardhartnett", "Hang-Lei-NOAA") version("4.0.0", sha256="a2ef0cc4e4012f9cb0389fab6097407f4c623eb49772d96eb80c44f804aa86b8") version( diff --git a/var/spack/repos/builtin/packages/ip2/package.py b/var/spack/repos/builtin/packages/ip2/package.py index b70cc35311..13d6e15dbe 100644 --- a/var/spack/repos/builtin/packages/ip2/package.py +++ b/var/spack/repos/builtin/packages/ip2/package.py @@ -17,12 +17,7 @@ class Ip2(CMakePackage): homepage = "https://github.com/NOAA-EMC/NCEPLIBS-ip2" url = "https://github.com/NOAA-EMC/NCEPLIBS-ip2/archive/refs/tags/v1.1.2.tar.gz" - maintainers( - "t-brown", - "AlexanderRichert-NOAA", - "Hang-Lei-NOAA", - "edwardhartnett", - ) + maintainers("t-brown", "AlexanderRichert-NOAA", "Hang-Lei-NOAA", "edwardhartnett") version("1.1.2", sha256="73c6beec8fd463ec7ccba3633d8c5d53d385c43d507367efde918c2db0af42ab") diff --git a/var/spack/repos/builtin/packages/ipopt/package.py b/var/spack/repos/builtin/packages/ipopt/package.py index 7f616f939b..640fa48d52 100644 --- a/var/spack/repos/builtin/packages/ipopt/package.py +++ b/var/spack/repos/builtin/packages/ipopt/package.py @@ -72,11 +72,7 @@ def configure_args(self): blas_lib = spec["blas"].libs.ld_flags lapack_lib = spec["lapack"].libs.ld_flags - args = [ - "--prefix=%s" % self.prefix, - "--enable-shared", - "coin_skip_warn_cxxflags=yes", - ] + args = ["--prefix=%s" % self.prefix, "--enable-shared", "coin_skip_warn_cxxflags=yes"] if spec.satisfies("@:3.12.13"): args.extend( @@ -88,11 +84,7 @@ def configure_args(self): ] ) else: - args.extend( - [ - "--with-lapack-lflags={0} {1}".format(lapack_lib, blas_lib), - ] - ) + args.extend(["--with-lapack-lflags={0} {1}".format(lapack_lib, blas_lib)]) if "+mumps" in spec: mumps_dir = spec["mumps"].prefix diff --git a/var/spack/repos/builtin/packages/iq-tree/package.py b/var/spack/repos/builtin/packages/iq-tree/package.py index b719f6a875..40f9e0b334 100644 --- a/var/spack/repos/builtin/packages/iq-tree/package.py +++ b/var/spack/repos/builtin/packages/iq-tree/package.py @@ -32,7 +32,6 @@ class IqTree(CMakePackage): depends_on("mpi", when="+mpi") def cmake_args(self): - spec = self.spec args = [] iqflags = [] diff --git a/var/spack/repos/builtin/packages/kadath/package.py b/var/spack/repos/builtin/packages/kadath/package.py index 4805c6f779..ae26699704 100644 --- a/var/spack/repos/builtin/packages/kadath/package.py +++ b/var/spack/repos/builtin/packages/kadath/package.py @@ -64,7 +64,7 @@ def setup_build_environment(self, env): def cmake_args(self): return [ # kadath uses a non-standard option to enable MPI - self.define_from_variant("PAR_VERSION", "mpi"), + self.define_from_variant("PAR_VERSION", "mpi") ] def cmake(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/kokkos-legacy/package.py b/var/spack/repos/builtin/packages/kokkos-legacy/package.py index 4a32f40c86..4bf7e85844 100644 --- a/var/spack/repos/builtin/packages/kokkos-legacy/package.py +++ b/var/spack/repos/builtin/packages/kokkos-legacy/package.py @@ -185,34 +185,13 @@ class KokkosLegacy(Package): ) # Checks on Kokkos version and Kokkos options - conflicts( - "+aggressive_vectorization", - when="@:2.0", - ) - conflicts( - "+disable_profiling", - when="@:2.0", - ) - conflicts( - "+disable_dualview_modify_check", - when="@:2.03.04", - ) - conflicts( - "+enable_profile_load_print", - when="@:2.03.04", - ) - conflicts( - "+compiler_warnings", - when="@:2.03.14", - ) - conflicts( - "+disable_deprecated_code", - when="@:2.5", - ) - conflicts( - "+enable_eti", - when="@:2.6", - ) + conflicts("+aggressive_vectorization", when="@:2.0") + conflicts("+disable_profiling", when="@:2.0") + conflicts("+disable_dualview_modify_check", when="@:2.03.04") + conflicts("+enable_profile_load_print", when="@:2.03.04") + conflicts("+compiler_warnings", when="@:2.03.14") + conflicts("+disable_deprecated_code", when="@:2.5") + conflicts("+enable_eti", when="@:2.6") # Check that we haven't specified a gpu architecture # without specifying CUDA @@ -256,10 +235,7 @@ class KokkosLegacy(Package): def install(self, spec, prefix): generate = which(join_path(self.stage.source_path, "generate_makefile.bash")) with working_dir("build", create=True): - g_args = [ - "--prefix=%s" % prefix, - "--with-hwloc=%s" % spec["hwloc"].prefix, - ] + g_args = ["--prefix=%s" % prefix, "--with-hwloc=%s" % spec["hwloc"].prefix] arch_args = [] kokkos_options_args = [] cuda_options_args = [] diff --git a/var/spack/repos/builtin/packages/lapackpp/package.py b/var/spack/repos/builtin/packages/lapackpp/package.py index bca19fa508..4e2e8f01f1 100644 --- a/var/spack/repos/builtin/packages/lapackpp/package.py +++ b/var/spack/repos/builtin/packages/lapackpp/package.py @@ -53,7 +53,7 @@ class Lapackpp(CMakePackage, CudaPackage, ROCmPackage): variant("shared", default=True, description="Build shared library") # Match each LAPACK++ version to a specific BLAS++ version - for (lpp_ver, bpp_ver) in _versions: + for lpp_ver, bpp_ver in _versions: depends_on("blaspp@" + bpp_ver, when="@" + lpp_ver) depends_on("blaspp ~cuda", when="~cuda") diff --git a/var/spack/repos/builtin/packages/lbann/package.py b/var/spack/repos/builtin/packages/lbann/package.py index 21fcc90885..e8d47c0f1b 100644 --- a/var/spack/repos/builtin/packages/lbann/package.py +++ b/var/spack/repos/builtin/packages/lbann/package.py @@ -274,17 +274,10 @@ def common_config_args(self): cppflags.append("-DLBANN_SET_EL_RNG") cppflags.append("-std=c++17") args = [] - args.extend( - [ - "-DCMAKE_CXX_FLAGS=%s" % " ".join(cppflags), - "-DLBANN_VERSION=spack", - ] - ) + args.extend(["-DCMAKE_CXX_FLAGS=%s" % " ".join(cppflags), "-DLBANN_VERSION=spack"]) if "+numpy" in spec: - args.append( - "-DCNPY_DIR={0}".format(spec["cnpy"].prefix), - ) + args.append("-DCNPY_DIR={0}".format(spec["cnpy"].prefix)) # Use lld high performance linker if "+lld" in spec: @@ -428,11 +421,7 @@ def cmake_args(self): ] ) if "platform=cray" in spec: - args.extend( - [ - "-DMPI_ASSUME_NO_BUILTIN_MPI=ON", - ] - ) + args.extend(["-DMPI_ASSUME_NO_BUILTIN_MPI=ON"]) archs = self.spec.variants["amdgpu_target"].value if archs != "none": arch_str = ",".join(archs) diff --git a/var/spack/repos/builtin/packages/lcals/package.py b/var/spack/repos/builtin/packages/lcals/package.py index 3b0a94ed8f..221ab2a967 100644 --- a/var/spack/repos/builtin/packages/lcals/package.py +++ b/var/spack/repos/builtin/packages/lcals/package.py @@ -33,7 +33,6 @@ class Lcals(MakefilePackage): @property def build_targets(self): - targets = [] cxxflags = "-std=c++0x " diff --git a/var/spack/repos/builtin/packages/ldc-bootstrap/package.py b/var/spack/repos/builtin/packages/ldc-bootstrap/package.py index 0d701bafa9..e41ad9ae24 100644 --- a/var/spack/repos/builtin/packages/ldc-bootstrap/package.py +++ b/var/spack/repos/builtin/packages/ldc-bootstrap/package.py @@ -32,7 +32,6 @@ class LdcBootstrap(CMakePackage): depends_on("binutils") def setup_dependent_build_environment(self, env, dep_spec): - # The code below relies on this function being executed after the # environment has been sanitized (because LD_LIBRARY_PATH is among # the variables that get unset) diff --git a/var/spack/repos/builtin/packages/ldc/package.py b/var/spack/repos/builtin/packages/ldc/package.py index 9f120970d3..9d843221e7 100644 --- a/var/spack/repos/builtin/packages/ldc/package.py +++ b/var/spack/repos/builtin/packages/ldc/package.py @@ -47,7 +47,6 @@ def cmake_args(self): @run_after("install") def add_rpath_to_conf(self): - # Here we modify the configuration file for ldc2 to inject flags # that will rpath the standard library location diff --git a/var/spack/repos/builtin/packages/legion/package.py b/var/spack/repos/builtin/packages/legion/package.py index 1a5feb022b..45aec55b5e 100644 --- a/var/spack/repos/builtin/packages/legion/package.py +++ b/var/spack/repos/builtin/packages/legion/package.py @@ -395,13 +395,7 @@ def cmake_args(self): options.append("-DLegion_USE_Fortran=ON") if spec.variants["build_type"].value == "Debug": - cmake_cxx_flags.extend( - [ - "-DDEBUG_REALM", - "-DDEBUG_LEGION", - "-ggdb", - ] - ) + cmake_cxx_flags.extend(["-DDEBUG_REALM", "-DDEBUG_LEGION", "-ggdb"]) maxdims = int(spec.variants["max_dims"].value) # TODO: sanity check if maxdims < 0 || > 9??? diff --git a/var/spack/repos/builtin/packages/libabigail/package.py b/var/spack/repos/builtin/packages/libabigail/package.py index fdca568502..43585f1b31 100644 --- a/var/spack/repos/builtin/packages/libabigail/package.py +++ b/var/spack/repos/builtin/packages/libabigail/package.py @@ -47,6 +47,5 @@ def configure_args(self): def autoreconf(self, spec, prefix): autoreconf = which("autoreconf") with working_dir(self.configure_directory): - # We need force (f) because without it, looks for RedHat library autoreconf("-ivf") diff --git a/var/spack/repos/builtin/packages/libbeagle/package.py b/var/spack/repos/builtin/packages/libbeagle/package.py index df94a17a78..8b177a9438 100644 --- a/var/spack/repos/builtin/packages/libbeagle/package.py +++ b/var/spack/repos/builtin/packages/libbeagle/package.py @@ -65,7 +65,7 @@ def configure_args(self): args = [ # Since spack will inject architecture flags turn off -march=native # when building libbeagle. - "--disable-march-native", + "--disable-march-native" ] if "+cuda" in self.spec: diff --git a/var/spack/repos/builtin/packages/libcroco/package.py b/var/spack/repos/builtin/packages/libcroco/package.py index d333854f77..685fb9f218 100644 --- a/var/spack/repos/builtin/packages/libcroco/package.py +++ b/var/spack/repos/builtin/packages/libcroco/package.py @@ -39,11 +39,7 @@ def configure_args(self): ) else: config_args.extend( - [ - "--disable-gtk-doc", - "--disable-gtk-doc-html", - "--disable-gtk-doc-pdf", - ] + ["--disable-gtk-doc", "--disable-gtk-doc-html", "--disable-gtk-doc-pdf"] ) # macOS ld does not support this flag diff --git a/var/spack/repos/builtin/packages/libfms/package.py b/var/spack/repos/builtin/packages/libfms/package.py index 2dcb0beef2..81eb5ce7d3 100644 --- a/var/spack/repos/builtin/packages/libfms/package.py +++ b/var/spack/repos/builtin/packages/libfms/package.py @@ -27,11 +27,7 @@ class Libfms(CMakePackage): def cmake_args(self): args = [] - args.extend( - [ - self.define_from_variant("BUILD_SHARED_LIBS", "shared"), - ] - ) + args.extend([self.define_from_variant("BUILD_SHARED_LIBS", "shared")]) if "+conduit" in self.spec: args.extend([self.define("CONDUIT_DIR", self.spec["conduit"].prefix)]) diff --git a/var/spack/repos/builtin/packages/libgeotiff/package.py b/var/spack/repos/builtin/packages/libgeotiff/package.py index 415ed079ab..60adf0acaf 100644 --- a/var/spack/repos/builtin/packages/libgeotiff/package.py +++ b/var/spack/repos/builtin/packages/libgeotiff/package.py @@ -55,9 +55,7 @@ class Libgeotiff(AutotoolsPackage): def configure_args(self): spec = self.spec - args = [ - "--with-libtiff={0}".format(spec["libtiff"].prefix), - ] + args = ["--with-libtiff={0}".format(spec["libtiff"].prefix)] if "+zlib" in spec: args.append("--with-zlib={0}".format(spec["zlib"].prefix)) diff --git a/var/spack/repos/builtin/packages/libint/package.py b/var/spack/repos/builtin/packages/libint/package.py index 6a4500d9de..74f273a8b2 100644 --- a/var/spack/repos/builtin/packages/libint/package.py +++ b/var/spack/repos/builtin/packages/libint/package.py @@ -121,7 +121,6 @@ def setup_build_environment(self, env): env.set("AR", "xiar") def configure_args(self): - config_args = ["--enable-shared"] if self.spec.satisfies("@2:"): diff --git a/var/spack/repos/builtin/packages/libmypaint/package.py b/var/spack/repos/builtin/packages/libmypaint/package.py index 3896281b20..0cac584845 100644 --- a/var/spack/repos/builtin/packages/libmypaint/package.py +++ b/var/spack/repos/builtin/packages/libmypaint/package.py @@ -41,10 +41,7 @@ def configure_args(self): if "+introspection" in self.spec: args.extend( - [ - "--enable-introspection=yes", - "--with-glib={0}".format(self.spec["glib"].prefix), - ] + ["--enable-introspection=yes", "--with-glib={0}".format(self.spec["glib"].prefix)] ) return args diff --git a/var/spack/repos/builtin/packages/libpsl/package.py b/var/spack/repos/builtin/packages/libpsl/package.py index b7aa427071..ebaaade803 100644 --- a/var/spack/repos/builtin/packages/libpsl/package.py +++ b/var/spack/repos/builtin/packages/libpsl/package.py @@ -38,9 +38,7 @@ def url_for_version(self, version): def configure_args(self): spec = self.spec - args = [ - "PYTHON={0}".format(spec["python"].command.path), - ] + args = ["PYTHON={0}".format(spec["python"].command.path)] if self.run_tests: args.append("--enable-valgrind-tests") diff --git a/var/spack/repos/builtin/packages/libqrencode/package.py b/var/spack/repos/builtin/packages/libqrencode/package.py index b9ae9631b6..6b7c21a6ce 100644 --- a/var/spack/repos/builtin/packages/libqrencode/package.py +++ b/var/spack/repos/builtin/packages/libqrencode/package.py @@ -32,9 +32,7 @@ def autoreconf(self, spec, prefix): # We had to call for autoreconf as well: # https://stackoverflow.com/questions/3096989/libtool-version-mismatch-error # There appears $LIBTOOLIZE --force --automake --copy is not necessary - args = [ - "autoreconf --force --install", - ] + args = ["autoreconf --force --install"] with open("autogen.sh", "a") as fh: fh.write("\n".join(args)) # https://fukuchi.org/works/qrencode/ diff --git a/var/spack/repos/builtin/packages/libraw1394/package.py b/var/spack/repos/builtin/packages/libraw1394/package.py index f6c17711b4..7e17b25b52 100644 --- a/var/spack/repos/builtin/packages/libraw1394/package.py +++ b/var/spack/repos/builtin/packages/libraw1394/package.py @@ -13,7 +13,4 @@ class Libraw1394(AutotoolsPackage): homepage = "https://sourceforge.net/projects/libraw1394/" url = "https://sourceforge.net/projects/libraw1394/files/libraw1394/1.2.0/libraw1394-1.2.0.tar.gz" - version( - "1.2.0", - sha256="1fdcfa4c5a0938705b925d06f17da9be6ec3f8f065040bb7f33082ef3fc63fad", - ) + version("1.2.0", sha256="1fdcfa4c5a0938705b925d06f17da9be6ec3f8f065040bb7f33082ef3fc63fad") diff --git a/var/spack/repos/builtin/packages/libszip/package.py b/var/spack/repos/builtin/packages/libszip/package.py index 5a06b97cfa..fea9c5fe82 100644 --- a/var/spack/repos/builtin/packages/libszip/package.py +++ b/var/spack/repos/builtin/packages/libszip/package.py @@ -38,9 +38,4 @@ def libs(self): return libs def configure_args(self): - return [ - "--enable-production", - "--enable-shared", - "--enable-static", - "--enable-encoding", - ] + return ["--enable-production", "--enable-shared", "--enable-static", "--enable-encoding"] diff --git a/var/spack/repos/builtin/packages/libtiff/package.py b/var/spack/repos/builtin/packages/libtiff/package.py index b11f7fbaf1..bf183a2406 100644 --- a/var/spack/repos/builtin/packages/libtiff/package.py +++ b/var/spack/repos/builtin/packages/libtiff/package.py @@ -72,11 +72,7 @@ class Libtiff(CMakePackage, AutotoolsPackage): variant("zstd", default=False, description="use libzstd", when="@4.0.10:") variant("webp", default=False, description="use libwebp", when="@4.0.10:") - build_system( - conditional("cmake", when="@4.0.5:"), - "autotools", - default="cmake", - ) + build_system(conditional("cmake", when="@4.0.5:"), "autotools", default="cmake") with when("build_system=cmake"): depends_on("cmake@3.9:", when="@4.3:", type="build") diff --git a/var/spack/repos/builtin/packages/libwebp/package.py b/var/spack/repos/builtin/packages/libwebp/package.py index 7f6e68de81..a77c259c69 100644 --- a/var/spack/repos/builtin/packages/libwebp/package.py +++ b/var/spack/repos/builtin/packages/libwebp/package.py @@ -40,11 +40,7 @@ class Libwebp(AutotoolsPackage): def configure_args(self): # TODO: add variants and dependencies for these - args = [ - "--disable-gl", - "--disable-sdl", - "--disable-wic", - ] + args = ["--disable-gl", "--disable-sdl", "--disable-wic"] args += self.enable_or_disable("gif") args += self.enable_or_disable("jpeg") diff --git a/var/spack/repos/builtin/packages/linsys-v/package.py b/var/spack/repos/builtin/packages/linsys-v/package.py index 972d9f6037..f0a4e089d7 100644 --- a/var/spack/repos/builtin/packages/linsys-v/package.py +++ b/var/spack/repos/builtin/packages/linsys-v/package.py @@ -13,10 +13,7 @@ class LinsysV(MakefilePackage): homepage = "http://www.math.twcu.ac.jp/ogita/post-k/" url = "http://www.math.twcu.ac.jp/ogita/post-k/software/LINSYS_V/LINSYS_V_alpha.tar.gz" - version( - "alpha", - sha256="6666bc837bb6598b7cdefb233d3d0f2c308a24fe3465e4fe9b6c9762810bb320", - ) + version("alpha", sha256="6666bc837bb6598b7cdefb233d3d0f2c308a24fe3465e4fe9b6c9762810bb320") depends_on("mpi") depends_on("blas", type="link") diff --git a/var/spack/repos/builtin/packages/llvm-doe/package.py b/var/spack/repos/builtin/packages/llvm-doe/package.py index 7bc36f7648..e9820dfacb 100644 --- a/var/spack/repos/builtin/packages/llvm-doe/package.py +++ b/var/spack/repos/builtin/packages/llvm-doe/package.py @@ -43,15 +43,9 @@ class LlvmDoe(CMakePackage, CudaPackage): # to save space, build with `build_type=Release`. variant( - "clang", - default=True, - description="Build the LLVM C/C++/Objective-C compiler frontend", - ) - variant( - "flang", - default=False, - description="Build the LLVM Fortran compiler frontend", + "clang", default=True, description="Build the LLVM C/C++/Objective-C compiler frontend" ) + variant("flang", default=False, description="Build the LLVM Fortran compiler frontend") variant( "omp_debug", default=False, @@ -60,21 +54,13 @@ class LlvmDoe(CMakePackage, CudaPackage): variant("lldb", default=False, description="Build the LLVM debugger") variant("lld", default=True, description="Build the LLVM linker") variant("mlir", default=False, description="Build with MLIR support") - variant( - "internal_unwind", - default=True, - description="Build the libcxxabi libunwind", - ) + variant("internal_unwind", default=True, description="Build the libcxxabi libunwind") variant( "polly", default=True, description="Build the LLVM polyhedral optimization plugin, " "only builds for 3.7.0+", ) - variant( - "libcxx", - default=True, - description="Build the LLVM C++ standard library", - ) + variant("libcxx", default=True, description="Build the LLVM C++ standard library") variant( "compiler-rt", default=True, @@ -85,11 +71,7 @@ class LlvmDoe(CMakePackage, CudaPackage): default=(sys.platform != "darwin"), description="Add support for LTO with the gold linker plugin", ) - variant( - "split_dwarf", - default=False, - description="Build with split dwarf information", - ) + variant("split_dwarf", default=False, description="Build with split dwarf information") variant( "llvm_dylib", default=False, @@ -113,11 +95,7 @@ class LlvmDoe(CMakePackage, CudaPackage): description="CMake build type", values=("Debug", "Release", "RelWithDebInfo", "MinSizeRel"), ) - variant( - "omp_tsan", - default=False, - description="Build with OpenMP capable thread sanitizer", - ) + variant("omp_tsan", default=False, description="Build with OpenMP capable thread sanitizer") variant( "omp_as_runtime", default=True, @@ -551,7 +529,6 @@ def cmake_args(self): ) if "+all_targets" not in spec: # all is default on cmake - targets = ["NVPTX", "AMDGPU"] if spec.version < Version("3.9.0"): # Starting in 3.9.0 CppBackend is no longer a target (see diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py index 9e2eb858ec..e94ff94d75 100644 --- a/var/spack/repos/builtin/packages/llvm/package.py +++ b/var/spack/repos/builtin/packages/llvm/package.py @@ -76,9 +76,7 @@ class Llvm(CMakePackage, CudaPackage): # to save space, build with `build_type=Release`. variant( - "clang", - default=True, - description="Build the LLVM C/C++/Objective-C compiler frontend", + "clang", default=True, description="Build the LLVM C/C++/Objective-C compiler frontend" ) variant( "flang", @@ -96,10 +94,7 @@ class Llvm(CMakePackage, CudaPackage): variant("lld", default=True, description="Build the LLVM linker") variant("mlir", default=False, when="@10:", description="Build with MLIR support") variant( - "internal_unwind", - default=True, - when="+clang", - description="Build the libcxxabi libunwind", + "internal_unwind", default=True, when="+clang", description="Build the libcxxabi libunwind" ) variant( "polly", @@ -107,10 +102,7 @@ class Llvm(CMakePackage, CudaPackage): description="Build the LLVM polyhedral optimization plugin, " "only builds for 3.7.0+", ) variant( - "libcxx", - default=True, - when="+clang", - description="Build the LLVM C++ standard library", + "libcxx", default=True, when="+clang", description="Build the LLVM C++ standard library" ) variant( "compiler-rt", @@ -123,11 +115,7 @@ class Llvm(CMakePackage, CudaPackage): default=(sys.platform != "darwin"), description="Add support for LTO with the gold linker plugin", ) - variant( - "split_dwarf", - default=False, - description="Build with split dwarf information", - ) + variant("split_dwarf", default=False, description="Build with split dwarf information") variant( "llvm_dylib", default=True, diff --git a/var/spack/repos/builtin/packages/lua-luajit-openresty/package.py b/var/spack/repos/builtin/packages/lua-luajit-openresty/package.py index 787ce91836..31ae9aa551 100644 --- a/var/spack/repos/builtin/packages/lua-luajit-openresty/package.py +++ b/var/spack/repos/builtin/packages/lua-luajit-openresty/package.py @@ -51,8 +51,7 @@ def edit(self, spec, prefix): # Catalina and higher produce a non-functional luajit unless this is set if spec.satisfies("platform=darwin"): src_makefile.filter( - "^.XCFLAGS.= -DLUAJIT_ENABLE_GC64", - "XCFLAGS+= -DLUAJIT_ENABLE_GC64", + "^.XCFLAGS.= -DLUAJIT_ENABLE_GC64", "XCFLAGS+= -DLUAJIT_ENABLE_GC64" ) # Linking with the C++ compiler is a dirty hack to deal with the fact # that unwinding symbols are not included by libc, this is necessary diff --git a/var/spack/repos/builtin/packages/lua-mpack/package.py b/var/spack/repos/builtin/packages/lua-mpack/package.py index 1a94ce92df..3b3c4b55a1 100644 --- a/var/spack/repos/builtin/packages/lua-mpack/package.py +++ b/var/spack/repos/builtin/packages/lua-mpack/package.py @@ -15,22 +15,10 @@ class LuaMpack(LuaPackage): depends_on("msgpack-c") - version( - "1.0.9", - sha256="0fd07e709c3f6f201c2ffc9f77cef1b303b02c12413f0c15670a32bf6c959e9e", - ) - version( - "1.0.8", - sha256="ed6b1b4bbdb56f26241397c1e168a6b1672f284989303b150f7ea8d39d1bc9e9", - ) - version( - "1.0.7", - sha256="68565484a3441d316bd51bed1cacd542b7f84b1ecfd37a8bd18dd0f1a20887e8", - ) - version( - "1.0.6-0", - sha256="9068d9d3f407c72a7ea18bc270b0fa90aad60a2f3099fa23d5902dd71ea4cd5f", - ) + version("1.0.9", sha256="0fd07e709c3f6f201c2ffc9f77cef1b303b02c12413f0c15670a32bf6c959e9e") + version("1.0.8", sha256="ed6b1b4bbdb56f26241397c1e168a6b1672f284989303b150f7ea8d39d1bc9e9") + version("1.0.7", sha256="68565484a3441d316bd51bed1cacd542b7f84b1ecfd37a8bd18dd0f1a20887e8") + version("1.0.6-0", sha256="9068d9d3f407c72a7ea18bc270b0fa90aad60a2f3099fa23d5902dd71ea4cd5f") def luarocks_args(self): return ["CFLAGS=-fPIC -Wno-error=implicit-function-declaration"] diff --git a/var/spack/repos/builtin/packages/lua/package.py b/var/spack/repos/builtin/packages/lua/package.py index 99a83067b8..fbe125cee2 100644 --- a/var/spack/repos/builtin/packages/lua/package.py +++ b/var/spack/repos/builtin/packages/lua/package.py @@ -154,9 +154,7 @@ def setup_dependent_run_environment(self, env, dependent_spec): def setup_run_environment(self, env): env.prepend_path( - "LUA_PATH", - os.path.join(self.spec.prefix, self.lua_share_dir, "?.lua"), - separator=";", + "LUA_PATH", os.path.join(self.spec.prefix, self.lua_share_dir, "?.lua"), separator=";" ) env.prepend_path( "LUA_PATH", @@ -164,9 +162,7 @@ def setup_run_environment(self, env): separator=";", ) env.prepend_path( - "LUA_PATH", - os.path.join(self.spec.prefix, self.lua_lib_dir, "?.lua"), - separator=";", + "LUA_PATH", os.path.join(self.spec.prefix, self.lua_lib_dir, "?.lua"), separator=";" ) env.prepend_path( "LUA_PATH", @@ -174,9 +170,7 @@ def setup_run_environment(self, env): separator=";", ) env.prepend_path( - "LUA_CPATH", - os.path.join(self.spec.prefix, self.lua_lib_dir, "?.so"), - separator=";", + "LUA_CPATH", os.path.join(self.spec.prefix, self.lua_lib_dir, "?.so"), separator=";" ) @property diff --git a/var/spack/repos/builtin/packages/maeparser/package.py b/var/spack/repos/builtin/packages/maeparser/package.py index 9fce2fcced..e24dd72661 100644 --- a/var/spack/repos/builtin/packages/maeparser/package.py +++ b/var/spack/repos/builtin/packages/maeparser/package.py @@ -26,7 +26,5 @@ class Maeparser(CMakePackage): depends_on("zlib") def cmake_args(self): - args = [ - self.define_from_variant("MAEPARSER_BUILD_SHARED_LIBS", "shared"), - ] + args = [self.define_from_variant("MAEPARSER_BUILD_SHARED_LIBS", "shared")] return args diff --git a/var/spack/repos/builtin/packages/mapsplice2/package.py b/var/spack/repos/builtin/packages/mapsplice2/package.py index dedb3052bb..7fb6c1f2c2 100644 --- a/var/spack/repos/builtin/packages/mapsplice2/package.py +++ b/var/spack/repos/builtin/packages/mapsplice2/package.py @@ -15,10 +15,7 @@ class Mapsplice2(MakefilePackage): homepage = "http://www.netlab.uky.edu/p/bioinfo/MapSplice2" url = "https://protocols.netlab.uky.edu/~zeng/MapSplice-v2.2.1.zip" - version( - "2.2.1", - sha256="4f3c1cb49ba0abcfc952de5946ee0b56db28c51f4f4d4f5abca66b4461ca7d05", - ) + version("2.2.1", sha256="4f3c1cb49ba0abcfc952de5946ee0b56db28c51f4f4d4f5abca66b4461ca7d05") patch("Makefile.patch") patch("mapsplice_ebwt.patch") @@ -31,12 +28,7 @@ class Mapsplice2(MakefilePackage): def edit(self, spec, prefix): for iscan in find( "src", - [ - "SamRec.*", - "AlignmentHandler.cpp", - "JunctionHandler.cpp", - "FusionSamRec.*", - ], + ["SamRec.*", "AlignmentHandler.cpp", "JunctionHandler.cpp", "FusionSamRec.*"], recursive=True, ): m = FileFilter(iscan) diff --git a/var/spack/repos/builtin/packages/mctc-lib/package.py b/var/spack/repos/builtin/packages/mctc-lib/package.py index 89581bbbf5..b9d4ba5301 100644 --- a/var/spack/repos/builtin/packages/mctc-lib/package.py +++ b/var/spack/repos/builtin/packages/mctc-lib/package.py @@ -26,6 +26,4 @@ class MctcLib(MesonPackage): depends_on("pkgconfig", type="build") def meson_args(self): - return [ - "-Djson={0}".format("enabled" if "+json" in self.spec else "disabled"), - ] + return ["-Djson={0}".format("enabled" if "+json" in self.spec else "disabled")] diff --git a/var/spack/repos/builtin/packages/med/package.py b/var/spack/repos/builtin/packages/med/package.py index de3cbdc49f..96d8632e28 100644 --- a/var/spack/repos/builtin/packages/med/package.py +++ b/var/spack/repos/builtin/packages/med/package.py @@ -65,19 +65,9 @@ def cmake_args(self): ) if "+shared" in spec: - options.extend( - [ - "-DMEDFILE_BUILD_SHARED_LIBS=ON", - "-DMEDFILE_BUILD_STATIC_LIBS=OFF", - ] - ) + options.extend(["-DMEDFILE_BUILD_SHARED_LIBS=ON", "-DMEDFILE_BUILD_STATIC_LIBS=OFF"]) else: - options.extend( - [ - "-DMEDFILE_BUILD_SHARED_LIBS=OFF", - "-DMEDFILE_BUILD_STATIC_LIBS=ON", - ] - ) + options.extend(["-DMEDFILE_BUILD_SHARED_LIBS=OFF", "-DMEDFILE_BUILD_STATIC_LIBS=ON"]) if "+mpi" in spec: options.extend(["-DMEDFILE_USE_MPI=YES", "-DMPI_ROOT_DIR=%s" % spec["mpi"].prefix]) diff --git a/var/spack/repos/builtin/packages/mesa/package.py b/var/spack/repos/builtin/packages/mesa/package.py index b8c7903786..d4d489de74 100644 --- a/var/spack/repos/builtin/packages/mesa/package.py +++ b/var/spack/repos/builtin/packages/mesa/package.py @@ -73,14 +73,7 @@ class Mesa(MesonPackage): variant( "swr", values=spack.variant.DisjointSetsOfValues( - ("none",), - ("auto",), - ( - "avx", - "avx2", - "knl", - "skx", - ), + ("none",), ("auto",), ("avx", "avx2", "knl", "skx") ) .with_non_feature_values("auto") .with_non_feature_values("none") diff --git a/var/spack/repos/builtin/packages/mesa18/package.py b/var/spack/repos/builtin/packages/mesa18/package.py index 2948477f46..64e7aa60f0 100644 --- a/var/spack/repos/builtin/packages/mesa18/package.py +++ b/var/spack/repos/builtin/packages/mesa18/package.py @@ -45,14 +45,7 @@ class Mesa18(AutotoolsPackage): variant( "swr", values=spack.variant.DisjointSetsOfValues( - ("none",), - ("auto",), - ( - "avx", - "avx2", - "knl", - "skx", - ), + ("none",), ("auto",), ("avx", "avx2", "knl", "skx") ) .with_non_feature_values("auto") .with_non_feature_values("none") diff --git a/var/spack/repos/builtin/packages/mesquite/package.py b/var/spack/repos/builtin/packages/mesquite/package.py index ab1ca8bc1f..91dfa60aa7 100644 --- a/var/spack/repos/builtin/packages/mesquite/package.py +++ b/var/spack/repos/builtin/packages/mesquite/package.py @@ -27,10 +27,7 @@ class Mesquite(AutotoolsPackage): depends_on("mpi", when="+mpi") def configure_args(self): - args = [ - "--enable-release", - "--enable-shared", - ] + args = ["--enable-release", "--enable-shared"] if "+mpi" in self.spec: args.append("CC=%s" % self.spec["mpi"].mpicc) diff --git a/var/spack/repos/builtin/packages/mfem/package.py b/var/spack/repos/builtin/packages/mfem/package.py index ef61f8f01e..f8ddcf9951 100644 --- a/var/spack/repos/builtin/packages/mfem/package.py +++ b/var/spack/repos/builtin/packages/mfem/package.py @@ -335,8 +335,7 @@ class Mfem(Package, CudaPackage, ROCmPackage): depends_on("ginkgo@1.4.0:", when="+ginkgo") for sm_ in CudaPackage.cuda_arch_values: depends_on( - "ginkgo+cuda cuda_arch={0}".format(sm_), - when="+ginkgo+cuda cuda_arch={0}".format(sm_), + "ginkgo+cuda cuda_arch={0}".format(sm_), when="+ginkgo+cuda cuda_arch={0}".format(sm_) ) for gfx in ROCmPackage.amdgpu_targets: depends_on( @@ -347,8 +346,7 @@ class Mfem(Package, CudaPackage, ROCmPackage): depends_on("hiop@0.4.6:+mpi", when="+hiop+mpi") for sm_ in CudaPackage.cuda_arch_values: depends_on( - "hiop+cuda cuda_arch={0}".format(sm_), - when="+hiop+cuda cuda_arch={0}".format(sm_), + "hiop+cuda cuda_arch={0}".format(sm_), when="+hiop+cuda cuda_arch={0}".format(sm_) ) for gfx in ROCmPackage.amdgpu_targets: depends_on( diff --git a/var/spack/repos/builtin/packages/mg/package.py b/var/spack/repos/builtin/packages/mg/package.py index 2ee36cc6f7..f652e6bd68 100644 --- a/var/spack/repos/builtin/packages/mg/package.py +++ b/var/spack/repos/builtin/packages/mg/package.py @@ -22,8 +22,5 @@ class Mg(MakefilePackage): def edit(self, spec, prefix): configure = Executable("./configure") - args = [ - "--mandir={0}".format(self.prefix.man), - "--prefix={0}".format(self.prefix), - ] + args = ["--mandir={0}".format(self.prefix.man), "--prefix={0}".format(self.prefix)] configure(*args) diff --git a/var/spack/repos/builtin/packages/mgcfd-op2/package.py b/var/spack/repos/builtin/packages/mgcfd-op2/package.py index 1760fb4f08..3ed7525980 100644 --- a/var/spack/repos/builtin/packages/mgcfd-op2/package.py +++ b/var/spack/repos/builtin/packages/mgcfd-op2/package.py @@ -33,12 +33,7 @@ class MgcfdOp2(MakefilePackage): depends_on("op2-dsl~mpi", when="~mpi") def setup_build_environment(self, env): - compiler_map = { - "gcc": "gnu", - "arm": "clang", - "cce": "cray", - "nvhpc": "pgi", - } + compiler_map = {"gcc": "gnu", "arm": "clang", "cce": "cray", "nvhpc": "pgi"} if self.spec.compiler.name in compiler_map: env.set("COMPILER", compiler_map[self.spec.compiler.name]) else: diff --git a/var/spack/repos/builtin/packages/mgis/package.py b/var/spack/repos/builtin/packages/mgis/package.py index fd2a3ec696..fc0c93836e 100644 --- a/var/spack/repos/builtin/packages/mgis/package.py +++ b/var/spack/repos/builtin/packages/mgis/package.py @@ -85,7 +85,6 @@ def check(self): self._if_ninja_target_execute("check") def cmake_args(self): - args = [] args.append("-DUSE_EXTERNAL_COMPILER_FLAGS=ON") diff --git a/var/spack/repos/builtin/packages/mimalloc/package.py b/var/spack/repos/builtin/packages/mimalloc/package.py index c71df18563..e764d2e92d 100644 --- a/var/spack/repos/builtin/packages/mimalloc/package.py +++ b/var/spack/repos/builtin/packages/mimalloc/package.py @@ -55,11 +55,7 @@ class Mimalloc(CMakePackage): "for malloc() etc)", None, ), - "xmalloc": ( - False, - "Enable abort() call on memory allocation failure by default", - None, - ), + "xmalloc": (False, "Enable abort() call on memory allocation failure by default", None), "show_errors": ( False, "Show error and warning messages by default (only enabled by default " diff --git a/var/spack/repos/builtin/packages/minigmg/package.py b/var/spack/repos/builtin/packages/minigmg/package.py index 5bb2945dd9..3e3cfbfddd 100644 --- a/var/spack/repos/builtin/packages/minigmg/package.py +++ b/var/spack/repos/builtin/packages/minigmg/package.py @@ -52,7 +52,6 @@ class Minigmg(Package): patch("inline_static.patch") def install(self, spec, prefix): - cc = Executable(spec["mpi"].mpicc) args = [] diff --git a/var/spack/repos/builtin/packages/miopen-hip/package.py b/var/spack/repos/builtin/packages/miopen-hip/package.py index 5acfb7840c..98c610f52b 100644 --- a/var/spack/repos/builtin/packages/miopen-hip/package.py +++ b/var/spack/repos/builtin/packages/miopen-hip/package.py @@ -153,21 +153,10 @@ class MiopenHip(CMakePackage): depends_on("rocm-clang-ocl@" + ver, when="@" + ver) depends_on("rocblas@" + ver, when="@" + ver) - for ver in [ - "5.1.0", - "5.1.3", - "5.2.0", - "5.2.1", - "5.2.3", - "5.3.0", - "5.3.3", - ]: + for ver in ["5.1.0", "5.1.3", "5.2.0", "5.2.1", "5.2.3", "5.3.0", "5.3.3"]: depends_on("mlirmiopen@" + ver, when="@" + ver) - for ver in [ - "5.4.0", - "5.4.3", - ]: + for ver in ["5.4.0", "5.4.3"]: depends_on("rocmlir@" + ver, when="@" + ver) depends_on("nlohmann-json", type="link") diff --git a/var/spack/repos/builtin/packages/miopen-opencl/package.py b/var/spack/repos/builtin/packages/miopen-opencl/package.py index 544691db06..d0fe124bc0 100644 --- a/var/spack/repos/builtin/packages/miopen-opencl/package.py +++ b/var/spack/repos/builtin/packages/miopen-opencl/package.py @@ -120,9 +120,7 @@ class MiopenOpencl(CMakePackage): depends_on("half", type="build") depends_on("miopengemm@1.1.6", type="link", when="@3.5.0") - for ver in [ - "3.5.0", - ]: + for ver in ["3.5.0"]: depends_on("rocm-cmake@%s:" % ver, type="build", when="@" + ver) depends_on("rocm-opencl@" + ver, when="@" + ver) @@ -153,21 +151,10 @@ class MiopenOpencl(CMakePackage): depends_on("rocm-opencl@" + ver, when="@" + ver) depends_on("miopengemm@" + ver, when="@" + ver) - for ver in [ - "5.1.0", - "5.1.3", - "5.2.0", - "5.2.1", - "5.2.3", - "5.3.0", - "5.3.3", - ]: + for ver in ["5.1.0", "5.1.3", "5.2.0", "5.2.1", "5.2.3", "5.3.0", "5.3.3"]: depends_on("mlirmiopen@" + ver, when="@" + ver) - for ver in [ - "5.4.0", - "5.4.3", - ]: + for ver in ["5.4.0", "5.4.3"]: depends_on("nlohmann-json", type="link") depends_on("rocblas", type="link") depends_on("rocmlir@" + ver, when="@" + ver) diff --git a/var/spack/repos/builtin/packages/mivisionx/package.py b/var/spack/repos/builtin/packages/mivisionx/package.py index cc9bab5a4c..7d15d26aef 100644 --- a/var/spack/repos/builtin/packages/mivisionx/package.py +++ b/var/spack/repos/builtin/packages/mivisionx/package.py @@ -270,9 +270,7 @@ def flag_handler(self, name, flags): def cmake_args(self): spec = self.spec protobuf = spec["protobuf"].prefix.include - args = [ - self.define("CMAKE_CXX_FLAGS", "-I{0}".format(protobuf)), - ] + args = [self.define("CMAKE_CXX_FLAGS", "-I{0}".format(protobuf))] if self.spec.satisfies("+opencl"): args.append(self.define("BACKEND", "OPENCL")) args.append(self.define("HSA_PATH", spec["hsa-rocr-dev"].prefix)) diff --git a/var/spack/repos/builtin/packages/mlirmiopen/package.py b/var/spack/repos/builtin/packages/mlirmiopen/package.py index a55f848d1d..312341e4a6 100644 --- a/var/spack/repos/builtin/packages/mlirmiopen/package.py +++ b/var/spack/repos/builtin/packages/mlirmiopen/package.py @@ -51,16 +51,7 @@ def patch(self): depends_on("half") depends_on("pkgconfig", type="build") - for ver in [ - "5.1.0", - "5.1.3", - "5.2.0", - "5.2.1", - "5.2.3", - "5.3.0", - "5.3.3", - "5.4.0", - ]: + for ver in ["5.1.0", "5.1.3", "5.2.0", "5.2.1", "5.2.3", "5.3.0", "5.3.3", "5.4.0"]: depends_on("hip@" + ver, when="@" + ver) depends_on("llvm-amdgpu@" + ver, when="@" + ver) depends_on("hsa-rocr-dev@" + ver, when="@" + ver) diff --git a/var/spack/repos/builtin/packages/mpas-model/package.py b/var/spack/repos/builtin/packages/mpas-model/package.py index 0235ffd7a4..442c5a034f 100644 --- a/var/spack/repos/builtin/packages/mpas-model/package.py +++ b/var/spack/repos/builtin/packages/mpas-model/package.py @@ -115,20 +115,9 @@ def target(self, model, action): ) cppflags.append("-DUNDERSCORE") elif satisfies("%fj"): - fflags.extend( - [ - "-Free", - "-Fwide", - "-CcdRR8", - ] - ) + fflags.extend(["-Free", "-Fwide", "-CcdRR8"]) elif satisfies("%intel"): - fflags.extend( - [ - "-convert big_endian", - "-FR", - ] - ) + fflags.extend(["-convert big_endian", "-FR"]) if satisfies("precision=double"): fflags.extend(["-r8"]) diff --git a/var/spack/repos/builtin/packages/mpfr/package.py b/var/spack/repos/builtin/packages/mpfr/package.py index 942d16aac1..7971c4310f 100644 --- a/var/spack/repos/builtin/packages/mpfr/package.py +++ b/var/spack/repos/builtin/packages/mpfr/package.py @@ -69,9 +69,7 @@ def flag_handler(self, name, flags): return (flags, None, None) def configure_args(self): - args = [ - "--with-gmp=" + self.spec["gmp"].prefix, - ] + args = ["--with-gmp=" + self.spec["gmp"].prefix] args += self.enable_or_disable("libs") if "libs=static" in self.spec: args.append("--with-pic") diff --git a/var/spack/repos/builtin/packages/mpi-serial/package.py b/var/spack/repos/builtin/packages/mpi-serial/package.py index ef2ad5f831..5f159a0cf5 100644 --- a/var/spack/repos/builtin/packages/mpi-serial/package.py +++ b/var/spack/repos/builtin/packages/mpi-serial/package.py @@ -39,16 +39,8 @@ def configure_args(self): args = [] realsize = int(self.spec.variants["fort-real-size"].value) if realsize != 4: - args.extend( - [ - "--enable-fort-real={0}".format(realsize), - ] - ) + args.extend(["--enable-fort-real={0}".format(realsize)]) doublesize = int(self.spec.variants["fort-double-size"].value) if doublesize != 8: - args.extend( - [ - "--enable-fort-double={0}".format(doublesize), - ] - ) + args.extend(["--enable-fort-double={0}".format(doublesize)]) return args diff --git a/var/spack/repos/builtin/packages/mujoco/package.py b/var/spack/repos/builtin/packages/mujoco/package.py index aad102bace..26ed5d4ae5 100644 --- a/var/spack/repos/builtin/packages/mujoco/package.py +++ b/var/spack/repos/builtin/packages/mujoco/package.py @@ -29,13 +29,9 @@ class Mujoco(Package): version(ver, sha256=pkg_sha256) def url_for_version(self, version): - url = "https://mujoco.org/download/mujoco{0}-{1}-x86_64.tar.gz" - system_map = { - "Linux": "linux", - "Darwin": "macos", - } + system_map = {"Linux": "linux", "Darwin": "macos"} return url.format(version.joined, system_map[platform.system()]) diff --git a/var/spack/repos/builtin/packages/must/package.py b/var/spack/repos/builtin/packages/must/package.py index 1a56867b38..6cca6c9cf2 100644 --- a/var/spack/repos/builtin/packages/must/package.py +++ b/var/spack/repos/builtin/packages/must/package.py @@ -19,18 +19,11 @@ class Must(CMakePackage): maintainers("jgalarowicz", "dmont") + version("1.8.0-rc1", sha256="49fd2487fbd1aa41f4252c7e37efebd3f6ff48218c88e82f34b88d59348fe406") version( - "1.8.0-rc1", - sha256="49fd2487fbd1aa41f4252c7e37efebd3f6ff48218c88e82f34b88d59348fe406", - ) - version( - "1.8-preview", - sha256="67b4b061db7a893e22a6610e2085072716d11738bc6cc3cb3ffd60d6833e8bad", - ) - version( - "1.7.2", - sha256="616c54b7487923959df126ac4b47ae8c611717d679fe7ec29f57a89bf0e2e0d0", + "1.8-preview", sha256="67b4b061db7a893e22a6610e2085072716d11738bc6cc3cb3ffd60d6833e8bad" ) + version("1.7.2", sha256="616c54b7487923959df126ac4b47ae8c611717d679fe7ec29f57a89bf0e2e0d0") variant("test", default=False, description="Enable must internal tests") variant("tsan", default=True, description="Enable thread sanitizer") variant("graphviz", default=False, description="Use to generate graphs") diff --git a/var/spack/repos/builtin/packages/mvapich/package.py b/var/spack/repos/builtin/packages/mvapich/package.py index 4d091e4c3a..4aa79893e9 100644 --- a/var/spack/repos/builtin/packages/mvapich/package.py +++ b/var/spack/repos/builtin/packages/mvapich/package.py @@ -76,10 +76,7 @@ class Mvapich(AutotoolsPackage): "by libfabrics, use the ofi netmod. For more info, visit the " "homepage url.", default="ofi", - values=( - "ofi", - "ucx", - ), + values=("ofi", "ucx"), multi=False, ) diff --git a/var/spack/repos/builtin/packages/mysqlpp/package.py b/var/spack/repos/builtin/packages/mysqlpp/package.py index e4aef374dd..e5c980b0db 100644 --- a/var/spack/repos/builtin/packages/mysqlpp/package.py +++ b/var/spack/repos/builtin/packages/mysqlpp/package.py @@ -30,7 +30,5 @@ def configure_args(self): "--with-mysql-lib={0}".format(self.spec["mysql-client"].prefix.lib.mariadb), ] else: - args = [ - "--with-mysql={0}".format(self.spec["mysql-client"].prefix), - ] + args = ["--with-mysql={0}".format(self.spec["mysql-client"].prefix)] return args diff --git a/var/spack/repos/builtin/packages/n2p2/package.py b/var/spack/repos/builtin/packages/n2p2/package.py index ce38506aeb..3ef2c32ebf 100644 --- a/var/spack/repos/builtin/packages/n2p2/package.py +++ b/var/spack/repos/builtin/packages/n2p2/package.py @@ -15,22 +15,10 @@ class N2p2(MakefilePackage): homepage = "https://github.com/CompPhysVienna/n2p2" url = "https://github.com/CompPhysVienna/n2p2/archive/v2.1.0.tar.gz" - version( - "2.2.0", - sha256="4acaa255632a7b9811d7530fd52ac7dd0bb3a8e3a3cf8512beadd29b62c1bfef", - ) - version( - "2.1.4", - sha256="f1672c09af4ed16a7f396606977e4675a0fee98f04bfd9574907fba4b83a14ef", - ) - version( - "2.1.1", - sha256="90fbc0756132984d0d7e6d92d2f53358c120e75f148910d90c027158163251b9", - ) - version( - "2.1.0", - sha256="283c00e9a5b964f4c84a70c5f1cef7167e9b881080b50a221da08799e5ede400", - ) + version("2.2.0", sha256="4acaa255632a7b9811d7530fd52ac7dd0bb3a8e3a3cf8512beadd29b62c1bfef") + version("2.1.4", sha256="f1672c09af4ed16a7f396606977e4675a0fee98f04bfd9574907fba4b83a14ef") + version("2.1.1", sha256="90fbc0756132984d0d7e6d92d2f53358c120e75f148910d90c027158163251b9") + version("2.1.0", sha256="283c00e9a5b964f4c84a70c5f1cef7167e9b881080b50a221da08799e5ede400") variant("doc", default=False, description="build documentation with Doxygen") variant("shared", default=False, description="build shared libraries") diff --git a/var/spack/repos/builtin/packages/ncl/package.py b/var/spack/repos/builtin/packages/ncl/package.py index 0b79d52150..294363f6c9 100644 --- a/var/spack/repos/builtin/packages/ncl/package.py +++ b/var/spack/repos/builtin/packages/ncl/package.py @@ -135,7 +135,6 @@ def filter_sbang(self): filter_file("^#!/bin/csh", "#!{0}".format(csh), *files) def install(self, spec, prefix): - if (self.compiler.fc is None) or (self.compiler.cc is None): raise InstallError("NCL package requires both " "C and Fortran compilers.") diff --git a/var/spack/repos/builtin/packages/nemsio/package.py b/var/spack/repos/builtin/packages/nemsio/package.py index 04a358edf2..0c2538ce46 100644 --- a/var/spack/repos/builtin/packages/nemsio/package.py +++ b/var/spack/repos/builtin/packages/nemsio/package.py @@ -16,12 +16,7 @@ class Nemsio(CMakePackage): homepage = "https://noaa-emc.github.io/NCEPLIBS-nemsio" url = "https://github.com/NOAA-EMC/NCEPLIBS-nemsio/archive/refs/tags/v2.5.2.tar.gz" - maintainers( - "t-brown", - "edwardhartnett", - "AlexanderRichert-NOAA", - "Hang-Lei-NOAA", - ) + maintainers("t-brown", "edwardhartnett", "AlexanderRichert-NOAA", "Hang-Lei-NOAA") variant("mpi", default=True, description="Build Nemsio with MPI") # Nemsio 2.5.3 and below require MPI diff --git a/var/spack/repos/builtin/packages/neovim/package.py b/var/spack/repos/builtin/packages/neovim/package.py index 73318b7c1b..b4fc5544df 100644 --- a/var/spack/repos/builtin/packages/neovim/package.py +++ b/var/spack/repos/builtin/packages/neovim/package.py @@ -21,18 +21,9 @@ class Neovim(CMakePackage): version("0.8.0", sha256="505e3dfb71e2f73495c737c034a416911c260c0ba9fd2092c6be296655be4d18") version("0.7.2", sha256="ccab8ca02a0c292de9ea14b39f84f90b635a69282de38a6b4ccc8565bc65d096") version("0.7.0", sha256="792a9c55d5d5f4a5148d475847267df309d65fb20f05523f21c1319ea8a6c7df") - version( - "0.6.1", - sha256="dd882c21a52e5999f656cae3f336b5fc702d52addd4d9b5cd3dc39cfff35e864", - ) - version( - "0.6.0", - sha256="2cfd600cfa5bb57564cc22ffbbbcb2c91531053fc3de992df33656614384fa4c", - ) - version( - "0.5.1", - sha256="aa449795e5cc69bdd2eeed7095f20b9c086c6ecfcde0ab62ab97a9d04243ec84", - ) + version("0.6.1", sha256="dd882c21a52e5999f656cae3f336b5fc702d52addd4d9b5cd3dc39cfff35e864") + version("0.6.0", sha256="2cfd600cfa5bb57564cc22ffbbbcb2c91531053fc3de992df33656614384fa4c") + version("0.5.1", sha256="aa449795e5cc69bdd2eeed7095f20b9c086c6ecfcde0ab62ab97a9d04243ec84") version( "0.5.0", sha256="6bcfa5192c9460c946e853dbd1a0baf659df5de184436144147711d1bceedeee", diff --git a/var/spack/repos/builtin/packages/netcdf-cxx/package.py b/var/spack/repos/builtin/packages/netcdf-cxx/package.py index 7095de6d4e..0ae2f69cb4 100644 --- a/var/spack/repos/builtin/packages/netcdf-cxx/package.py +++ b/var/spack/repos/builtin/packages/netcdf-cxx/package.py @@ -37,9 +37,6 @@ def configure_args(self): args.append("CPPFLAGS=-DUSE_NETCDF4") # Add these to LDFLAGS explicitly, so the linker doesn't accidentally # use system versions - ldflags = [ - self.spec["netcdf-c"].libs.search_flags, - self.spec["hdf5"].libs.search_flags, - ] + ldflags = [self.spec["netcdf-c"].libs.search_flags, self.spec["hdf5"].libs.search_flags] args.append("LDFLAGS=" + " ".join(ldflags)) return args diff --git a/var/spack/repos/builtin/packages/netlib-lapack/package.py b/var/spack/repos/builtin/packages/netlib-lapack/package.py index 30641b57d8..cb1832d061 100644 --- a/var/spack/repos/builtin/packages/netlib-lapack/package.py +++ b/var/spack/repos/builtin/packages/netlib-lapack/package.py @@ -142,16 +142,9 @@ def blas_libs(self): query_parameters = self.spec.last_query.extra_parameters query2libraries = { tuple(): ["libblas"], - ("c", "fortran"): [ - "libcblas", - "libblas", - ], - ("c",): [ - "libcblas", - ], - ("fortran",): [ - "libblas", - ], + ("c", "fortran"): ["libcblas", "libblas"], + ("c",): ["libcblas"], + ("fortran",): ["libblas"], } key = tuple(sorted(query_parameters)) libraries = query2libraries[key] @@ -163,16 +156,9 @@ def lapack_libs(self): query_parameters = self.spec.last_query.extra_parameters query2libraries = { tuple(): ["liblapack"], - ("c", "fortran"): [ - "liblapacke", - "liblapack", - ], - ("c",): [ - "liblapacke", - ], - ("fortran",): [ - "liblapack", - ], + ("c", "fortran"): ["liblapacke", "liblapack"], + ("c",): ["liblapacke"], + ("fortran",): ["liblapack"], } key = tuple(sorted(query_parameters)) libraries = query2libraries[key] diff --git a/var/spack/repos/builtin/packages/ngspice/package.py b/var/spack/repos/builtin/packages/ngspice/package.py index 83a79258c7..3cbc03fe3e 100644 --- a/var/spack/repos/builtin/packages/ngspice/package.py +++ b/var/spack/repos/builtin/packages/ngspice/package.py @@ -104,10 +104,7 @@ def configure_args(self): args.append("--with-x") x = spec["libx11"] args.extend( - [ - "--x-includes=%s" % x.prefix.include, - "--x-libraries=%s" % x.prefix.lib, - ] + ["--x-includes=%s" % x.prefix.include, "--x-libraries=%s" % x.prefix.lib] ) else: args.append("--without-x") diff --git a/var/spack/repos/builtin/packages/nix/package.py b/var/spack/repos/builtin/packages/nix/package.py index c144bad924..e54f13ed85 100644 --- a/var/spack/repos/builtin/packages/nix/package.py +++ b/var/spack/repos/builtin/packages/nix/package.py @@ -111,6 +111,6 @@ def installcheck(self): @run_after("install") def installcheck_clean(self): if hasattr(self, "test_path") and self.test_path: - for (root, dirs, files) in os.walk(self.test_path, topdown=True): + for root, dirs, files in os.walk(self.test_path, topdown=True): os.chmod(root, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR) remove_linked_tree(self.test_path) diff --git a/var/spack/repos/builtin/packages/ocamlbuild/package.py b/var/spack/repos/builtin/packages/ocamlbuild/package.py index d2ab82426f..a421b22c8d 100644 --- a/var/spack/repos/builtin/packages/ocamlbuild/package.py +++ b/var/spack/repos/builtin/packages/ocamlbuild/package.py @@ -29,11 +29,7 @@ class Ocamlbuild(MakefilePackage): # Installation : https://github.com/ocaml/ocamlbuild/ def edit(self, spec, prefix): - makefile_inc = [ - "BINDIR = bin", - "LIBDIR = lib", - "MANDIR = man", - ] + makefile_inc = ["BINDIR = bin", "LIBDIR = lib", "MANDIR = man"] makefile_inc.append("OCAML_PREFIX = %s" % self.spec["ocaml"].prefix) makefile_inc.append("DESTDIR = %s/" % self.spec.prefix) with open("Makefile.config", "a") as fh: diff --git a/var/spack/repos/builtin/packages/oce/package.py b/var/spack/repos/builtin/packages/oce/package.py index c19ebf159a..cd40190b96 100644 --- a/var/spack/repos/builtin/packages/oce/package.py +++ b/var/spack/repos/builtin/packages/oce/package.py @@ -78,11 +78,7 @@ def install(self, spec, prefix): ) if platform.system() == "Darwin": - options.extend( - [ - "-DOCE_OSX_USE_COCOA:BOOL=ON", - ] - ) + options.extend(["-DOCE_OSX_USE_COCOA:BOOL=ON"]) if platform.system() == "Darwin" and (macos_version() >= Version("10.12")): # use @rpath on Sierra due to limit of dynamic loader diff --git a/var/spack/repos/builtin/packages/octopus/package.py b/var/spack/repos/builtin/packages/octopus/package.py index da2997c6a5..01167d8a21 100644 --- a/var/spack/repos/builtin/packages/octopus/package.py +++ b/var/spack/repos/builtin/packages/octopus/package.py @@ -128,12 +128,7 @@ def configure_args(self): ] ) else: - args.extend( - [ - "CC=%s" % self.compiler.cc, - "FC=%s" % self.compiler.fc, - ] - ) + args.extend(["CC=%s" % self.compiler.cc, "FC=%s" % self.compiler.fc]) if "^fftw" in spec: args.append("--with-fftw-prefix=%s" % spec["fftw"].prefix) @@ -164,9 +159,7 @@ def configure_args(self): ) if "+arpack" in spec: arpack_libs = spec["arpack-ng"].libs.joined() - args.append( - "--with-arpack={0}".format(arpack_libs), - ) + args.append("--with-arpack={0}".format(arpack_libs)) if "+mpi" in spec["arpack-ng"]: args.append("--with-parpack={0}".format(arpack_libs)) @@ -185,9 +178,7 @@ def configure_args(self): args.append("--with-likwid-prefix=%s" % spec["likwid"].prefix) if "+pfft" in spec: - args.append( - "--with-pfft-prefix=%s" % spec["pfft"].prefix, - ) + args.append("--with-pfft-prefix=%s" % spec["pfft"].prefix) # if '+poke' in spec: # args.extend([ diff --git a/var/spack/repos/builtin/packages/ome-common-cpp/package.py b/var/spack/repos/builtin/packages/ome-common-cpp/package.py index 1ebe93f4b9..06bb4c002a 100644 --- a/var/spack/repos/builtin/packages/ome-common-cpp/package.py +++ b/var/spack/repos/builtin/packages/ome-common-cpp/package.py @@ -29,7 +29,4 @@ class OmeCommonCpp(CMakePackage): depends_on("googletest", type="test") def cmake_args(self): - return [ - "-DCMAKE_CXX_STANDARD=17", - "-DCMAKE_CXX_STANDARD_REQUIRED=ON", - ] + return ["-DCMAKE_CXX_STANDARD=17", "-DCMAKE_CXX_STANDARD_REQUIRED=ON"] diff --git a/var/spack/repos/builtin/packages/ome-files-cpp/package.py b/var/spack/repos/builtin/packages/ome-files-cpp/package.py index c3bc9fbbf7..1cc12897d1 100644 --- a/var/spack/repos/builtin/packages/ome-files-cpp/package.py +++ b/var/spack/repos/builtin/packages/ome-files-cpp/package.py @@ -28,7 +28,4 @@ class OmeFilesCpp(CMakePackage): depends_on("googletest", type="test") def cmake_args(self): - return [ - "-DCMAKE_CXX_STANDARD=17", - "-DCMAKE_CXX_STANDARD_REQUIRED=ON", - ] + return ["-DCMAKE_CXX_STANDARD=17", "-DCMAKE_CXX_STANDARD_REQUIRED=ON"] diff --git a/var/spack/repos/builtin/packages/ome-model/package.py b/var/spack/repos/builtin/packages/ome-model/package.py index 3b3934e7fd..e160cda475 100644 --- a/var/spack/repos/builtin/packages/ome-model/package.py +++ b/var/spack/repos/builtin/packages/ome-model/package.py @@ -35,7 +35,4 @@ class OmeModel(CMakePackage): depends_on("googletest", type="test") def cmake_args(self): - return [ - "-DCMAKE_CXX_STANDARD=17", - "-DCMAKE_CXX_STANDARD_REQUIRED=ON", - ] + return ["-DCMAKE_CXX_STANDARD=17", "-DCMAKE_CXX_STANDARD_REQUIRED=ON"] diff --git a/var/spack/repos/builtin/packages/ompss-2/package.py b/var/spack/repos/builtin/packages/ompss-2/package.py index 1220542f7f..a786288b76 100644 --- a/var/spack/repos/builtin/packages/ompss-2/package.py +++ b/var/spack/repos/builtin/packages/ompss-2/package.py @@ -70,11 +70,7 @@ def install_mcxx(self, spec, prefix): reconf = which("autoreconf") reconf("-fiv") - configure( - "--prefix=%s" % prefix, - "--with-nanos6=%s" % prefix, - "--enable-ompss-2", - ) + configure("--prefix=%s" % prefix, "--with-nanos6=%s" % prefix, "--enable-ompss-2") make() make("install") os.chdir("..") diff --git a/var/spack/repos/builtin/packages/oommf/package.py b/var/spack/repos/builtin/packages/oommf/package.py index 84711d37dd..4b350bfc4e 100644 --- a/var/spack/repos/builtin/packages/oommf/package.py +++ b/var/spack/repos/builtin/packages/oommf/package.py @@ -59,8 +59,7 @@ class Oommf(Package): ) version( - "20a3_20210930", - sha256="880242afdf4c84de7f2a3c42ab0ad8c354028a7d2d3c3160980cf3e08e285691", + "20a3_20210930", sha256="880242afdf4c84de7f2a3c42ab0ad8c354028a7d2d3c3160980cf3e08e285691" ) version( @@ -70,8 +69,7 @@ class Oommf(Package): ) version( - "20a2_20200608", - sha256="a3113f2aca0b6249ee99b2f4874f31de601bd7af12498d84f28706b265fa50ab", + "20a2_20200608", sha256="a3113f2aca0b6249ee99b2f4874f31de601bd7af12498d84f28706b265fa50ab" ) version( @@ -175,7 +173,6 @@ def test_env(self): def configure(self, spec, prefix): # change into directory with source code with working_dir(self.get_oommf_source_root()): - configure = Executable("./oommf.tcl pimake distclean") configure() configure2 = Executable("./oommf.tcl pimake upgrade") @@ -194,7 +191,6 @@ def install(self, spec, prefix): oommfdir = self.get_oommf_path(prefix) with working_dir(self.get_oommf_source_root()): - install_tree(".", oommfdir) # The one file that is used directly by the users should be @@ -263,12 +259,7 @@ def test(self): # run "oommf +platform" options = [oommf_tcl_path, "+platform"] purpose = "Check oommf.tcl can execute (+platform)" - expected = [ - "OOMMF threads", - "OOMMF release", - "OOMMF API index", - "Temp file directory", - ] + expected = ["OOMMF threads", "OOMMF release", "OOMMF API index", "Temp file directory"] self.run_test( exe, options=options, diff --git a/var/spack/repos/builtin/packages/openblas/package.py b/var/spack/repos/builtin/packages/openblas/package.py index debc2d58ee..93d6b1ff93 100644 --- a/var/spack/repos/builtin/packages/openblas/package.py +++ b/var/spack/repos/builtin/packages/openblas/package.py @@ -463,10 +463,7 @@ def check_build(self): @property def install_targets(self): - make_args = [ - "install", - "PREFIX={0}".format(self.prefix), - ] + make_args = ["install", "PREFIX={0}".format(self.prefix)] return make_args + self.make_defs @run_after("install") diff --git a/var/spack/repos/builtin/packages/opencv/package.py b/var/spack/repos/builtin/packages/opencv/package.py index eedadce858..03ac773771 100644 --- a/var/spack/repos/builtin/packages/opencv/package.py +++ b/var/spack/repos/builtin/packages/opencv/package.py @@ -21,82 +21,25 @@ class Opencv(CMakePackage, CudaPackage): version("master", branch="master") version("4.6.0", sha256="1ec1cba65f9f20fe5a41fda1586e01c70ea0c9a6d7b67c9e13edf0cfe2239277") version("4.5.5", sha256="a1cfdcf6619387ca9e232687504da996aaa9f7b5689986b8331ec02cb61d28ad") - version( - "4.5.4", - sha256="c20bb83dd790fc69df9f105477e24267706715a9d3c705ca1e7f613c7b3bad3d", - ) - version( - "4.5.2", - sha256="ae258ed50aa039279c3d36afdea5c6ecf762515836b27871a8957c610d0424f8", - ) - version( - "4.5.1", - sha256="e27fe5b168918ab60d58d7ace2bd82dd14a4d0bd1d3ae182952c2113f5637513", - ) - version( - "4.5.0", - sha256="dde4bf8d6639a5d3fe34d5515eab4a15669ded609a1d622350c7ff20dace1907", - ) - version( - "4.2.0", - sha256="9ccb2192d7e8c03c58fee07051364d94ed7599363f3b0dce1c5e6cc11c1bb0ec", - ) - version( - "4.1.2", - sha256="385dd0a9c25e67ef0dd60e022d2a2d7b17e2f36819cf3cb46aa8cdff5c5282c9", - ) - version( - "4.1.1", - sha256="5de5d96bdfb9dad6e6061d70f47a0a91cee96bb35afb9afb9ecb3d43e243d217", - ) - version( - "4.1.0", - sha256="8f6e4ab393d81d72caae6e78bd0fd6956117ec9f006fba55fcdb88caf62989b7", - ) - version( - "4.0.1", - sha256="7b86a0ee804244e0c407321f895b15e4a7162e9c5c0d2efc85f1cadec4011af4", - ) - version( - "4.0.0", - sha256="3787b3cc7b21bba1441819cb00c636911a846c0392ddf6211d398040a1e4886c", - ) - version( - "3.4.12", - sha256="c8919dfb5ead6be67534bf794cb0925534311f1cd5c6680f8164ad1813c88d13", - ) - version( - "3.4.6", - sha256="e7d311ff97f376b8ee85112e2b536dbf4bdf1233673500175ed7cf21a0089f6d", - ) - version( - "3.4.5", - sha256="0c57d9dd6d30cbffe68a09b03f4bebe773ee44dc8ff5cd6eaeb7f4d5ef3b428e", - ) - version( - "3.4.4", - sha256="a35b00a71d77b484f73ec485c65fe56c7a6fa48acd5ce55c197aef2e13c78746", - ) - version( - "3.4.3", - sha256="4eef85759d5450b183459ff216b4c0fa43e87a4f6aa92c8af649f89336f002ec", - ) - version( - "3.4.1", - sha256="f1b87684d75496a1054405ae3ee0b6573acaf3dad39eaf4f1d66fdd7e03dc852", - ) - version( - "3.4.0", - sha256="678cc3d2d1b3464b512b084a8cca1fad7de207c7abdf2caa1fed636c13e916da", - ) - version( - "3.3.1", - sha256="5dca3bb0d661af311e25a72b04a7e4c22c47c1aa86eb73e70063cd378a2aa6ee", - ) - version( - "3.3.0", - sha256="8bb312b9d9fd17336dc1f8b3ac82f021ca50e2034afc866098866176d985adc6", - ) + version("4.5.4", sha256="c20bb83dd790fc69df9f105477e24267706715a9d3c705ca1e7f613c7b3bad3d") + version("4.5.2", sha256="ae258ed50aa039279c3d36afdea5c6ecf762515836b27871a8957c610d0424f8") + version("4.5.1", sha256="e27fe5b168918ab60d58d7ace2bd82dd14a4d0bd1d3ae182952c2113f5637513") + version("4.5.0", sha256="dde4bf8d6639a5d3fe34d5515eab4a15669ded609a1d622350c7ff20dace1907") + version("4.2.0", sha256="9ccb2192d7e8c03c58fee07051364d94ed7599363f3b0dce1c5e6cc11c1bb0ec") + version("4.1.2", sha256="385dd0a9c25e67ef0dd60e022d2a2d7b17e2f36819cf3cb46aa8cdff5c5282c9") + version("4.1.1", sha256="5de5d96bdfb9dad6e6061d70f47a0a91cee96bb35afb9afb9ecb3d43e243d217") + version("4.1.0", sha256="8f6e4ab393d81d72caae6e78bd0fd6956117ec9f006fba55fcdb88caf62989b7") + version("4.0.1", sha256="7b86a0ee804244e0c407321f895b15e4a7162e9c5c0d2efc85f1cadec4011af4") + version("4.0.0", sha256="3787b3cc7b21bba1441819cb00c636911a846c0392ddf6211d398040a1e4886c") + version("3.4.12", sha256="c8919dfb5ead6be67534bf794cb0925534311f1cd5c6680f8164ad1813c88d13") + version("3.4.6", sha256="e7d311ff97f376b8ee85112e2b536dbf4bdf1233673500175ed7cf21a0089f6d") + version("3.4.5", sha256="0c57d9dd6d30cbffe68a09b03f4bebe773ee44dc8ff5cd6eaeb7f4d5ef3b428e") + version("3.4.4", sha256="a35b00a71d77b484f73ec485c65fe56c7a6fa48acd5ce55c197aef2e13c78746") + version("3.4.3", sha256="4eef85759d5450b183459ff216b4c0fa43e87a4f6aa92c8af649f89336f002ec") + version("3.4.1", sha256="f1b87684d75496a1054405ae3ee0b6573acaf3dad39eaf4f1d66fdd7e03dc852") + version("3.4.0", sha256="678cc3d2d1b3464b512b084a8cca1fad7de207c7abdf2caa1fed636c13e916da") + version("3.3.1", sha256="5dca3bb0d661af311e25a72b04a7e4c22c47c1aa86eb73e70063cd378a2aa6ee") + version("3.3.0", sha256="8bb312b9d9fd17336dc1f8b3ac82f021ca50e2034afc866098866176d985adc6") contrib_vers = [ "3.3.0", @@ -235,10 +178,7 @@ class Opencv(CMakePackage, CudaPackage): # These need additional spack packages # js needs Emscripten - modules_pending = [ - "js", - "js_bindings_generator", - ] + modules_pending = ["js", "js_bindings_generator"] # Define the list of libraries objects that may be used # to find an external installation and its variants @@ -770,11 +710,7 @@ class Opencv(CMakePackage, CudaPackage): component_and_module = ["freetype", "julia", "matlab"] for component in components: - variant( - component, - default=False, - description="Include {0} support".format(component), - ) + variant(component, default=False, description="Include {0} support".format(component)) # Other (variants) variant("shared", default=True, description="Enables the build of shared libraries") @@ -924,9 +860,7 @@ def determine_variants(cls, libs, version_str): def cmake_args(self): spec = self.spec - args = [ - self.define("BUILD_opencv_core", "on"), - ] + args = [self.define("BUILD_opencv_core", "on")] if self.spec.satisfies("+contrib"): args.append( @@ -1094,10 +1028,7 @@ def cmake_args(self): ) else: args.extend( - [ - self.define("PYTHON2_EXECUTABLE", ""), - self.define("PYTHON3_EXECUTABLE", ""), - ] + [self.define("PYTHON2_EXECUTABLE", ""), self.define("PYTHON3_EXECUTABLE", "")] ) return args diff --git a/var/spack/repos/builtin/packages/openfast/package.py b/var/spack/repos/builtin/packages/openfast/package.py index c04db3035c..247756313c 100644 --- a/var/spack/repos/builtin/packages/openfast/package.py +++ b/var/spack/repos/builtin/packages/openfast/package.py @@ -98,18 +98,10 @@ def cmake_args(self): options.extend([self.define("NETCDF_ROOT", spec["netcdf-c"].prefix)]) if "~shared" in spec: - options.extend( - [ - self.define("HDF5_USE_STATIC_LIBRARIES", True), - ] - ) + options.extend([self.define("HDF5_USE_STATIC_LIBRARIES", True)]) if "+openmp" in spec: - options.extend( - [ - self.define("OPENMP", True), - ] - ) + options.extend([self.define("OPENMP", True)]) return options diff --git a/var/spack/repos/builtin/packages/openfoam-org/package.py b/var/spack/repos/builtin/packages/openfoam-org/package.py index 046650bd74..8ff1e4654f 100644 --- a/var/spack/repos/builtin/packages/openfoam-org/package.py +++ b/var/spack/repos/builtin/packages/openfoam-org/package.py @@ -307,9 +307,7 @@ def configure(self, spec, prefix): } if "+metis" in spec: - self.etc_config["metis"] = { - "METIS_ARCH_PATH": spec["metis"].prefix, - } + self.etc_config["metis"] = {"METIS_ARCH_PATH": spec["metis"].prefix} # Write prefs files according to the configuration. # Only need prefs.sh for building, but install both for end-users diff --git a/var/spack/repos/builtin/packages/openfoam/package.py b/var/spack/repos/builtin/packages/openfoam/package.py index 67fb2a73ba..becd46044a 100644 --- a/var/spack/repos/builtin/packages/openfoam/package.py +++ b/var/spack/repos/builtin/packages/openfoam/package.py @@ -495,7 +495,7 @@ def setup_run_environment(self, env): "(FOAM|WM)_.*USER_.*", ], whitelist=[ # Whitelist these - "MPI_ARCH_PATH", # Can be required for compilation + "MPI_ARCH_PATH" # Can be required for compilation ], ) @@ -569,7 +569,7 @@ def patch(self): # Avoid WM_PROJECT_INST_DIR for ThirdParty # This modification is non-critical edits = { - "WM_THIRD_PARTY_DIR": r"$WM_PROJECT_DIR/ThirdParty #SPACK: No separate third-party", + "WM_THIRD_PARTY_DIR": r"$WM_PROJECT_DIR/ThirdParty #SPACK: No separate third-party" } rewrite_environ_files( # etc/{bashrc,cshrc} edits, posix=join_path("etc", "bashrc"), cshell=join_path("etc", "cshrc") @@ -720,14 +720,10 @@ def configure(self, spec, prefix): } if "+kahip" in spec: - self.etc_config["kahip"] = { - "KAHIP_ARCH_PATH": spec["kahip"].prefix, - } + self.etc_config["kahip"] = {"KAHIP_ARCH_PATH": spec["kahip"].prefix} if "+metis" in spec: - self.etc_config["metis"] = { - "METIS_ARCH_PATH": spec["metis"].prefix, - } + self.etc_config["metis"] = {"METIS_ARCH_PATH": spec["metis"].prefix} # ParaView_INCLUDE_DIR is not used in 1812, but has no ill-effect if "+paraview" in spec: @@ -789,9 +785,7 @@ def install_write_location(self): mkdirp(self.projectdir) # Filtering: bashrc, cshrc - edits = { - "WM_PROJECT_DIR": self.projectdir, - } + edits = {"WM_PROJECT_DIR": self.projectdir} etc_dir = join_path(self.projectdir, "etc") rewrite_environ_files( # Adjust etc/bashrc and etc/cshrc edits, posix=join_path(etc_dir, "bashrc"), cshell=join_path(etc_dir, "cshrc") diff --git a/var/spack/repos/builtin/packages/openldap/package.py b/var/spack/repos/builtin/packages/openldap/package.py index 8cf42cb525..eb1b5ae20e 100644 --- a/var/spack/repos/builtin/packages/openldap/package.py +++ b/var/spack/repos/builtin/packages/openldap/package.py @@ -62,11 +62,7 @@ class Openldap(AutotoolsPackage): # Ref: https://www.linuxfromscratch.org/blfs/view/svn/server/openldap.html @when("+client_only") def configure_args(self): - args = [ - "CPPFLAGS=-D_GNU_SOURCE", - "--disable-debug", - "--disable-slapd", - ] + args = ["CPPFLAGS=-D_GNU_SOURCE", "--disable-debug", "--disable-slapd"] args += self.with_or_without("cyrus-sasl", variant="sasl") args += self.enable_or_disable("static") args += self.enable_or_disable("shared") diff --git a/var/spack/repos/builtin/packages/openlibm/package.py b/var/spack/repos/builtin/packages/openlibm/package.py index b2f4381537..4172641577 100644 --- a/var/spack/repos/builtin/packages/openlibm/package.py +++ b/var/spack/repos/builtin/packages/openlibm/package.py @@ -28,7 +28,5 @@ def make(self, spec, prefix): make(*args) def install(self, spec, prefix): - args = [ - "prefix={0}".format(prefix), - ] + args = ["prefix={0}".format(prefix)] make("install", *args) diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index 0d4ff14144..d9112884c3 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -952,11 +952,7 @@ def configure_args(self): config_args.extend(self.enable_or_disable("memchecker")) if spec.satisfies("+memchecker", strict=True): - config_args.extend( - [ - "--enable-debug", - ] - ) + config_args.extend(["--enable-debug"]) # Package dependencies for dep in ["libevent", "lustre", "pmix", "singularity", "valgrind", "zlib"]: diff --git a/var/spack/repos/builtin/packages/openscenegraph/package.py b/var/spack/repos/builtin/packages/openscenegraph/package.py index d0629d5caf..273c91fa2b 100644 --- a/var/spack/repos/builtin/packages/openscenegraph/package.py +++ b/var/spack/repos/builtin/packages/openscenegraph/package.py @@ -79,11 +79,6 @@ def cmake_args(self): # NOTE: This is necessary in order to allow OpenSceneGraph to compile # despite containing a number of implicit bool to int conversions. if spec.satisfies("%gcc"): - args.extend( - [ - "-DCMAKE_C_FLAGS=-fpermissive", - "-DCMAKE_CXX_FLAGS=-fpermissive", - ] - ) + args.extend(["-DCMAKE_C_FLAGS=-fpermissive", "-DCMAKE_CXX_FLAGS=-fpermissive"]) return args diff --git a/var/spack/repos/builtin/packages/openspeedshop-utils/package.py b/var/spack/repos/builtin/packages/openspeedshop-utils/package.py index d2ab1df988..f1ffaa0898 100644 --- a/var/spack/repos/builtin/packages/openspeedshop-utils/package.py +++ b/var/spack/repos/builtin/packages/openspeedshop-utils/package.py @@ -207,7 +207,6 @@ def cmake_args(self): ) else: - # Appends base options to cmake_args self.set_defaultbase_cmake_options(spec, cmake_args) cmake_args.extend( diff --git a/var/spack/repos/builtin/packages/openspeedshop/package.py b/var/spack/repos/builtin/packages/openspeedshop/package.py index 5f1a74bac8..ae4e733d59 100644 --- a/var/spack/repos/builtin/packages/openspeedshop/package.py +++ b/var/spack/repos/builtin/packages/openspeedshop/package.py @@ -187,7 +187,6 @@ def set_cray_login_node_cmake_options(self, spec, cmake_options): cmake_options.extend(cray_login_node_options) def cmake_args(self): - spec = self.spec compile_flags = "-O2 -g -Wall" @@ -215,7 +214,6 @@ def cmake_args(self): cmake_args.extend(["-DCBTF_ARGONAVIS_DIR=%s" % spec["cbtf-argonavis"].prefix]) else: - # Appends base options to cmake_args self.set_defaultbase_cmake_options(spec, cmake_args) guitype = self.spec.variants["gui"].value diff --git a/var/spack/repos/builtin/packages/openssl/package.py b/var/spack/repos/builtin/packages/openssl/package.py index 5c3d57ce34..87b5997eed 100644 --- a/var/spack/repos/builtin/packages/openssl/package.py +++ b/var/spack/repos/builtin/packages/openssl/package.py @@ -400,11 +400,7 @@ def install(self, spec, prefix): ] if spec.satisfies("platform=windows"): base_args.extend( - [ - 'CC="%s"' % os.environ.get("CC"), - 'CXX="%s"' % os.environ.get("CXX"), - "VC-WIN64A", - ] + ['CC="%s"' % os.environ.get("CC"), 'CXX="%s"' % os.environ.get("CXX"), "VC-WIN64A"] ) if spec.satisfies("~shared"): base_args.append("no-shared") diff --git a/var/spack/repos/builtin/packages/ophidia-analytics-framework/package.py b/var/spack/repos/builtin/packages/ophidia-analytics-framework/package.py index 256bd193c5..df667080a8 100644 --- a/var/spack/repos/builtin/packages/ophidia-analytics-framework/package.py +++ b/var/spack/repos/builtin/packages/ophidia-analytics-framework/package.py @@ -12,10 +12,7 @@ class OphidiaAnalyticsFramework(AutotoolsPackage): homepage = "https://github.com/OphidiaBigData/ophidia-analytics-framework" url = "https://github.com/OphidiaBigData/ophidia-analytics-framework/archive/refs/tags/v1.7.1.tar.gz" maintainers("eldoo", "SoniaScard") - version( - "1.7.1", - sha256="565050b90ce1cefc59136c835a335ca7981fec792df7a1ee9309b24c05b275d6", - ) + version("1.7.1", sha256="565050b90ce1cefc59136c835a335ca7981fec792df7a1ee9309b24c05b275d6") depends_on("autoconf", type="build") depends_on("automake", type="build") diff --git a/var/spack/repos/builtin/packages/ophidia-primitives/package.py b/var/spack/repos/builtin/packages/ophidia-primitives/package.py index deb6b0aaaf..65004e3077 100644 --- a/var/spack/repos/builtin/packages/ophidia-primitives/package.py +++ b/var/spack/repos/builtin/packages/ophidia-primitives/package.py @@ -12,10 +12,7 @@ class OphidiaPrimitives(AutotoolsPackage): homepage = "https://github.com/OphidiaBigData/ophidia-primitives" url = "https://github.com/OphidiaBigData/ophidia-primitives/archive/refs/tags/v1.7.1.tar.gz" maintainers("eldoo", "SoniaScard") - version( - "1.7.1", - sha256="efec5248dca8fb766abcd536344eefbe2e970fb551f03454a968e59e2df69116", - ) + version("1.7.1", sha256="efec5248dca8fb766abcd536344eefbe2e970fb551f03454a968e59e2df69116") depends_on("autoconf", type="build") depends_on("automake", type="build") diff --git a/var/spack/repos/builtin/packages/ophidia-server/package.py b/var/spack/repos/builtin/packages/ophidia-server/package.py index 8a69576ed4..30af696c19 100644 --- a/var/spack/repos/builtin/packages/ophidia-server/package.py +++ b/var/spack/repos/builtin/packages/ophidia-server/package.py @@ -12,10 +12,7 @@ class OphidiaServer(AutotoolsPackage): homepage = "https://github.com/SoniaScard/ophidia-server" url = "https://github.com/SoniaScard/ophidia-server/archive/refs/tags/v1.7.2.tar.gz" maintainers("eldoo", "SoniaScard") - version( - "1.7.2", - sha256="452587775343b266bbb5adcfeee64e7f7e9a9bbfcb2133646a831ae3e74348be", - ) + version("1.7.2", sha256="452587775343b266bbb5adcfeee64e7f7e9a9bbfcb2133646a831ae3e74348be") depends_on("autoconf", type="build") depends_on("automake", type="build") diff --git a/var/spack/repos/builtin/packages/osg-ca-certs/package.py b/var/spack/repos/builtin/packages/osg-ca-certs/package.py index 72f2e13ecc..d000336f99 100644 --- a/var/spack/repos/builtin/packages/osg-ca-certs/package.py +++ b/var/spack/repos/builtin/packages/osg-ca-certs/package.py @@ -25,7 +25,7 @@ class OsgCaCerts(Package): "igtf_version": "1.117", "osg_sha256": "41e12c05aedb4df729bf326318cc29b9b79eb097564fd68c6af2e1448ec74f75", "igtf_sha256": "130d4d95cd65d01d2db250ee24c539341e3adc899b7eff1beafef1ba4674807d", - }, + } ] for release in releases: diff --git a/var/spack/repos/builtin/packages/papyrus/package.py b/var/spack/repos/builtin/packages/papyrus/package.py index 307d72969c..fc958b6ec9 100644 --- a/var/spack/repos/builtin/packages/papyrus/package.py +++ b/var/spack/repos/builtin/packages/papyrus/package.py @@ -72,7 +72,6 @@ def run_example_tests(self): ] for example in example_list: - test_dir = join_path(self.test_suite.current_test_cache_dir, "kv", "tests", example) test_example = "test{0}.c".format(example) diff --git a/var/spack/repos/builtin/packages/parallel-netcdf/package.py b/var/spack/repos/builtin/packages/parallel-netcdf/package.py index 879787eab1..10df11203b 100644 --- a/var/spack/repos/builtin/packages/parallel-netcdf/package.py +++ b/var/spack/repos/builtin/packages/parallel-netcdf/package.py @@ -115,12 +115,7 @@ def configure_args(self): args += self.enable_or_disable("cxx") args += self.enable_or_disable("fortran") - flags = { - "CFLAGS": [], - "CXXFLAGS": [], - "FFLAGS": [], - "FCFLAGS": [], - } + flags = {"CFLAGS": [], "CXXFLAGS": [], "FFLAGS": [], "FCFLAGS": []} if "+pic" in self.spec: flags["CFLAGS"].append(self.compiler.cc_pic_flag) diff --git a/var/spack/repos/builtin/packages/parallel/package.py b/var/spack/repos/builtin/packages/parallel/package.py index 7ddbf13ff7..929aca733c 100644 --- a/var/spack/repos/builtin/packages/parallel/package.py +++ b/var/spack/repos/builtin/packages/parallel/package.py @@ -45,10 +45,5 @@ def filter_sbang(self): with working_dir("src"): match = "^#!/usr/bin/env perl|^#!/usr/bin/perl.*" substitute = "#!{perl}".format(perl=perl) - files = [ - "parallel", - "niceload", - "parcat", - "sql", - ] + files = ["parallel", "niceload", "parcat", "sql"] filter_file(match, substitute, *files, **kwargs) diff --git a/var/spack/repos/builtin/packages/parallelio/package.py b/var/spack/repos/builtin/packages/parallelio/package.py index 1d840b9fca..b6baf73174 100644 --- a/var/spack/repos/builtin/packages/parallelio/package.py +++ b/var/spack/repos/builtin/packages/parallelio/package.py @@ -63,17 +63,9 @@ def cmake_args(self): define("PIO_ENABLE_EXAMPLES", False), ] if spec.satisfies("+pnetcdf"): - args.extend( - [ - define("PnetCDF_C_PATH", spec["parallel-netcdf"].prefix), - ] - ) + args.extend([define("PnetCDF_C_PATH", spec["parallel-netcdf"].prefix)]) if spec.satisfies("+fortran"): - args.extend( - [ - define("NetCDF_Fortran_PATH", spec["netcdf-fortran"].prefix), - ] - ) + args.extend([define("NetCDF_Fortran_PATH", spec["netcdf-fortran"].prefix)]) if spec.satisfies("+mpi"): env["CC"] = spec["mpi"].mpicc env["FC"] = spec["mpi"].mpifc diff --git a/var/spack/repos/builtin/packages/paraview/package.py b/var/spack/repos/builtin/packages/paraview/package.py index 702f9b800c..aed59960bc 100644 --- a/var/spack/repos/builtin/packages/paraview/package.py +++ b/var/spack/repos/builtin/packages/paraview/package.py @@ -472,11 +472,7 @@ def nvariant_bool(feature): # The assumed qt version changed to QT5 (as of paraview 5.2.1), # so explicitly specify which QT major version is actually being used if "+qt" in spec: - cmake_args.extend( - [ - "-DPARAVIEW_QT_VERSION=%s" % spec["qt"].version[0], - ] - ) + cmake_args.extend(["-DPARAVIEW_QT_VERSION=%s" % spec["qt"].version[0]]) if "+fortran" in spec: cmake_args.append("-DPARAVIEW_USE_FORTRAN:BOOL=ON") @@ -563,10 +559,7 @@ def nvariant_bool(feature): if "darwin" in spec.architecture: cmake_args.extend( - [ - "-DVTK_USE_X:BOOL=OFF", - "-DPARAVIEW_DO_UNIX_STYLE_INSTALLS:BOOL=ON", - ] + ["-DVTK_USE_X:BOOL=OFF", "-DPARAVIEW_DO_UNIX_STYLE_INSTALLS:BOOL=ON"] ) if "+kits" in spec: diff --git a/var/spack/repos/builtin/packages/pdftk/package.py b/var/spack/repos/builtin/packages/pdftk/package.py index 01284dae2e..85e93902cf 100644 --- a/var/spack/repos/builtin/packages/pdftk/package.py +++ b/var/spack/repos/builtin/packages/pdftk/package.py @@ -30,7 +30,6 @@ class Pdftk(MakefilePackage): # https://www.pdflabs.com/docs/install-pdftk-on-redhat-or-centos/ def edit(self, spec, prefix): - # ------ Fix install directory in main Makefile makefile = FileFilter(join_path("pdftk", "Makefile.Base")) makefile.filter("/usr/local/bin", spec.prefix.bin) diff --git a/var/spack/repos/builtin/packages/pegtl/package.py b/var/spack/repos/builtin/packages/pegtl/package.py index e6c03ab3f7..8384ed9128 100644 --- a/var/spack/repos/builtin/packages/pegtl/package.py +++ b/var/spack/repos/builtin/packages/pegtl/package.py @@ -33,7 +33,6 @@ class Pegtl(CMakePackage): patch(patch_url, sha256=patch_checksum, level=0, when="@2.1.4:2.8.3") def cmake_args(self): - args = [] if self.run_tests: args.extend(["-DPEGTL_BUILD_EXAMPLES=ON", "-DPEGTL_BUILD_TESTS=ON"]) diff --git a/var/spack/repos/builtin/packages/perl-fth/package.py b/var/spack/repos/builtin/packages/perl-fth/package.py index e629426a60..d2a68a4d80 100644 --- a/var/spack/repos/builtin/packages/perl-fth/package.py +++ b/var/spack/repos/builtin/packages/perl-fth/package.py @@ -113,10 +113,7 @@ def install(self, spec, prefix): fthfile.filter("#!/usr/bin/env perl", mstr, backup=False) # Adds a Makefile with an rsync rule - makefile_inc = [ - "RSYNC_OPTS = -avuzL", - "RSYNC = rsync", - ] + makefile_inc = ["RSYNC_OPTS = -avuzL", "RSYNC = rsync"] makefile_inc.append("install:") makefile_inc.append("\t$(RSYNC) $(RSYNC_OPTS) . %s" % prefix) makefile_inc.append("") diff --git a/var/spack/repos/builtin/packages/perl/package.py b/var/spack/repos/builtin/packages/perl/package.py index 0e2e4a0202..429530d564 100644 --- a/var/spack/repos/builtin/packages/perl/package.py +++ b/var/spack/repos/builtin/packages/perl/package.py @@ -52,38 +52,14 @@ class Perl(Package): # Perl doesn't use Autotools, it should subclass Package sha256="e26085af8ac396f62add8a533c3a0ea8c8497d836f0689347ac5abd7b7a4e00a", preferred=True, ) - version( - "5.34.1", - sha256="357951a491b0ba1ce3611263922feec78ccd581dddc24a446b033e25acf242a1", - ) - version( - "5.34.0", - sha256="551efc818b968b05216024fb0b727ef2ad4c100f8cb6b43fab615fa78ae5be9a", - ) - version( - "5.32.1", - sha256="03b693901cd8ae807231b1787798cf1f2e0b8a56218d07b7da44f784a7caeb2c", - ) - version( - "5.32.0", - sha256="efeb1ce1f10824190ad1cadbcccf6fdb8a5d37007d0100d2d9ae5f2b5900c0b4", - ) - version( - "5.30.3", - sha256="32e04c8bb7b1aecb2742a7f7ac0eabac100f38247352a73ad7fa104e39e7406f", - ) - version( - "5.30.2", - sha256="66db7df8a91979eb576fac91743644da878244cf8ee152f02cd6f5cd7a731689", - ) - version( - "5.30.1", - sha256="bf3d25571ff1ee94186177c2cdef87867fd6a14aa5a84f0b1fb7bf798f42f964", - ) - version( - "5.30.0", - sha256="851213c754d98ccff042caa40ba7a796b2cee88c5325f121be5cbb61bbf975f2", - ) + version("5.34.1", sha256="357951a491b0ba1ce3611263922feec78ccd581dddc24a446b033e25acf242a1") + version("5.34.0", sha256="551efc818b968b05216024fb0b727ef2ad4c100f8cb6b43fab615fa78ae5be9a") + version("5.32.1", sha256="03b693901cd8ae807231b1787798cf1f2e0b8a56218d07b7da44f784a7caeb2c") + version("5.32.0", sha256="efeb1ce1f10824190ad1cadbcccf6fdb8a5d37007d0100d2d9ae5f2b5900c0b4") + version("5.30.3", sha256="32e04c8bb7b1aecb2742a7f7ac0eabac100f38247352a73ad7fa104e39e7406f") + version("5.30.2", sha256="66db7df8a91979eb576fac91743644da878244cf8ee152f02cd6f5cd7a731689") + version("5.30.1", sha256="bf3d25571ff1ee94186177c2cdef87867fd6a14aa5a84f0b1fb7bf798f42f964") + version("5.30.0", sha256="851213c754d98ccff042caa40ba7a796b2cee88c5325f121be5cbb61bbf975f2") # End of life releases version("5.28.0", sha256="7e929f64d4cb0e9d1159d4a59fc89394e27fa1f7004d0836ca0d514685406ea8") @@ -394,7 +370,6 @@ def setup_dependent_package(self, module, dependent_spec): # If system perl is used through packages.yaml # there cannot be extensions. if dependent_spec.package.is_extension: - # perl extension builds can have a global perl # executable function module.perl = self.spec["perl"].command diff --git a/var/spack/repos/builtin/packages/pexsi/package.py b/var/spack/repos/builtin/packages/pexsi/package.py index cb4a118e82..47a550c103 100644 --- a/var/spack/repos/builtin/packages/pexsi/package.py +++ b/var/spack/repos/builtin/packages/pexsi/package.py @@ -39,7 +39,6 @@ class Pexsi(MakefilePackage): parallel = False def edit(self, spec, prefix): - substitutions = [ ("@MPICC", self.spec["mpi"].mpicc), ("@MPICXX_LIB", self.spec["mpi:cxx"].libs.joined()), @@ -79,7 +78,6 @@ def build(self, spec, prefix): make("-C", "fortran") def install(self, spec, prefix): - # 'make install' does not exist, despite what documentation says mkdirp(self.prefix.lib) diff --git a/var/spack/repos/builtin/packages/pfunit/package.py b/var/spack/repos/builtin/packages/pfunit/package.py index 193496f786..b61007eb5c 100644 --- a/var/spack/repos/builtin/packages/pfunit/package.py +++ b/var/spack/repos/builtin/packages/pfunit/package.py @@ -117,11 +117,7 @@ class Pfunit(CMakePackage): msg="CMake 3.25.0 has a bug with pFUnit. Please use another version.", ) - conflicts( - "%gcc@:8.3.9", - when="@4.0.0:", - msg="pFUnit requires GCC 8.4.0 or newer", - ) + conflicts("%gcc@:8.3.9", when="@4.0.0:", msg="pFUnit requires GCC 8.4.0 or newer") patch("mpi-test.patch", when="+use_comm_world") diff --git a/var/spack/repos/builtin/packages/pgplot/package.py b/var/spack/repos/builtin/packages/pgplot/package.py index 01a3531836..45863c19fa 100644 --- a/var/spack/repos/builtin/packages/pgplot/package.py +++ b/var/spack/repos/builtin/packages/pgplot/package.py @@ -49,7 +49,6 @@ class Pgplot(MakefilePackage): depends_on("libpng", when="+png") def edit(self, spec, prefix): - libs = "" if "+X" in spec: libs += " " + self.spec["libx11"].libs.ld_flags diff --git a/var/spack/repos/builtin/packages/piranha/package.py b/var/spack/repos/builtin/packages/piranha/package.py index 1f07d49151..c346ba1b27 100644 --- a/var/spack/repos/builtin/packages/piranha/package.py +++ b/var/spack/repos/builtin/packages/piranha/package.py @@ -39,7 +39,4 @@ class Piranha(CMakePackage): depends_on("mpfr") # Could also be built against mpir def cmake_args(self): - return [ - self.define_from_variant("BUILD_PYRANHA", "python"), - "-DBUILD_TESTS:BOOL=ON", - ] + return [self.define_from_variant("BUILD_PYRANHA", "python"), "-DBUILD_TESTS:BOOL=ON"] diff --git a/var/spack/repos/builtin/packages/pixman/package.py b/var/spack/repos/builtin/packages/pixman/package.py index cdb795256c..55b5bf090e 100644 --- a/var/spack/repos/builtin/packages/pixman/package.py +++ b/var/spack/repos/builtin/packages/pixman/package.py @@ -59,10 +59,7 @@ def libs(self): return find_libraries("libpixman-1", self.prefix, shared=True, recursive=True) def configure_args(self): - args = [ - "--enable-libpng", - "--disable-gtk", - ] + args = ["--enable-libpng", "--disable-gtk"] if sys.platform == "darwin": args.append("--disable-mmx") diff --git a/var/spack/repos/builtin/packages/plplot/package.py b/var/spack/repos/builtin/packages/plplot/package.py index 9b7dda666e..d210cadc8c 100644 --- a/var/spack/repos/builtin/packages/plplot/package.py +++ b/var/spack/repos/builtin/packages/plplot/package.py @@ -72,22 +72,16 @@ def cmake_args(self): "-DTCL_LIBRARY={0}".format( LibraryList( find_libraries( - "libtcl*", - self.spec["tcl"].prefix, - shared=True, - recursive=True, + "libtcl*", self.spec["tcl"].prefix, shared=True, recursive=True ) - ), + ) ), "-DTCL_STUB_LIBRARY={0}".format( LibraryList( find_libraries( - "libtclstub*", - self.spec["tcl"].prefix, - shared=False, - recursive=True, + "libtclstub*", self.spec["tcl"].prefix, shared=False, recursive=True ) - ), + ) ), ] else: diff --git a/var/spack/repos/builtin/packages/plumed/package.py b/var/spack/repos/builtin/packages/plumed/package.py index e7063638c1..3fd553e743 100644 --- a/var/spack/repos/builtin/packages/plumed/package.py +++ b/var/spack/repos/builtin/packages/plumed/package.py @@ -167,7 +167,6 @@ class Plumed(AutotoolsPackage): parallel = False def apply_patch(self, other): - # The name of MD engines differ slightly from the ones used in Spack format_strings = collections.defaultdict(lambda: "{0.name}-{0.version}") format_strings["espresso"] = "q{0.name}-{0.version}" diff --git a/var/spack/repos/builtin/packages/podman/package.py b/var/spack/repos/builtin/packages/podman/package.py index fcc9f39b18..18d9f01081 100644 --- a/var/spack/repos/builtin/packages/podman/package.py +++ b/var/spack/repos/builtin/packages/podman/package.py @@ -60,9 +60,7 @@ def patch(self): ) # Use the podman install prefix as fallback path for finding container.conf filter_file( - r"/usr", - self.prefix, - "vendor/github.com/containers/common/pkg/config/config.go", + r"/usr", self.prefix, "vendor/github.com/containers/common/pkg/config/config.go" ) def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/poppler/package.py b/var/spack/repos/builtin/packages/poppler/package.py index 1f2fb00dba..b0a266a9b0 100644 --- a/var/spack/repos/builtin/packages/poppler/package.py +++ b/var/spack/repos/builtin/packages/poppler/package.py @@ -105,21 +105,9 @@ def cmake_args(self): args.append("-DENABLE_CPP=OFF") if "+glib" in spec: - args.extend( - [ - "-DENABLE_GLIB=ON", - "-DWITH_GLIB=ON", - "-DWITH_Cairo=ON", - ] - ) + args.extend(["-DENABLE_GLIB=ON", "-DWITH_GLIB=ON", "-DWITH_Cairo=ON"]) else: - args.extend( - [ - "-DENABLE_GLIB=OFF", - "-DWITH_GLIB=OFF", - "-DWITH_Cairo=OFF", - ] - ) + args.extend(["-DENABLE_GLIB=OFF", "-DWITH_GLIB=OFF", "-DWITH_Cairo=OFF"]) if "+gobject" in spec: args.append("-DENABLE_GOBJECT_INTROSPECTION=ON") diff --git a/var/spack/repos/builtin/packages/ppopen-appl-amr-fdm/package.py b/var/spack/repos/builtin/packages/ppopen-appl-amr-fdm/package.py index e05393700c..24d6718288 100644 --- a/var/spack/repos/builtin/packages/ppopen-appl-amr-fdm/package.py +++ b/var/spack/repos/builtin/packages/ppopen-appl-amr-fdm/package.py @@ -27,10 +27,7 @@ def edit(self, spec, prefix): mkdirp("bin") mkdirp("lib") mkdirp("include") - fflags = [ - "-O3", - "-I.", - ] + fflags = ["-O3", "-I."] makefile_in = FileFilter("Makefile.in") makefile_in.filter("^PREFIX +=.*", "PREFIX = {0}".format(prefix)) makefile_in.filter("^INCDIR +=.*", "INCDIR = {0}/include".format(self.build_directory)) diff --git a/var/spack/repos/builtin/packages/prank/package.py b/var/spack/repos/builtin/packages/prank/package.py index 96b1034d51..367b54a5af 100644 --- a/var/spack/repos/builtin/packages/prank/package.py +++ b/var/spack/repos/builtin/packages/prank/package.py @@ -21,7 +21,6 @@ class Prank(Package): def install(self, spec, prefix): with working_dir("src"): - filter_file("gcc", "{0}".format(spack_cc), "Makefile", string=True) filter_file("g++", "{0}".format(spack_cxx), "Makefile", string=True) if not spec.target.family == "x86_64": diff --git a/var/spack/repos/builtin/packages/precice/package.py b/var/spack/repos/builtin/packages/precice/package.py index f6d68b2f18..7c47b7b32a 100644 --- a/var/spack/repos/builtin/packages/precice/package.py +++ b/var/spack/repos/builtin/packages/precice/package.py @@ -107,9 +107,7 @@ def variant_bool(feature, on="ON", off="OFF"): return on return off - cmake_args = [ - "-DBUILD_SHARED_LIBS:BOOL=%s" % variant_bool("+shared"), - ] + cmake_args = ["-DBUILD_SHARED_LIBS:BOOL=%s" % variant_bool("+shared")] cmake_args.append("-D%s:BOOL=%s" % (mpi_option, variant_bool("+mpi"))) diff --git a/var/spack/repos/builtin/packages/prism/package.py b/var/spack/repos/builtin/packages/prism/package.py index 42a44c29a1..1bc67ffa83 100644 --- a/var/spack/repos/builtin/packages/prism/package.py +++ b/var/spack/repos/builtin/packages/prism/package.py @@ -31,15 +31,7 @@ def install(self, spec, prefix): for f in ["prism", "xprism"]: filter_file("^PRISM_DIR.*", "", "bin/{0}".format(f)) - dirs = [ - "bin", - "classes", - "dtds", - "etc", - "include", - "images", - "lib", - ] + dirs = ["bin", "classes", "dtds", "etc", "include", "images", "lib"] for d in dirs: install_tree(d, join_path(prefix, d)) diff --git a/var/spack/repos/builtin/packages/prrte/package.py b/var/spack/repos/builtin/packages/prrte/package.py index 2e237061f1..8e37370eef 100644 --- a/var/spack/repos/builtin/packages/prrte/package.py +++ b/var/spack/repos/builtin/packages/prrte/package.py @@ -43,7 +43,6 @@ def autoreconf(self, spec, prefix): perl("autogen.pl") def configure_args(self): - spec = self.spec config_args = ["--enable-shared", "--enable-static"] diff --git a/var/spack/repos/builtin/packages/pvm/package.py b/var/spack/repos/builtin/packages/pvm/package.py index d18513dc89..bcefdb1a13 100644 --- a/var/spack/repos/builtin/packages/pvm/package.py +++ b/var/spack/repos/builtin/packages/pvm/package.py @@ -39,7 +39,6 @@ def edit(self, spec, prefix): env["PVM_ROOT"] = self.stage.source_path def patch(self): - pvm_arch = self.pvm_arch(self.stage.source_path) if "+fpic" in self.spec: @@ -49,14 +48,10 @@ def patch(self): def setup_build_environment(self, env): tirpc = self.spec["libtirpc"].prefix - env.prepend_path( - "SPACK_INCLUDE_DIRS", - tirpc.include.tirpc, - ) + env.prepend_path("SPACK_INCLUDE_DIRS", tirpc.include.tirpc) env.set("SPACK_LDLIBS", "-ltirpc") def install(self, spec, prefix): - install_tree("bin", prefix.bin) install_tree("include", prefix.include) install_tree("lib", prefix.lib) diff --git a/var/spack/repos/builtin/packages/py-chainer/package.py b/var/spack/repos/builtin/packages/py-chainer/package.py index 05c77a5c55..f174960c9f 100644 --- a/var/spack/repos/builtin/packages/py-chainer/package.py +++ b/var/spack/repos/builtin/packages/py-chainer/package.py @@ -57,21 +57,10 @@ def test(self): mnist_file = join_path(mnist_dir, "train_mnist.py") mpi_name = self.spec["mpi"].prefix.bin.mpirun python_exe = self.spec["python"].command.path - opts = [ - "-n", - "4", - python_exe, - mnist_file, - "-o", - test_dir, - ] + opts = ["-n", "4", python_exe, mnist_file, "-o", test_dir] env["OMP_NUM_THREADS"] = "4" - self.run_test( - mpi_name, - options=opts, - work_dir=test_dir, - ) + self.run_test(mpi_name, options=opts, work_dir=test_dir) # check results json_open = open(join_path(test_dir, "log"), "r") diff --git a/var/spack/repos/builtin/packages/py-darshan/package.py b/var/spack/repos/builtin/packages/py-darshan/package.py index e2db6349c8..2176d50354 100644 --- a/var/spack/repos/builtin/packages/py-darshan/package.py +++ b/var/spack/repos/builtin/packages/py-darshan/package.py @@ -14,14 +14,8 @@ class PyDarshan(PythonPackage): maintainers("jeanbez", "shanedsnyder") - version( - "3.4.2.0", - sha256="eb00eb758c96899c0d523b71eb00caa3b967509c27fd504c579ac8c9b521845c", - ) - version( - "3.4.1.0", - sha256="41a033ebac6fcd0ca05b8ccf07e11191286dee923ec334b876a7ec8e8a6add84", - ) + version("3.4.2.0", sha256="eb00eb758c96899c0d523b71eb00caa3b967509c27fd504c579ac8c9b521845c") + version("3.4.1.0", sha256="41a033ebac6fcd0ca05b8ccf07e11191286dee923ec334b876a7ec8e8a6add84") version("3.4.0.1", sha256="0142fc7c0b12a9e5c22358aa26cca7083d28af42aeea7dfcc5698c56b6aee6b7") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-galaxy2cwl/package.py b/var/spack/repos/builtin/packages/py-galaxy2cwl/package.py index 37653eb679..cb8c9657ce 100644 --- a/var/spack/repos/builtin/packages/py-galaxy2cwl/package.py +++ b/var/spack/repos/builtin/packages/py-galaxy2cwl/package.py @@ -13,10 +13,7 @@ class PyGalaxy2cwl(PythonPackage): homepage = "https://github.com/workflowhub-eu/galaxy2cwl" url = "https://github.com/workflowhub-eu/galaxy2cwl/archive/refs/tags/0.1.4.tar.gz" - version( - "0.1.4", - sha256="ceb9024a7bf74c874be216c943cc97343563b1ec78f85fd3ec5b482c64350290", - ) + version("0.1.4", sha256="ceb9024a7bf74c874be216c943cc97343563b1ec78f85fd3ec5b482c64350290") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-lightning-utilities/package.py b/var/spack/repos/builtin/packages/py-lightning-utilities/package.py index 28cd080338..2b5eb3d058 100644 --- a/var/spack/repos/builtin/packages/py-lightning-utilities/package.py +++ b/var/spack/repos/builtin/packages/py-lightning-utilities/package.py @@ -15,8 +15,7 @@ class PyLightningUtilities(PythonPackage): maintainers("adamjstewart") version( - "0.6.0.post0", - sha256="6f02cfe59e6576487e709a0e66e07671563bde9e21b40e1c567918e4d753278c", + "0.6.0.post0", sha256="6f02cfe59e6576487e709a0e66e07671563bde9e21b40e1c567918e4d753278c" ) version("0.5.0", sha256="01ef5b7fd50a8b54b849d8621720a65c36c91b374933a8384fb2be3d86cfa8f1") version("0.4.2", sha256="dc6696ab180117f7e97b5488dac1d77765ab891022f7521a97a39e10d362bdb8") diff --git a/var/spack/repos/builtin/packages/py-llnl-sina/package.py b/var/spack/repos/builtin/packages/py-llnl-sina/package.py index 062be68e54..3bec899480 100644 --- a/var/spack/repos/builtin/packages/py-llnl-sina/package.py +++ b/var/spack/repos/builtin/packages/py-llnl-sina/package.py @@ -24,12 +24,7 @@ class PyLlnlSina(PythonPackage): git = "https://github.com/LLNL/Sina.git" # notify when the package is updated. - maintainers( - "HaluskaR", - "estebanpauli", - "murray55", - "doutriaux1", - ) + maintainers("HaluskaR", "estebanpauli", "murray55", "doutriaux1") version("1.11.0", tag="v1.11.0") version("1.10.0", tag="v1.10.0") diff --git a/var/spack/repos/builtin/packages/py-mariadb/package.py b/var/spack/repos/builtin/packages/py-mariadb/package.py index 6f630e42d9..55435a499e 100644 --- a/var/spack/repos/builtin/packages/py-mariadb/package.py +++ b/var/spack/repos/builtin/packages/py-mariadb/package.py @@ -12,8 +12,7 @@ class PyMariadb(PythonPackage): pypi = "mariadb/mariadb-1.1.5.post3.tar.gz" version( - "1.1.5.post3", - sha256="f9336dd4cb3207e621933bb5221f33fac0d7184db64dc44c70531430f4ecdcee", + "1.1.5.post3", sha256="f9336dd4cb3207e621933bb5221f33fac0d7184db64dc44c70531430f4ecdcee" ) version( "1.0.10", diff --git a/var/spack/repos/builtin/packages/py-parsl/package.py b/var/spack/repos/builtin/packages/py-parsl/package.py index 4a66387dc5..efc2e8bd53 100644 --- a/var/spack/repos/builtin/packages/py-parsl/package.py +++ b/var/spack/repos/builtin/packages/py-parsl/package.py @@ -18,11 +18,7 @@ class PyParsl(PythonPackage): version("1.1.0", sha256="6a623d3550329f028775950d23a2cafcb0f82b199f15940180410604aa5d102c") - variant( - "monitoring", - default=False, - description="enable live monitoring", - ) + variant("monitoring", default=False, description="enable live monitoring") # See https://parsl.readthedocs.io/en/stable/userguide/monitoring.html depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pybind11/package.py b/var/spack/repos/builtin/packages/py-pybind11/package.py index 2b650c0b1e..180a1c1590 100644 --- a/var/spack/repos/builtin/packages/py-pybind11/package.py +++ b/var/spack/repos/builtin/packages/py-pybind11/package.py @@ -104,9 +104,7 @@ def install_test(self): # test include helper points to right location python = self.spec["python"].command py_inc = python( - "-c", - "import pybind11 as py; print(py.get_include())", - output=str, + "-c", "import pybind11 as py; print(py.get_include())", output=str ).strip() for inc in [py_inc, self.prefix.include]: inc_file = join_path(inc, "pybind11", "pybind11.h") diff --git a/var/spack/repos/builtin/packages/py-pyfr/package.py b/var/spack/repos/builtin/packages/py-pyfr/package.py index b48339ec16..7cbfe6ab71 100644 --- a/var/spack/repos/builtin/packages/py-pyfr/package.py +++ b/var/spack/repos/builtin/packages/py-pyfr/package.py @@ -22,18 +22,9 @@ class PyPyfr(PythonPackage, CudaPackage, ROCmPackage): version("master", branch="master") # pypi releases - version( - "1.15.0", - sha256="6a634b9d32447f45d3c24c9de0ed620a0a0a781be7cc5e57b1c1bf44a4650d8d", - ) - version( - "1.14.0", - sha256="ebf40ce0896cce9ac802e03fd9430b5be30ea837c31224531a6d5fd68f820766", - ) - version( - "1.13.0", - sha256="ac6ecec738d4e23799ab8c50dea9bdbd7d37bc971bd33f22720c5a230b8e7b2f", - ) + version("1.15.0", sha256="6a634b9d32447f45d3c24c9de0ed620a0a0a781be7cc5e57b1c1bf44a4650d8d") + version("1.14.0", sha256="ebf40ce0896cce9ac802e03fd9430b5be30ea837c31224531a6d5fd68f820766") + version("1.13.0", sha256="ac6ecec738d4e23799ab8c50dea9bdbd7d37bc971bd33f22720c5a230b8e7b2f") variant("metis", default=True, description="Metis for mesh partitioning") variant("scotch", default=False, description="Scotch for mesh partitioning") diff --git a/var/spack/repos/builtin/packages/py-pykokkos-base/package.py b/var/spack/repos/builtin/packages/py-pykokkos-base/package.py index f6885ca1b6..6ad164bfc0 100644 --- a/var/spack/repos/builtin/packages/py-pykokkos-base/package.py +++ b/var/spack/repos/builtin/packages/py-pykokkos-base/package.py @@ -22,9 +22,7 @@ class PyPykokkosBase(CMakePackage, PythonExtension): version("0.0.3", commit="4fe4421ac624ba2efe1eee265153e690622a18a5", submodules=False) variant( - "layouts", - default=True, - description="Build Kokkos View/DynRankView with layout variants", + "layouts", default=True, description="Build Kokkos View/DynRankView with layout variants" ) variant( "memory_traits", diff --git a/var/spack/repos/builtin/packages/py-tensorflow-datasets/package.py b/var/spack/repos/builtin/packages/py-tensorflow-datasets/package.py index 51d7d232d2..1ad767902d 100644 --- a/var/spack/repos/builtin/packages/py-tensorflow-datasets/package.py +++ b/var/spack/repos/builtin/packages/py-tensorflow-datasets/package.py @@ -13,10 +13,7 @@ class PyTensorflowDatasets(PythonPackage): homepage = "https://github.com/tensorflow/datasets" pypi = "tensorflow-datasets/tensorflow-datasets-4.4.0.tar.gz" - version( - "4.4.0", - sha256="3e95a61dec1fdb7b05dabc0dbed1b531e13d6c6fd362411423d0a775e5e9b960", - ) + version("4.4.0", sha256="3e95a61dec1fdb7b05dabc0dbed1b531e13d6c6fd362411423d0a775e5e9b960") depends_on("python@3.6:", type=("build", "run")) depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-tensorflow/package.py b/var/spack/repos/builtin/packages/py-tensorflow/package.py index d0358962fc..61128029d1 100644 --- a/var/spack/repos/builtin/packages/py-tensorflow/package.py +++ b/var/spack/repos/builtin/packages/py-tensorflow/package.py @@ -604,10 +604,7 @@ def setup_build_environment(self, env): # Please specify which gcc nvcc should use as the host compiler env.set("GCC_HOST_COMPILER_PATH", spack_cc) - cuda_paths = [ - spec["cuda"].prefix, - spec["cudnn"].prefix, - ] + cuda_paths = [spec["cuda"].prefix, spec["cudnn"].prefix] # Do you wish to build TensorFlow with TensorRT support? if "+tensorrt" in spec: diff --git a/var/spack/repos/builtin/packages/py-trimesh/package.py b/var/spack/repos/builtin/packages/py-trimesh/package.py index 4062438029..13b5d2e268 100644 --- a/var/spack/repos/builtin/packages/py-trimesh/package.py +++ b/var/spack/repos/builtin/packages/py-trimesh/package.py @@ -12,14 +12,8 @@ class PyTrimesh(PythonPackage): homepage = "https://github.com/mikedh/trimesh" pypi = "trimesh/trimesh-2.38.10.tar.gz" - version( - "3.17.1", - sha256="025bb2fa3a2e87bdd6873f11db45a7ca19216f2f8b6aed29140fca57e32c298e", - ) - version( - "2.38.10", - sha256="866e73ea35641ff2af73867c891d7f9b90c75ccb8a3c1e8e06e16ff9af1f8c64", - ) + version("3.17.1", sha256="025bb2fa3a2e87bdd6873f11db45a7ca19216f2f8b6aed29140fca57e32c298e") + version("2.38.10", sha256="866e73ea35641ff2af73867c891d7f9b90c75ccb8a3c1e8e06e16ff9af1f8c64") variant( "easy", diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py index 419e5b8c7b..e52e5bc87a 100644 --- a/var/spack/repos/builtin/packages/python/package.py +++ b/var/spack/repos/builtin/packages/python/package.py @@ -14,10 +14,7 @@ from typing import Dict, List import llnl.util.tty as tty -from llnl.util.filesystem import ( - is_nonsymlink_exe_with_shebang, - path_contains_subdirectory, -) +from llnl.util.filesystem import is_nonsymlink_exe_with_shebang, path_contains_subdirectory from llnl.util.lang import dedupe from spack.build_environment import dso_suffix, stat_suffix @@ -874,13 +871,7 @@ def find_library(self, library): win_bin_dir = self.config_vars["BINDIR"] win_root_dir = self.config_vars["prefix"] - directories = [ - libdir, - frameworkprefix, - macos_developerdir, - win_bin_dir, - win_root_dir, - ] + directories = [libdir, frameworkprefix, macos_developerdir, win_bin_dir, win_root_dir] # The Python shipped with Xcode command line tools isn't in any of these locations for subdir in ["lib", "lib64"]: @@ -914,18 +905,14 @@ def libs(self): shared_libs = [] else: shared_libs = [self.config_vars["LDLIBRARY"]] - shared_libs += [ - "{}python{}.{}".format(lib_prefix, py_version, dso_suffix), - ] + shared_libs += ["{}python{}.{}".format(lib_prefix, py_version, dso_suffix)] # Like LDLIBRARY for Python on Mac OS, LIBRARY may refer to an un-linkable object file_extension_static = os.path.splitext(self.config_vars["LIBRARY"])[-1] if file_extension_static == "": static_libs = [] else: static_libs = [self.config_vars["LIBRARY"]] - static_libs += [ - "{}python{}.{}".format(lib_prefix, py_version, stat_suffix), - ] + static_libs += ["{}python{}.{}".format(lib_prefix, py_version, stat_suffix)] # The +shared variant isn't reliable, as `spack external find` currently can't # detect it. If +shared, prefer the shared libraries, but check for static if diff --git a/var/spack/repos/builtin/packages/qmcpack/package.py b/var/spack/repos/builtin/packages/qmcpack/package.py index fe27405fc6..323aea003c 100644 --- a/var/spack/repos/builtin/packages/qmcpack/package.py +++ b/var/spack/repos/builtin/packages/qmcpack/package.py @@ -393,7 +393,6 @@ def cmake_args(self): # but still does not install nexus, manual, etc. So, there is no compelling # reason to use QMCPACK's built-in version at this time. def install(self, spec, prefix): - # create top-level directory mkdirp(prefix) diff --git a/var/spack/repos/builtin/packages/qoz/package.py b/var/spack/repos/builtin/packages/qoz/package.py index 746677e561..03d811a0ad 100644 --- a/var/spack/repos/builtin/packages/qoz/package.py +++ b/var/spack/repos/builtin/packages/qoz/package.py @@ -21,8 +21,5 @@ class Qoz(CMakePackage): depends_on("pkgconfig") def cmake_args(self): - args = [ - "-DQoZ_USE_BUNDLED_ZSTD=OFF", - "-DQoZ_DEBUG_TIMINGS=OFF", - ] + args = ["-DQoZ_USE_BUNDLED_ZSTD=OFF", "-DQoZ_DEBUG_TIMINGS=OFF"] return args diff --git a/var/spack/repos/builtin/packages/qrupdate/package.py b/var/spack/repos/builtin/packages/qrupdate/package.py index 47db85bba7..d0554cb26f 100644 --- a/var/spack/repos/builtin/packages/qrupdate/package.py +++ b/var/spack/repos/builtin/packages/qrupdate/package.py @@ -40,7 +40,6 @@ def edit(self, spec, prefix): # The Makefile does not take the simple "make" rule def build(self, spec, prefix): - lapack_blas = spec["lapack"].libs + spec["blas"].libs make_args = [ diff --git a/var/spack/repos/builtin/packages/qt-base/package.py b/var/spack/repos/builtin/packages/qt-base/package.py index 0f069807e3..2d7d959d4a 100644 --- a/var/spack/repos/builtin/packages/qt-base/package.py +++ b/var/spack/repos/builtin/packages/qt-base/package.py @@ -235,13 +235,9 @@ def define_feature(key, variant=None): ("textmarkdownreader", False), ] with when("platform=linux"): - sys_features += [ - ("xcb_xinput", True), - ] + sys_features += [("xcb_xinput", True)] if "+network" in spec: - sys_features += [ - ("proxies", True), - ] + sys_features += [("proxies", True)] for k, v in sys_features: define("FEATURE_system_" + k, v) diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index c7a11ae118..af553b615f 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -578,7 +578,7 @@ def common_config_args(self): [ # NIS is deprecated in more recent glibc, # but qt-5.6.3 does not recognize this option - "-no-nis", + "-no-nis" ] ) @@ -698,12 +698,7 @@ def configure(self, spec, prefix): config_args.append("-no-feature-getentropy") if "~webkit" in spec: - config_args.extend( - [ - "-skip", - "webengine" if version >= Version("5.6") else "qtwebkit", - ] - ) + config_args.extend(["-skip", "webengine" if version >= Version("5.6") else "qtwebkit"]) if spec.satisfies("@5.7"): config_args.extend(["-skip", "virtualkeyboard"]) @@ -743,12 +738,7 @@ def configure(self, spec, prefix): # These options are only valid if 'multimedia' is enabled, i.e. # +opengl is selected. Force them to be off on macOS, but let other # platforms decide for themselves. - config_args.extend( - [ - "-no-pulseaudio", - "-no-alsa", - ] - ) + config_args.extend(["-no-pulseaudio", "-no-alsa"]) if spec.satisfies("platform=darwin target=aarch64:"): # https://www.qt.io/blog/qt-on-apple-silicon diff --git a/var/spack/repos/builtin/packages/quantum-espresso/package.py b/var/spack/repos/builtin/packages/quantum-espresso/package.py index 557477cd24..374d4ec3e2 100644 --- a/var/spack/repos/builtin/packages/quantum-espresso/package.py +++ b/var/spack/repos/builtin/packages/quantum-espresso/package.py @@ -80,11 +80,7 @@ class QuantumEspresso(CMakePackage, Package): # Add Cuda Fortran support # depends on NVHPC compiler, not directly on CUDA toolkit with when("%nvhpc"): - variant( - "cuda", - default=False, - description="Build with CUDA Fortran", - ) + variant("cuda", default=False, description="Build with CUDA Fortran") with when("+cuda"): # GPUs are enabled since v6.6 conflicts("@:6.5") @@ -535,7 +531,6 @@ def install(self, pkg, spec, prefix): options.append("--with-libxc-prefix={0}".format(spec["libxc"].prefix)) if "+elpa" in spec: - # Spec for elpa elpa = spec["elpa"] diff --git a/var/spack/repos/builtin/packages/r3d/package.py b/var/spack/repos/builtin/packages/r3d/package.py index 01604a9681..f0f06f63f1 100644 --- a/var/spack/repos/builtin/packages/r3d/package.py +++ b/var/spack/repos/builtin/packages/r3d/package.py @@ -42,10 +42,7 @@ def cmake(self, spec, prefix): @when("@:2019-04-24") def build(self, spec, prefix): - - make_args = [ - "CC={0}".format(spack_cc), - ] + make_args = ["CC={0}".format(spack_cc)] make("libr3d.a", *make_args) if "+test" in spec: @@ -54,7 +51,6 @@ def build(self, spec, prefix): @when("@:2019-04-24") def install(self, spec, prefix): - # R3D does not have an install target so create our own here. mkdirp(prefix.include) my_headers = find(".", "*.h", recursive=False) @@ -65,7 +61,6 @@ def install(self, spec, prefix): if "+test" in spec: with working_dir("tests"): - # R3D does not have an install target so create our own here. mkdirp(prefix.test) install("r2d_unit_tests", prefix.test) diff --git a/var/spack/repos/builtin/packages/racket/package.py b/var/spack/repos/builtin/packages/racket/package.py index 692882ea3f..8a72c5433d 100644 --- a/var/spack/repos/builtin/packages/racket/package.py +++ b/var/spack/repos/builtin/packages/racket/package.py @@ -34,7 +34,6 @@ def url_for_version(self, version): class MakefileBuilder(spack.build_systems.makefile.MakefileBuilder): - build_directory = "src" def toggle(self, spec, variant): diff --git a/var/spack/repos/builtin/packages/redis-plus-plus/package.py b/var/spack/repos/builtin/packages/redis-plus-plus/package.py index 4e3fe70fea..f8a5714e9d 100644 --- a/var/spack/repos/builtin/packages/redis-plus-plus/package.py +++ b/var/spack/repos/builtin/packages/redis-plus-plus/package.py @@ -16,12 +16,7 @@ class RedisPlusPlus(CMakePackage): maintainers("lpottier") - variant( - "cxxstd", - values=("11", "14", "17"), - default="14", - description="C++ standard used", - ) + variant("cxxstd", values=("11", "14", "17"), default="14", description="C++ standard used") variant("shared", default=True, description="Enables the build of a shared library") variant("static", default=True, description="Enables the build of a static library") variant( @@ -44,7 +39,6 @@ class RedisPlusPlus(CMakePackage): conflicts("+tls", when="+static", msg="Static libraries cannot be built with TLS support.") def cmake_args(self): - cxxstd = self.spec.variants["cxxstd"].value use_fpic = ("+static" in self.spec) and ("+fpic" in self.spec) diff --git a/var/spack/repos/builtin/packages/redis/package.py b/var/spack/repos/builtin/packages/redis/package.py index c259034eb6..0c7396fea6 100644 --- a/var/spack/repos/builtin/packages/redis/package.py +++ b/var/spack/repos/builtin/packages/redis/package.py @@ -63,10 +63,7 @@ class Redis(MakefilePackage): def build_targets(self): use_tls = "yes" if "+tls" in self.spec else "no" use_systemd = "yes" if "+systemd" in self.spec else "no" - return [ - "BUILD_TLS={0}".format(use_tls), - "USE_SYSTEMD={0}".format(use_systemd), - ] + return ["BUILD_TLS={0}".format(use_tls), "USE_SYSTEMD={0}".format(use_systemd)] @property def install_targets(self): diff --git a/var/spack/repos/builtin/packages/relion/package.py b/var/spack/repos/builtin/packages/relion/package.py index 8f6c579e0c..2dad54051c 100644 --- a/var/spack/repos/builtin/packages/relion/package.py +++ b/var/spack/repos/builtin/packages/relion/package.py @@ -116,11 +116,7 @@ def cmake_args(self): if carch == "none": raise ValueError("Must select a value for cuda_arch") else: - args += [ - "-DCUDA=ON", - "-DCudaTexture=ON", - "-DCUDA_ARCH=%s" % (carch), - ] + args += ["-DCUDA=ON", "-DCudaTexture=ON", "-DCUDA_ARCH=%s" % (carch)] return args diff --git a/var/spack/repos/builtin/packages/revbayes/package.py b/var/spack/repos/builtin/packages/revbayes/package.py index 9adffcbd86..7a23a2c429 100644 --- a/var/spack/repos/builtin/packages/revbayes/package.py +++ b/var/spack/repos/builtin/packages/revbayes/package.py @@ -52,12 +52,7 @@ def root_cmakelists_dir(self): def cmake_args(self): args = [] if "+mpi" in self.spec: - args.extend( - [ - self.define("MPI", "ON"), - self.define("RB_EXEC_NAME", "rb-mpi"), - ] - ) + args.extend([self.define("MPI", "ON"), self.define("RB_EXEC_NAME", "rb-mpi")]) return args @run_before("cmake") diff --git a/var/spack/repos/builtin/packages/rmgdft/package.py b/var/spack/repos/builtin/packages/rmgdft/package.py index a23d90dd6b..ede5fc0e45 100644 --- a/var/spack/repos/builtin/packages/rmgdft/package.py +++ b/var/spack/repos/builtin/packages/rmgdft/package.py @@ -91,7 +91,6 @@ def cmake_args(self): return args def install(self, spec, prefix): - # create top-level directories mkdirp(prefix.bin) mkdirp(prefix.share.tests.RMG) diff --git a/var/spack/repos/builtin/packages/rocalution/package.py b/var/spack/repos/builtin/packages/rocalution/package.py index da955d1685..c089cc1da8 100644 --- a/var/spack/repos/builtin/packages/rocalution/package.py +++ b/var/spack/repos/builtin/packages/rocalution/package.py @@ -115,11 +115,7 @@ class Rocalution(CMakePackage): ) depends_on("cmake@3.5:", type="build") - for ver in [ - "3.5.0", - "3.7.0", - "3.8.0", - ]: + for ver in ["3.5.0", "3.7.0", "3.8.0"]: depends_on("hip@" + ver, when="@" + ver) depends_on("rocprim@" + ver, when="@" + ver) for tgt in itertools.chain(["auto"], amdgpu_targets): diff --git a/var/spack/repos/builtin/packages/rocfft/package.py b/var/spack/repos/builtin/packages/rocfft/package.py index d8987f0170..63aca05616 100644 --- a/var/spack/repos/builtin/packages/rocfft/package.py +++ b/var/spack/repos/builtin/packages/rocfft/package.py @@ -176,9 +176,7 @@ def determine_version(cls, lib): return ver def cmake_args(self): - args = [ - self.define("BUILD_CLIENTS_TESTS", self.run_tests), - ] + args = [self.define("BUILD_CLIENTS_TESTS", self.run_tests)] tgt = self.spec.variants["amdgpu_target"] if "auto" not in tgt: diff --git a/var/spack/repos/builtin/packages/rocm-openmp-extras/package.py b/var/spack/repos/builtin/packages/rocm-openmp-extras/package.py index 109add2977..3792e96b88 100644 --- a/var/spack/repos/builtin/packages/rocm-openmp-extras/package.py +++ b/var/spack/repos/builtin/packages/rocm-openmp-extras/package.py @@ -180,61 +180,17 @@ class RocmOpenmpExtras(Package): version("5.2.0", sha256=versions_dict["5.2.0"]["aomp"]) version("5.1.3", sha256=versions_dict["5.1.3"]["aomp"]) version("5.1.0", sha256=versions_dict["5.1.0"]["aomp"]) - version( - "5.0.2", - sha256=versions_dict["5.0.2"]["aomp"], - deprecated=True, - ) - version( - "5.0.0", - sha256=versions_dict["5.0.0"]["aomp"], - deprecated=True, - ) - version( - "4.5.2", - sha256=versions_dict["4.5.2"]["aomp"], - deprecated=True, - ) - version( - "4.5.0", - sha256=versions_dict["4.5.0"]["aomp"], - deprecated=True, - ) - version( - "4.3.1", - sha256=versions_dict["4.3.1"]["aomp"], - deprecated=True, - ) - version( - "4.3.0", - sha256=versions_dict["4.3.0"]["aomp"], - deprecated=True, - ) - version( - "4.2.0", - sha256=versions_dict["4.2.0"]["aomp"], - deprecated=True, - ) - version( - "4.1.0", - sha256=versions_dict["4.1.0"]["aomp"], - deprecated=True, - ) - version( - "4.0.0", - sha256=versions_dict["4.0.0"]["aomp"], - deprecated=True, - ) - version( - "3.10.0", - sha256=versions_dict["3.10.0"]["aomp"], - deprecated=True, - ) - version( - "3.9.0", - sha256=versions_dict["3.9.0"]["aomp"], - deprecated=True, - ) + version("5.0.2", sha256=versions_dict["5.0.2"]["aomp"], deprecated=True) + version("5.0.0", sha256=versions_dict["5.0.0"]["aomp"], deprecated=True) + version("4.5.2", sha256=versions_dict["4.5.2"]["aomp"], deprecated=True) + version("4.5.0", sha256=versions_dict["4.5.0"]["aomp"], deprecated=True) + version("4.3.1", sha256=versions_dict["4.3.1"]["aomp"], deprecated=True) + version("4.3.0", sha256=versions_dict["4.3.0"]["aomp"], deprecated=True) + version("4.2.0", sha256=versions_dict["4.2.0"]["aomp"], deprecated=True) + version("4.1.0", sha256=versions_dict["4.1.0"]["aomp"], deprecated=True) + version("4.0.0", sha256=versions_dict["4.0.0"]["aomp"], deprecated=True) + version("3.10.0", sha256=versions_dict["3.10.0"]["aomp"], deprecated=True) + version("3.9.0", sha256=versions_dict["3.9.0"]["aomp"], deprecated=True) depends_on("cmake@3:", type="build") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/rocmlir/package.py b/var/spack/repos/builtin/packages/rocmlir/package.py index 0e1b14789c..47f2e8ac93 100644 --- a/var/spack/repos/builtin/packages/rocmlir/package.py +++ b/var/spack/repos/builtin/packages/rocmlir/package.py @@ -46,11 +46,7 @@ def patch(self): depends_on("half") depends_on("pkgconfig", type="build") - for ver in [ - "5.3.0", - "5.4.0", - "5.4.3", - ]: + for ver in ["5.3.0", "5.4.0", "5.4.3"]: depends_on("hip@" + ver, when="@" + ver) depends_on("llvm-amdgpu@" + ver, when="@" + ver) depends_on("hsa-rocr-dev@" + ver, when="@" + ver) diff --git a/var/spack/repos/builtin/packages/roms/package.py b/var/spack/repos/builtin/packages/roms/package.py index 1e61aebc90..cd3cd7bd81 100644 --- a/var/spack/repos/builtin/packages/roms/package.py +++ b/var/spack/repos/builtin/packages/roms/package.py @@ -95,7 +95,6 @@ def _edit_arch(self, spec, prefix, lib): filter_file(r"\sFREEFLAGS\s:=.*", "FREEFLAGS := -ffree-form", make_aocc) def edit(self, spec, prefix): - # ROMS doesn't have support for AOCC out of the box # Support extended to AOCC from below steps if "%aocc" in self.spec: @@ -130,7 +129,6 @@ def edit(self, spec, prefix): makefile.filter(r"\sUSE_DEBUG\s[?]=.*", "USE_DEBUG = on") def setup_build_environment(self, spack_env): - spec = self.spec netcdf_include = spec["netcdf-fortran"].prefix.include diff --git a/var/spack/repos/builtin/packages/root/package.py b/var/spack/repos/builtin/packages/root/package.py index ef3f925c19..76136c1865 100644 --- a/var/spack/repos/builtin/packages/root/package.py +++ b/var/spack/repos/builtin/packages/root/package.py @@ -177,10 +177,7 @@ class Root(CMakePackage): "vmc", when="@:6.25", default=False, description="Enable the Virtual Monte Carlo interface" ) variant( - "webgui", - default=True, - description="Enable web-based UI components of ROOT", - when="+root7", + "webgui", default=True, description="Enable web-based UI components of ROOT", when="+root7" ) variant("x", default=True, description="Enable set of graphical options") variant("xml", default=True, description="Enable XML parser interface") @@ -575,12 +572,7 @@ def cmake_args(self): if sys.platform == "darwin" and self.compiler.cc == "gcc": cflags = "-D__builtin_unreachable=__builtin_trap" - options.extend( - [ - define("CMAKE_C_FLAGS", cflags), - define("CMAKE_CXX_FLAGS", cflags), - ] - ) + options.extend([define("CMAKE_C_FLAGS", cflags), define("CMAKE_CXX_FLAGS", cflags)]) # Method for selecting C++ standard depends on ROOT version if self.spec.satisfies("@6.18.00:"): diff --git a/var/spack/repos/builtin/packages/rose/package.py b/var/spack/repos/builtin/packages/rose/package.py index c7b327011b..11ccc9d7e7 100644 --- a/var/spack/repos/builtin/packages/rose/package.py +++ b/var/spack/repos/builtin/packages/rose/package.py @@ -94,11 +94,7 @@ class Rose(AutotoolsPackage): variant("tools", default=False, description="Build a selection of ROSE based tools") - variant( - "mvapich2_backend", - default=False, - description="Enable mvapich2 backend compiler", - ) + variant("mvapich2_backend", default=False, description="Enable mvapich2 backend compiler") depends_on("mvapich2", when="+mvapich2_backend") variant("binanalysis", default=False, description="Enable binary analysis tooling") @@ -117,11 +113,7 @@ class Rose(AutotoolsPackage): variant("z3", default=False, description="Enable z3 theorem prover") depends_on("z3", when="+z3") - variant( - "edg_source", - default=False, - description="Use the EDG C/C++ frontend source code", - ) + variant("edg_source", default=False, description="Use the EDG C/C++ frontend source code") depends_on("git", when="+edg_source") # ------------------------------------------------------------------------ @@ -224,7 +216,6 @@ def build(self, spec, prefix): # $ srun -n1 spack install rose # with working_dir(self.build_directory): - # Compile librose make("core") @@ -254,7 +245,6 @@ def build(self, spec, prefix): def install(self, spec, prefix): with working_dir(self.build_directory): - # Compile and Install librose make("install-core") diff --git a/var/spack/repos/builtin/packages/routinator/package.py b/var/spack/repos/builtin/packages/routinator/package.py index 910335d0fc..72fadec466 100644 --- a/var/spack/repos/builtin/packages/routinator/package.py +++ b/var/spack/repos/builtin/packages/routinator/package.py @@ -14,10 +14,7 @@ class Routinator(Package): maintainers("aweits") - version( - "0.11.2", - sha256="00f825c53168592da0285e8dbd228018e77248d458214a2c0f86cd0ca45438f5", - ) + version("0.11.2", sha256="00f825c53168592da0285e8dbd228018e77248d458214a2c0f86cd0ca45438f5") depends_on("rust@1.56:") diff --git a/var/spack/repos/builtin/packages/rtags/package.py b/var/spack/repos/builtin/packages/rtags/package.py index 8045870028..5aa38a362a 100644 --- a/var/spack/repos/builtin/packages/rtags/package.py +++ b/var/spack/repos/builtin/packages/rtags/package.py @@ -27,8 +27,5 @@ class Rtags(CMakePackage): patch("add_string_iterator_erase_compile_check.patch", when="@2.12") def cmake_args(self): - args = [ - "-DCMAKE_EXPORT_COMPILE_COMMANDS=1", - "-DRTAGS_NO_ELISP_FILES=1", - ] + args = ["-DCMAKE_EXPORT_COMPILE_COMMANDS=1", "-DRTAGS_NO_ELISP_FILES=1"] return args diff --git a/var/spack/repos/builtin/packages/rust/package.py b/var/spack/repos/builtin/packages/rust/package.py index 6b133a03aa..410da6b70d 100644 --- a/var/spack/repos/builtin/packages/rust/package.py +++ b/var/spack/repos/builtin/packages/rust/package.py @@ -183,9 +183,7 @@ class Rust(Package): {"platform": "cray", "target": "aarch64:"}, ], "x86_64-apple-darwin": [{"platform": "darwin", "target": "x86_64:"}], - "aarch64-apple-darwin": [ - {"platform": "darwin", "target": "aarch64:"}, - ], + "aarch64-apple-darwin": [{"platform": "darwin", "target": "aarch64:"}], } # Specifies the strings which represent a pre-release Rust version. These diff --git a/var/spack/repos/builtin/packages/salmon/package.py b/var/spack/repos/builtin/packages/salmon/package.py index 3b2ea28de1..fbc9224640 100644 --- a/var/spack/repos/builtin/packages/salmon/package.py +++ b/var/spack/repos/builtin/packages/salmon/package.py @@ -113,8 +113,6 @@ def patch(self): filter_file("curl -k.*", "", "scripts/fetchPufferfish.sh") def cmake_args(self): - args = [ - "-DBOOST_ROOT=%s" % self.spec["boost"].prefix, - ] + args = ["-DBOOST_ROOT=%s" % self.spec["boost"].prefix] return args diff --git a/var/spack/repos/builtin/packages/sambamba/package.py b/var/spack/repos/builtin/packages/sambamba/package.py index d07890c3e7..2c771f5232 100644 --- a/var/spack/repos/builtin/packages/sambamba/package.py +++ b/var/spack/repos/builtin/packages/sambamba/package.py @@ -17,11 +17,7 @@ class Sambamba(Package): depends_on("ldc~shared", type=("build", "link")) depends_on("python", type="build") - resource( - name="undeaD", - git="https://github.com/dlang/undeaD.git", - tag="v1.0.7", - ) + resource(name="undeaD", git="https://github.com/dlang/undeaD.git", tag="v1.0.7") patch("Makefile.patch") parallel = False diff --git a/var/spack/repos/builtin/packages/sbml/package.py b/var/spack/repos/builtin/packages/sbml/package.py index df7e79826e..5d7ed286de 100644 --- a/var/spack/repos/builtin/packages/sbml/package.py +++ b/var/spack/repos/builtin/packages/sbml/package.py @@ -84,10 +84,7 @@ def cmake_args(self): args.append(self.define_from_variant("WITH_CPP_NAMESPACE", "cpp")) if "+python" in spec: args.extend( - [ - "-DWITH_PYTHON:BOOL=ON", - "-DWITH_PYTHON_INCLUDE:PATH=%s" % spec["python"].prefix, - ] + ["-DWITH_PYTHON:BOOL=ON", "-DWITH_PYTHON_INCLUDE:PATH=%s" % spec["python"].prefix] ) else: args.append("-DWITH_PYTHON:BOOL=OFF") diff --git a/var/spack/repos/builtin/packages/scalpel/package.py b/var/spack/repos/builtin/packages/scalpel/package.py index 66393c4bfe..acbf58ee8e 100644 --- a/var/spack/repos/builtin/packages/scalpel/package.py +++ b/var/spack/repos/builtin/packages/scalpel/package.py @@ -74,11 +74,7 @@ def install(self, spec, prefix): for f in files: install(f, destdir) - dirs = [ - "Text", - "MLDBM", - "Parallel", - ] + dirs = ["Text", "MLDBM", "Parallel"] for d in dirs: install_tree(d, join_path(destdir, d)) diff --git a/var/spack/repos/builtin/packages/scantailor/package.py b/var/spack/repos/builtin/packages/scantailor/package.py index 182a4ce224..ff696710bd 100644 --- a/var/spack/repos/builtin/packages/scantailor/package.py +++ b/var/spack/repos/builtin/packages/scantailor/package.py @@ -18,10 +18,7 @@ class Scantailor(CMakePackage): homepage = "https://www.scantailor.org" url = "https://github.com/trufanov-nok/scantailor/archive/0.2.7.tar.gz" - version( - "0.2.7", - sha256="3e27647621d43638888a268902f8fa098b06a70a5da5d0623b1c11220a367910", - ) + version("0.2.7", sha256="3e27647621d43638888a268902f8fa098b06a70a5da5d0623b1c11220a367910") depends_on("qt@5:") depends_on("libjpeg") diff --git a/var/spack/repos/builtin/packages/scotch/package.py b/var/spack/repos/builtin/packages/scotch/package.py index 2c5d14138e..6f4c576be5 100644 --- a/var/spack/repos/builtin/packages/scotch/package.py +++ b/var/spack/repos/builtin/packages/scotch/package.py @@ -85,7 +85,6 @@ def url_for_version(self, version): @property def libs(self): - shared = "+shared" in self.spec libraries = ["libscotch", "libscotcherr"] zlibs = [] @@ -130,12 +129,7 @@ class MakefileBuilder(spack.build_systems.makefile.MakefileBuilder): def edit(self, pkg, spec, prefix): makefile_inc = [] - cflags = [ - "-O3", - "-DCOMMON_RANDOM_FIXED_SEED", - "-DSCOTCH_DETERMINISTIC", - "-DSCOTCH_RENAME", - ] + cflags = ["-O3", "-DCOMMON_RANDOM_FIXED_SEED", "-DSCOTCH_DETERMINISTIC", "-DSCOTCH_RENAME"] if "+int64" in self.spec: # SCOTCH_Num typedef: size of integers in arguments diff --git a/var/spack/repos/builtin/packages/seacas/package.py b/var/spack/repos/builtin/packages/seacas/package.py index 31670193bc..270ea25f02 100644 --- a/var/spack/repos/builtin/packages/seacas/package.py +++ b/var/spack/repos/builtin/packages/seacas/package.py @@ -286,10 +286,7 @@ def cmake_args(self): # ##################### Dependencies ########################## # Always need NetCDF-C options.extend( - [ - define("TPL_ENABLE_Netcdf", True), - define("NetCDF_ROOT", spec["netcdf-c"].prefix), - ] + [define("TPL_ENABLE_Netcdf", True), define("NetCDF_ROOT", spec["netcdf-c"].prefix)] ) if "+parmetis" in spec: @@ -323,10 +320,7 @@ def cmake_args(self): ) else: options.extend( - [ - define("TPL_ENABLE_METIS", False), - define("TPL_ENABLE_ParMETIS", False), - ] + [define("TPL_ENABLE_METIS", False), define("TPL_ENABLE_ParMETIS", False)] ) options.append(from_variant("TPL_ENABLE_Matio", "matio")) diff --git a/var/spack/repos/builtin/packages/serenity-libint/package.py b/var/spack/repos/builtin/packages/serenity-libint/package.py index 6c7d7ed677..11b8a51efa 100644 --- a/var/spack/repos/builtin/packages/serenity-libint/package.py +++ b/var/spack/repos/builtin/packages/serenity-libint/package.py @@ -19,7 +19,5 @@ class SerenityLibint(CMakePackage): depends_on("gmp+cxx") def cmake_args(self): - args = [ - self.define("BUILD_SHARED_LIBS", True), - ] + args = [self.define("BUILD_SHARED_LIBS", True)] return args diff --git a/var/spack/repos/builtin/packages/serenity/package.py b/var/spack/repos/builtin/packages/serenity/package.py index 3327770b92..9b71f9896f 100644 --- a/var/spack/repos/builtin/packages/serenity/package.py +++ b/var/spack/repos/builtin/packages/serenity/package.py @@ -39,7 +39,6 @@ class Serenity(CMakePackage): extends("python", when="+python") def patch(self): - filter_file( "include(CMakeParseArguments)", 'message(FATAL_ERROR "Tried to download a dependency")', diff --git a/var/spack/repos/builtin/packages/serialbox/package.py b/var/spack/repos/builtin/packages/serialbox/package.py index a0f53cad75..def3f21260 100644 --- a/var/spack/repos/builtin/packages/serialbox/package.py +++ b/var/spack/repos/builtin/packages/serialbox/package.py @@ -109,15 +109,8 @@ def libs(self): query2libraries = { tuple(): ["libSerialboxCore"], - ("c", "fortran"): [ - "libSerialboxFortran", - "libSerialboxC", - "libSerialboxCore", - ], - ("c",): [ - "libSerialboxC", - "libSerialboxCore", - ], + ("c", "fortran"): ["libSerialboxFortran", "libSerialboxC", "libSerialboxCore"], + ("c",): ["libSerialboxC", "libSerialboxCore"], ("fortran",): ["libSerialboxFortran", "libSerialboxC", "libSerialboxCore"], } diff --git a/var/spack/repos/builtin/packages/sfcgal/package.py b/var/spack/repos/builtin/packages/sfcgal/package.py index f73c5f4601..59bc6e70c5 100644 --- a/var/spack/repos/builtin/packages/sfcgal/package.py +++ b/var/spack/repos/builtin/packages/sfcgal/package.py @@ -37,7 +37,4 @@ def cmake_args(self): # It seems viewer is discontinued as of v1.3.0 # https://github.com/Oslandia/SFCGAL/releases/tag/v1.3.0 # Also, see https://github.com/Oslandia/SFCGAL-viewer - return [ - self.define("BUILD_SHARED_LIBS", True), - self.define("SFCGAL_BUILD_VIEWER", False), - ] + return [self.define("BUILD_SHARED_LIBS", True), self.define("SFCGAL_BUILD_VIEWER", False)] diff --git a/var/spack/repos/builtin/packages/sfcio/package.py b/var/spack/repos/builtin/packages/sfcio/package.py index 4e8018ab40..60ddd75dab 100644 --- a/var/spack/repos/builtin/packages/sfcio/package.py +++ b/var/spack/repos/builtin/packages/sfcio/package.py @@ -15,12 +15,7 @@ class Sfcio(CMakePackage): homepage = "https://noaa-emc.github.io/NCEPLIBS-sfcio" url = "https://github.com/NOAA-EMC/NCEPLIBS-sfcio/archive/refs/tags/v1.4.1.tar.gz" - maintainers( - "t-brown", - "AlexanderRichert-NOAA", - "Hang-Lei-NOAA", - "edwardhartnett", - ) + maintainers("t-brown", "AlexanderRichert-NOAA", "Hang-Lei-NOAA", "edwardhartnett") version("1.4.1", sha256="d9f900cf18ec1a839b4128c069b1336317ffc682086283443354896746b89c59") diff --git a/var/spack/repos/builtin/packages/shapeit4/package.py b/var/spack/repos/builtin/packages/shapeit4/package.py index b5ebe23d98..7219e844a7 100644 --- a/var/spack/repos/builtin/packages/shapeit4/package.py +++ b/var/spack/repos/builtin/packages/shapeit4/package.py @@ -23,7 +23,6 @@ class Shapeit4(MakefilePackage): depends_on("xz") def edit(self, spec, prefix): - makefile = FileFilter("makefile") makefile.filter("CXX=.*", "CXX = c++") @@ -49,7 +48,6 @@ def edit(self, spec, prefix): ) def install(self, spec, prefix): - install_tree("bin", prefix.bin) install_tree("test", join_path(self.prefix, "test")) install_tree("docs", join_path(self.prefix, "docs")) diff --git a/var/spack/repos/builtin/packages/shellcheck/package.py b/var/spack/repos/builtin/packages/shellcheck/package.py index 17c32c8e85..869c3ab53d 100644 --- a/var/spack/repos/builtin/packages/shellcheck/package.py +++ b/var/spack/repos/builtin/packages/shellcheck/package.py @@ -13,7 +13,7 @@ "linux-aarch64": "179c579ef3481317d130adebede74a34dbbc2df961a70916dd4039ebf0735fae", "linux-armv6hf": "03deed9ded9dd66434ccf9649815bcde7d275d6c9f6dcf665b83391673512c75", "linux-x86_64": "700324c6dd0ebea0117591c6cc9d7350d9c7c5c287acbad7630fa17b1d4d9e2f", - }, + } } diff --git a/var/spack/repos/builtin/packages/sigio/package.py b/var/spack/repos/builtin/packages/sigio/package.py index 8cd8d50be2..241154dde9 100644 --- a/var/spack/repos/builtin/packages/sigio/package.py +++ b/var/spack/repos/builtin/packages/sigio/package.py @@ -15,12 +15,7 @@ class Sigio(CMakePackage): homepage = "https://noaa-emc.github.io/NCEPLIBS-sigio" url = "https://github.com/NOAA-EMC/NCEPLIBS-sigio/archive/refs/tags/v2.3.2.tar.gz" - maintainers( - "t-brown", - "AlexanderRichert-NOAA", - "Hang-Lei-NOAA", - "edwardhartnett", - ) + maintainers("t-brown", "AlexanderRichert-NOAA", "Hang-Lei-NOAA", "edwardhartnett") version("2.3.2", sha256="333f3cf3a97f97103cbafcafc2ad89b24faa55b1332a98adc1637855e8a5b613") diff --git a/var/spack/repos/builtin/packages/silo/package.py b/var/spack/repos/builtin/packages/silo/package.py index d93e723176..23a04f6f09 100644 --- a/var/spack/repos/builtin/packages/silo/package.py +++ b/var/spack/repos/builtin/packages/silo/package.py @@ -190,13 +190,11 @@ def configure_args(self): if is_system_path(zlib_prefix): config_args.append("--with-zlib=yes") else: - config_args.append( - "--with-zlib=%s,%s" % (zlib_prefix.include, zlib_prefix.lib), - ) + config_args.append("--with-zlib=%s,%s" % (zlib_prefix.include, zlib_prefix.lib)) if "+hdf5" in spec: config_args.append( - "--with-hdf5=%s,%s" % (spec["hdf5"].prefix.include, spec["hdf5"].prefix.lib), + "--with-hdf5=%s,%s" % (spec["hdf5"].prefix.include, spec["hdf5"].prefix.lib) ) if "+silex" in spec: diff --git a/var/spack/repos/builtin/packages/simgrid/package.py b/var/spack/repos/builtin/packages/simgrid/package.py index 800af27a0f..c21ef353ab 100644 --- a/var/spack/repos/builtin/packages/simgrid/package.py +++ b/var/spack/repos/builtin/packages/simgrid/package.py @@ -133,7 +133,6 @@ class Simgrid(CMakePackage): ) def setup_dependent_package(self, module, dep_spec): - if self.spec.satisfies("+smpi"): self.spec.smpicc = join_path(self.prefix.bin, "smpicc") self.spec.smpicxx = join_path(self.prefix.bin, "smpicxx") @@ -141,7 +140,6 @@ def setup_dependent_package(self, module, dep_spec): self.spec.smpif77 = join_path(self.prefix.bin, "smpiff") def cmake_args(self): - spec = self.spec args = [] diff --git a/var/spack/repos/builtin/packages/simple-dftd3/package.py b/var/spack/repos/builtin/packages/simple-dftd3/package.py index ad3b08b02b..ce7f0074c9 100644 --- a/var/spack/repos/builtin/packages/simple-dftd3/package.py +++ b/var/spack/repos/builtin/packages/simple-dftd3/package.py @@ -35,7 +35,6 @@ class SimpleDftd3(MesonPackage): extends("python", when="+python") def meson_args(self): - return [ "-Dopenmp={0}".format(str("+openmp" in self.spec).lower()), "-Dpython={0}".format(str("+python" in self.spec).lower()), diff --git a/var/spack/repos/builtin/packages/simplemoc/package.py b/var/spack/repos/builtin/packages/simplemoc/package.py index 8fd4fc4be8..20eaebd995 100644 --- a/var/spack/repos/builtin/packages/simplemoc/package.py +++ b/var/spack/repos/builtin/packages/simplemoc/package.py @@ -28,7 +28,6 @@ class Simplemoc(MakefilePackage): @property def build_targets(self): - targets = [] cflags = "-std=gnu99" diff --git a/var/spack/repos/builtin/packages/sina/package.py b/var/spack/repos/builtin/packages/sina/package.py index 82ffe0b986..87ea4f1485 100644 --- a/var/spack/repos/builtin/packages/sina/package.py +++ b/var/spack/repos/builtin/packages/sina/package.py @@ -14,11 +14,7 @@ class Sina(CachedCMakePackage): homepage = "https://github.com/LLNL/Sina" url = "https://github.com/LLNL/Sina/releases/download/v1.10.0/sina-cpp-1.10.0.tar.gz" - maintainers( - "estebanpauli", - "HaluskaR", - "murray55", - ) + maintainers("estebanpauli", "HaluskaR", "murray55") version("1.11.0", sha256="a080f6583101696a6354940f00646ef892e1b2f8fc3f1b1907ba1c3ade6d4b47") version("1.10.0", sha256="b34379ce8cc5eca5a0f16893053fac75be14c2109d1beed4c6d48e11f9b281c7") diff --git a/var/spack/repos/builtin/packages/slurm/package.py b/var/spack/repos/builtin/packages/slurm/package.py index 629ea969d2..33c88f39d5 100644 --- a/var/spack/repos/builtin/packages/slurm/package.py +++ b/var/spack/repos/builtin/packages/slurm/package.py @@ -168,7 +168,6 @@ def flag_handler(self, name, flags): return (wrapper_flags, None, flags) def configure_args(self): - spec = self.spec args = [ diff --git a/var/spack/repos/builtin/packages/sonlib/package.py b/var/spack/repos/builtin/packages/sonlib/package.py index d6b231c248..a3c268b0fb 100644 --- a/var/spack/repos/builtin/packages/sonlib/package.py +++ b/var/spack/repos/builtin/packages/sonlib/package.py @@ -25,7 +25,6 @@ class Sonlib(MakefilePackage): version("2020-04-01", commit="7ebe2ede05a6ee366d93a7a993db69a99943a68f") def setup_build_environment(self, env): - binpath = os.path.join(self.stage.source_path, "bin") libpath = os.path.join(self.stage.source_path, "lib") @@ -33,7 +32,6 @@ def setup_build_environment(self, env): env.set("LIBDIR", libpath) def build(self, spec, prefix): - binpath = os.path.join(self.stage.source_path, "bin") libpath = os.path.join(self.stage.source_path, "lib") @@ -43,6 +41,5 @@ def build(self, spec, prefix): make() def install(self, spec, prefix): - install_tree("bin", prefix.bin) install_tree("lib", prefix.lib) diff --git a/var/spack/repos/builtin/packages/sp/package.py b/var/spack/repos/builtin/packages/sp/package.py index 1e32a21abf..3751a731d9 100644 --- a/var/spack/repos/builtin/packages/sp/package.py +++ b/var/spack/repos/builtin/packages/sp/package.py @@ -14,12 +14,7 @@ class Sp(CMakePackage): homepage = "https://noaa-emc.github.io/NCEPLIBS-sp" url = "https://github.com/NOAA-EMC/NCEPLIBS-sp/archive/refs/tags/v2.3.3.tar.gz" - maintainers( - "t-brown", - "AlexanderRichert-NOAA", - "edwardhartnett", - "Hang-Lei-NOAA", - ) + maintainers("t-brown", "AlexanderRichert-NOAA", "edwardhartnett", "Hang-Lei-NOAA") version("2.3.3", sha256="c0d465209e599de3c0193e65671e290e9f422f659f1da928505489a3edeab99f") diff --git a/var/spack/repos/builtin/packages/spectrum-mpi/package.py b/var/spack/repos/builtin/packages/spectrum-mpi/package.py index e0ed8642d7..ea5c29d322 100644 --- a/var/spack/repos/builtin/packages/spectrum-mpi/package.py +++ b/var/spack/repos/builtin/packages/spectrum-mpi/package.py @@ -62,7 +62,7 @@ def get_spack_compiler_spec(compilers_found): siblings = os.listdir(dirname) compilers_found = {} for compiler_suite in compiler_suites.values(): - for (compiler_class, compiler_name) in compiler_suite.items(): + for compiler_class, compiler_name in compiler_suite.items(): if compiler_name in siblings: # Get the real name of the compiler full_exe = os.path.join(dirname, compiler_name) diff --git a/var/spack/repos/builtin/packages/spiner/package.py b/var/spack/repos/builtin/packages/spiner/package.py index dd127717c2..74ce0b2ce1 100644 --- a/var/spack/repos/builtin/packages/spiner/package.py +++ b/var/spack/repos/builtin/packages/spiner/package.py @@ -37,11 +37,7 @@ class Spiner(CMakePackage, CudaPackage): # When overriding/overloading varaints, the last variant is always used, except for # "when" clauses. Therefore, call the whens FIRST then the non-whens. # https://spack.readthedocs.io/en/latest/packaging_guide.html#overriding-variants - variant( - "kokkos", - default=False, - description="Enable kokkos", - ) + variant("kokkos", default=False, description="Enable kokkos") variant("openmp", default=False, description="Enable openmp kokkos backend") variant("hdf5", default=False, description="Enable hdf5") diff --git a/var/spack/repos/builtin/packages/sqlcipher/package.py b/var/spack/repos/builtin/packages/sqlcipher/package.py index 524feaae99..501166e190 100644 --- a/var/spack/repos/builtin/packages/sqlcipher/package.py +++ b/var/spack/repos/builtin/packages/sqlcipher/package.py @@ -26,12 +26,7 @@ class Sqlcipher(AutotoolsPackage): version("3.4.2", sha256="69897a5167f34e8a84c7069f1b283aba88cdfa8ec183165c4a5da2c816cfaadb") depends_on("openssl") - depends_on( - "tcl", - type=[ - "build", - ], - ) + depends_on("tcl", type=["build"]) depends_on("zlib") def configure_args(self): diff --git a/var/spack/repos/builtin/packages/starpu/package.py b/var/spack/repos/builtin/packages/starpu/package.py index 44ac7dd94e..1be08ff8aa 100644 --- a/var/spack/repos/builtin/packages/starpu/package.py +++ b/var/spack/repos/builtin/packages/starpu/package.py @@ -104,11 +104,7 @@ def autoreconf(self, spec, prefix): def configure_args(self): spec = self.spec - config_args = [ - "--disable-build-doc", - "--enable-blas-lib=none", - "--disable-mlr", - ] + config_args = ["--disable-build-doc", "--enable-blas-lib=none", "--disable-mlr"] # add missing lib for simgrid static compilation, # already fixed since StarPU 1.2.1 diff --git a/var/spack/repos/builtin/packages/strumpack/package.py b/var/spack/repos/builtin/packages/strumpack/package.py index a1a3d4111b..525a5a46ba 100644 --- a/var/spack/repos/builtin/packages/strumpack/package.py +++ b/var/spack/repos/builtin/packages/strumpack/package.py @@ -131,11 +131,7 @@ def cmake_args(self): "-DCMAKE_Fortran_COMPILER=%s" % spec["mpi"].mpifc, ] ) - args.extend( - [ - self.define_from_variant("STRUMPACK_C_INTERFACE", "c_interface"), - ] - ) + args.extend([self.define_from_variant("STRUMPACK_C_INTERFACE", "c_interface")]) if "+cuda" in spec: args.extend( diff --git a/var/spack/repos/builtin/packages/suite-sparse/package.py b/var/spack/repos/builtin/packages/suite-sparse/package.py index d1eba4d710..8d9a12c466 100644 --- a/var/spack/repos/builtin/packages/suite-sparse/package.py +++ b/var/spack/repos/builtin/packages/suite-sparse/package.py @@ -211,10 +211,7 @@ def install(self, spec, prefix): # Intel TBB in SuiteSparseQR if "+tbb" in spec: - make_args += [ - "SPQR_CONFIG=-DHAVE_TBB", - "TBB=%s" % spec["tbb"].libs.ld_flags, - ] + make_args += ["SPQR_CONFIG=-DHAVE_TBB", "TBB=%s" % spec["tbb"].libs.ld_flags] if "@5.3:" in spec: # Without CMAKE_LIBRARY_PATH defined, the CMake file in the diff --git a/var/spack/repos/builtin/packages/sundials/package.py b/var/spack/repos/builtin/packages/sundials/package.py index 73fd03cd4e..a4a0592386 100644 --- a/var/spack/repos/builtin/packages/sundials/package.py +++ b/var/spack/repos/builtin/packages/sundials/package.py @@ -479,10 +479,7 @@ def cmake_args(self): if "+superlu-mt" in spec: if spec.satisfies("@3:"): args.extend( - [ - define("BLAS_ENABLE", True), - define("BLAS_LIBRARIES", spec["blas"].libs), - ] + [define("BLAS_ENABLE", True), define("BLAS_LIBRARIES", spec["blas"].libs)] ) args.extend( [ diff --git a/var/spack/repos/builtin/packages/superlu-mt/package.py b/var/spack/repos/builtin/packages/superlu-mt/package.py index 4186cf76b4..b27c289a8a 100644 --- a/var/spack/repos/builtin/packages/superlu-mt/package.py +++ b/var/spack/repos/builtin/packages/superlu-mt/package.py @@ -104,11 +104,7 @@ def configure(self, spec): ) if "+int64" in spec: - config.extend( - [ - "CFLAGS += -D_LONGINT", - ] - ) + config.extend(["CFLAGS += -D_LONGINT"]) if "+pic" in spec: config.extend( diff --git a/var/spack/repos/builtin/packages/sysstat/package.py b/var/spack/repos/builtin/packages/sysstat/package.py index 1d4a6e4144..6f242b9c70 100644 --- a/var/spack/repos/builtin/packages/sysstat/package.py +++ b/var/spack/repos/builtin/packages/sysstat/package.py @@ -28,9 +28,6 @@ def setup_build_environment(self, env): env.append_flags("conf_dir", self.spec.prefix.etc.sysconfig) def configure_args(self): - args = [ - "--disable-pcp", - "--disable-file-attr", - ] + args = ["--disable-pcp", "--disable-file-attr"] return args diff --git a/var/spack/repos/builtin/packages/tamaas/package.py b/var/spack/repos/builtin/packages/tamaas/package.py index b5ca305c17..f09c098852 100644 --- a/var/spack/repos/builtin/packages/tamaas/package.py +++ b/var/spack/repos/builtin/packages/tamaas/package.py @@ -74,8 +74,6 @@ def build_args(self, spec, prefix): ] if spec.satisfies("+python"): - args += [ - "PYBIND11_ROOT={}".format(spec["py-pybind11"].prefix), - ] + args += ["PYBIND11_ROOT={}".format(spec["py-pybind11"].prefix)] return args diff --git a/var/spack/repos/builtin/packages/tasmanian/package.py b/var/spack/repos/builtin/packages/tasmanian/package.py index 4607e83c98..02f971b13a 100644 --- a/var/spack/repos/builtin/packages/tasmanian/package.py +++ b/var/spack/repos/builtin/packages/tasmanian/package.py @@ -193,9 +193,7 @@ def test(self): # using the tests copied from /share/Tasmanian/testing cmake_dir = self.test_suite.current_test_cache_dir.testing - options = [ - cmake_dir, - ] + options = [cmake_dir] if "+rocm" in self.spec: options.append( "-DAMDDeviceLibs_DIR=" diff --git a/var/spack/repos/builtin/packages/tau/package.py b/var/spack/repos/builtin/packages/tau/package.py index 6902ce16ef..3e759814ea 100644 --- a/var/spack/repos/builtin/packages/tau/package.py +++ b/var/spack/repos/builtin/packages/tau/package.py @@ -142,7 +142,6 @@ class Tau(Package): filter_compiler_wrappers("Makefile.tau*", relative_root="lib64") def set_compiler_options(self, spec): - useropt = ["-O2 -g", self.rpath_args] ########## diff --git a/var/spack/repos/builtin/packages/texinfo/package.py b/var/spack/repos/builtin/packages/texinfo/package.py index b111c628eb..e9e5e95adc 100644 --- a/var/spack/repos/builtin/packages/texinfo/package.py +++ b/var/spack/repos/builtin/packages/texinfo/package.py @@ -38,10 +38,7 @@ class Texinfo(AutotoolsPackage, GNUMirrorPackage): depends_on("gettext") # sanity check - sanity_check_is_file = [ - join_path("bin", "info"), - join_path("bin", "makeinfo"), - ] + sanity_check_is_file = [join_path("bin", "info"), join_path("bin", "makeinfo")] # Fix unescaped braces in regexps. # Ref: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=898994 diff --git a/var/spack/repos/builtin/packages/texlive/package.py b/var/spack/repos/builtin/packages/texlive/package.py index 0ff3d09da6..138134f202 100644 --- a/var/spack/repos/builtin/packages/texlive/package.py +++ b/var/spack/repos/builtin/packages/texlive/package.py @@ -235,18 +235,9 @@ def determine_version(cls, exe): releases = cls.releases releases.extend( [ - { - "version": "20180414", - "year": "2018", - }, - { - "version": "20170524", - "year": "2017", - }, - { - "version": "20130530", - "year": "2013", - }, + {"version": "20180414", "year": "2018"}, + {"version": "20170524", "year": "2017"}, + {"version": "20130530", "year": "2013"}, ] ) # tex indicates the year only diff --git a/var/spack/repos/builtin/packages/tfel/package.py b/var/spack/repos/builtin/packages/tfel/package.py index d3f461dedd..cfbd22f6dd 100644 --- a/var/spack/repos/builtin/packages/tfel/package.py +++ b/var/spack/repos/builtin/packages/tfel/package.py @@ -133,7 +133,6 @@ class Tfel(CMakePackage): conflicts("%gcc@:7", when="@4:") def cmake_args(self): - args = [] args.append("-DUSE_EXTERNAL_COMPILER_FLAGS=ON") diff --git a/var/spack/repos/builtin/packages/timemory/package.py b/var/spack/repos/builtin/packages/timemory/package.py index b580d09fce..dec4e27cb2 100644 --- a/var/spack/repos/builtin/packages/timemory/package.py +++ b/var/spack/repos/builtin/packages/timemory/package.py @@ -61,15 +61,9 @@ class Timemory(CMakePackage, PythonExtension): variant("vtune", default=False, description="Enable VTune support") variant("upcxx", default=False, description="Enable UPC++ support") variant("gotcha", default=False, description="Enable GOTCHA support") + variant("likwid", default=False, description="Enable LIKWID CPU marker API support (perfmon)") variant( - "likwid", - default=False, - description="Enable LIKWID CPU marker API support (perfmon)", - ) - variant( - "likwid_nvmon", - default=False, - description="Enable LIKWID GPU marker API support (nvmon)", + "likwid_nvmon", default=False, description="Enable LIKWID GPU marker API support (nvmon)" ) variant("caliper", default=False, description="Enable Caliper support") variant("dyninst", default=False, description="Build dynamic instrumentation tools") @@ -172,16 +166,10 @@ class Timemory(CMakePackage, PythonExtension): "but larger memory consumption", ) variant( - "mpip_library", - default=False, - description="Build stand-alone timemory-mpip GOTCHA library", + "mpip_library", default=False, description="Build stand-alone timemory-mpip GOTCHA library" ) variant("ompt", default=False, description=("Enable OpenMP tools support")) - variant( - "ompt_library", - default=False, - description="Build stand-alone timemory-ompt library", - ) + variant("ompt_library", default=False, description="Build stand-alone timemory-ompt library") variant("allinea_map", default=False, description="Enable Allinea ARM-MAP support") variant( "require_packages", @@ -244,25 +232,17 @@ class Timemory(CMakePackage, PythonExtension): msg="+kokkos_build_config requires +tools+kokkos_tools", ) conflicts( - "tls_model=local-dynamic", - when="+python", - msg="+python require tls_model=global-dynamic", + "tls_model=local-dynamic", when="+python", msg="+python require tls_model=global-dynamic" ) conflicts( - "tls_model=initial-exec", - when="+python", - msg="+python require tls_model=global-dynamic", + "tls_model=initial-exec", when="+python", msg="+python require tls_model=global-dynamic" ) conflicts( - "tls_model=local-exec", - when="+python", - msg="+python require tls_model=global-dynamic", + "tls_model=local-exec", when="+python", msg="+python require tls_model=global-dynamic" ) conflicts("+nccl", when="~gotcha", msg="+nccl requires +gotcha") conflicts( - "+nccl", - when="~shared~static", - msg="+nccl requires building shared or static libraries", + "+nccl", when="~shared~static", msg="+nccl requires building shared or static libraries" ) conflicts("+mpip_library", when="~mpi", msg="+mpip_library requires +mpi") conflicts("+mpip_library", when="~gotcha", msg="+mpip_library requires +gotcha") diff --git a/var/spack/repos/builtin/packages/totalview/package.py b/var/spack/repos/builtin/packages/totalview/package.py index 326c8db104..437e9b2466 100644 --- a/var/spack/repos/builtin/packages/totalview/package.py +++ b/var/spack/repos/builtin/packages/totalview/package.py @@ -249,7 +249,6 @@ def install(self, spec, prefix): # Run install script for totalview (which automatically installs memoryscape) with working_dir("./totalview.{0}".format(self.version)): - install_cmd = which("./Install") arg_list.extend(["-install", "totalview"]) # TotalView automatically installs Memoryscape, so no need to add diff --git a/var/spack/repos/builtin/packages/tracy-client/package.py b/var/spack/repos/builtin/packages/tracy-client/package.py index 56b3c84a29..0d3e3e9fe5 100644 --- a/var/spack/repos/builtin/packages/tracy-client/package.py +++ b/var/spack/repos/builtin/packages/tracy-client/package.py @@ -16,20 +16,10 @@ class TracyClient(CMakePackage): version("master", git="https://github.com/wolfpld/tracy.git", branch="master") version("0.9", sha256="93a91544e3d88f3bc4c405bad3dbc916ba951cdaadd5fcec1139af6fa56e6bfc") - version( - "0.8.2", - sha256="4784eddd89c17a5fa030d408392992b3da3c503c872800e9d3746d985cfcc92a", - ) - version( - "0.8.1", - sha256="004992012b2dc879a9f6d143cbf94d7ea30e88135db3ef08951605d214892891", - ) + version("0.8.2", sha256="4784eddd89c17a5fa030d408392992b3da3c503c872800e9d3746d985cfcc92a") + version("0.8.1", sha256="004992012b2dc879a9f6d143cbf94d7ea30e88135db3ef08951605d214892891") - variant( - "shared", - default=True, - description="Build the client library as a shared library", - ) + variant("shared", default=True, description="Build the client library as a shared library") tracy_options = { "enable": (True, "Enable profiling"), @@ -38,10 +28,7 @@ class TracyClient(CMakePackage): "no_callstack": (False, "Disable all callstack related functionality"), "no_callstack_inlines": (False, "Disables the inline functions in callstacks"), "only_localhost": (False, "Only listen on the localhost interface"), - "no_broadcast": ( - False, - "Disable client discovery by broadcast to local network", - ), + "no_broadcast": (False, "Disable client discovery by broadcast to local network"), "only_ipv4": ( False, "Tracy will only accept connections on IPv4 addresses (disable IPv6)", @@ -61,10 +48,7 @@ class TracyClient(CMakePackage): False, "Enable delayed initialization of the library (init on first call)", ), - "manual_lifetime": ( - False, - "Enable the manual lifetime management of the profile", - ), + "manual_lifetime": (False, "Enable the manual lifetime management of the profile"), "fibers": (False, "Enable fibers support"), "no_crash_handler": (False, "Disable crash handling"), "timer_fallback": (False, "Use lower resolution timers"), diff --git a/var/spack/repos/builtin/packages/tracy/package.py b/var/spack/repos/builtin/packages/tracy/package.py index 4246dc966b..572e5d879b 100644 --- a/var/spack/repos/builtin/packages/tracy/package.py +++ b/var/spack/repos/builtin/packages/tracy/package.py @@ -16,14 +16,8 @@ class Tracy(MakefilePackage): version("master", git="https://github.com/wolfpld/tracy.git", branch="master") version("0.9", sha256="93a91544e3d88f3bc4c405bad3dbc916ba951cdaadd5fcec1139af6fa56e6bfc") - version( - "0.8.2", - sha256="4784eddd89c17a5fa030d408392992b3da3c503c872800e9d3746d985cfcc92a", - ) - version( - "0.8.1", - sha256="004992012b2dc879a9f6d143cbf94d7ea30e88135db3ef08951605d214892891", - ) + version("0.8.2", sha256="4784eddd89c17a5fa030d408392992b3da3c503c872800e9d3746d985cfcc92a") + version("0.8.1", sha256="004992012b2dc879a9f6d143cbf94d7ea30e88135db3ef08951605d214892891") depends_on("capstone") depends_on("dbus") @@ -41,11 +35,5 @@ def build(self, spec, prefix): def install(self, spec, prefix): mkdir(prefix.bin) - install( - join_path(self.build_directory, "capture/build/unix/capture-release"), - prefix.bin, - ) - install( - join_path(self.build_directory, "profiler/build/unix/Tracy-release"), - prefix.bin, - ) + install(join_path(self.build_directory, "capture/build/unix/capture-release"), prefix.bin) + install(join_path(self.build_directory, "profiler/build/unix/Tracy-release"), prefix.bin) diff --git a/var/spack/repos/builtin/packages/trexio/package.py b/var/spack/repos/builtin/packages/trexio/package.py index bf63932b89..0909a2be97 100644 --- a/var/spack/repos/builtin/packages/trexio/package.py +++ b/var/spack/repos/builtin/packages/trexio/package.py @@ -36,7 +36,6 @@ class Trexio(AutotoolsPackage): # Append -lhdf5_hl to LIBS when hdf5 variant is activated # or use --without-hdf5 option otherwise. def configure_args(self): - config_args = [] if "+hdf5" in self.spec: config_args.append("LIBS=-lhdf5_hl") diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index 2e4213b1f4..dd3ddac5ab 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -722,9 +722,7 @@ def define_tpl(trilinos_name, spack_name, have_dep): libs = depspec.libs try: options.extend( - [ - define(trilinos_name + "_INCLUDE_DIRS", depspec.headers.directories), - ] + [define(trilinos_name + "_INCLUDE_DIRS", depspec.headers.directories)] ) except NoHeadersError: # Handle case were depspec does not have headers @@ -813,11 +811,7 @@ def define_tpl(trilinos_name, spack_name, have_dep): ) if spec.satisfies("^superlu-dist@4.0:"): - options.extend( - [ - define("HAVE_SUPERLUDIST_LUSTRUCTINIT_2ARG", True), - ] - ) + options.extend([define("HAVE_SUPERLUDIST_LUSTRUCTINIT_2ARG", True)]) if spec.satisfies("^parallel-netcdf"): options.extend( @@ -841,10 +835,7 @@ def define_tpl(trilinos_name, spack_name, have_dep): float_s = spec.variants["float"].value options.extend( - [ - define("Teuchos_ENABLE_COMPLEX", complex_s), - define("Teuchos_ENABLE_FLOAT", float_s), - ] + [define("Teuchos_ENABLE_COMPLEX", complex_s), define("Teuchos_ENABLE_FLOAT", float_s)] ) if "+tpetra +explicit_template_instantiation" in spec: diff --git a/var/spack/repos/builtin/packages/ufs-utils/package.py b/var/spack/repos/builtin/packages/ufs-utils/package.py index 2a6d01b9bf..4102250132 100644 --- a/var/spack/repos/builtin/packages/ufs-utils/package.py +++ b/var/spack/repos/builtin/packages/ufs-utils/package.py @@ -15,12 +15,7 @@ class UfsUtils(CMakePackage): homepage = "https://noaa-emcufs-utils.readthedocs.io/en/latest/" url = "https://github.com/NOAA-EMC/UFS_UTILS/archive/refs/tags/ufs_utils_1_6_0.tar.gz" - maintainers( - "t-brown", - "edwardhartnett", - "AlexanderRichert-NOAA", - "Hang-Lei-NOAA", - ) + maintainers("t-brown", "edwardhartnett", "AlexanderRichert-NOAA", "Hang-Lei-NOAA") version("1_6_0", sha256="829ba4b50162e4202f96ec92a65b9fa824f71db65d2b63b70822db07d061cd92") diff --git a/var/spack/repos/builtin/packages/unuran/package.py b/var/spack/repos/builtin/packages/unuran/package.py index 58d80219e7..cf8f705161 100644 --- a/var/spack/repos/builtin/packages/unuran/package.py +++ b/var/spack/repos/builtin/packages/unuran/package.py @@ -30,7 +30,6 @@ class Unuran(AutotoolsPackage): depends_on("rngstreams", when="+rngstreams") def configure_args(self): - spec = self.spec args = [ diff --git a/var/spack/repos/builtin/packages/vasp/package.py b/var/spack/repos/builtin/packages/vasp/package.py index f58df54d11..aa70138c80 100644 --- a/var/spack/repos/builtin/packages/vasp/package.py +++ b/var/spack/repos/builtin/packages/vasp/package.py @@ -66,7 +66,6 @@ class Vasp(MakefilePackage): parallel = False def edit(self, spec, prefix): - if "%gcc" in spec: if "+openmp" in spec: make_include = join_path("arch", "makefile.include.linux_gnu_omp") diff --git a/var/spack/repos/builtin/packages/vecgeom/package.py b/var/spack/repos/builtin/packages/vecgeom/package.py index c19159c9e9..890ae3aa0d 100644 --- a/var/spack/repos/builtin/packages/vecgeom/package.py +++ b/var/spack/repos/builtin/packages/vecgeom/package.py @@ -140,11 +140,6 @@ def cmake_args(self): ) if spec.satisfies("@:0.5.2"): - args.extend( - [ - define("USOLIDS", True), - define("USOLIDS_VECGEOM", True), - ] - ) + args.extend([define("USOLIDS", True), define("USOLIDS_VECGEOM", True)]) return args diff --git a/var/spack/repos/builtin/packages/viennarna/package.py b/var/spack/repos/builtin/packages/viennarna/package.py index cc793a619b..9091afc9d9 100644 --- a/var/spack/repos/builtin/packages/viennarna/package.py +++ b/var/spack/repos/builtin/packages/viennarna/package.py @@ -35,7 +35,6 @@ def url_for_version(self, version): return url.format(version.up_to(2).underscored, version) def configure_args(self): - args = self.enable_or_disable("sse") args += self.with_or_without("python") args += self.with_or_without("perl") diff --git a/var/spack/repos/builtin/packages/vtk/package.py b/var/spack/repos/builtin/packages/vtk/package.py index f4dd565094..f44e0645d5 100644 --- a/var/spack/repos/builtin/packages/vtk/package.py +++ b/var/spack/repos/builtin/packages/vtk/package.py @@ -209,10 +209,7 @@ def cmake_args(self): # spack-built versions whenever possible but there are exceptions. if spec.satisfies("@:8"): cmake_args.extend( - [ - "-DVTK_USE_SYSTEM_LIBRARIES:BOOL=ON", - "-DVTK_USE_SYSTEM_LIBHARU=OFF", - ] + ["-DVTK_USE_SYSTEM_LIBRARIES:BOOL=ON", "-DVTK_USE_SYSTEM_LIBHARU=OFF"] ) if spec.satisfies("@:8.0"): cmake_args.append("-DVTK_USE_SYSTEM_GL2PS=OFF") diff --git a/var/spack/repos/builtin/packages/w3emc/package.py b/var/spack/repos/builtin/packages/w3emc/package.py index 935632afea..ac613a1f44 100644 --- a/var/spack/repos/builtin/packages/w3emc/package.py +++ b/var/spack/repos/builtin/packages/w3emc/package.py @@ -15,12 +15,7 @@ class W3emc(CMakePackage): homepage = "https://noaa-emc.github.io/NCEPLIBS-w3emc/" url = "https://github.com/NOAA-EMC/NCEPLIBS-w3emc/archive/refs/tags/v2.9.0.tar.gz" - maintainers( - "t-brown", - "AlexanderRichert-NOAA", - "Hang-Lei-NOAA", - "edwardhartnett", - ) + maintainers("t-brown", "AlexanderRichert-NOAA", "Hang-Lei-NOAA", "edwardhartnett") version("2.9.3", sha256="9ca1b08dd13dfbad4a955257ae0cf38d2e300ccd8d983606212bc982370a29bc") version("2.9.2", sha256="eace811a1365f69b85fdf2bcd93a9d963ba72de5a7111e6fa7c0e6578b69bfbc") diff --git a/var/spack/repos/builtin/packages/w3nco/package.py b/var/spack/repos/builtin/packages/w3nco/package.py index 13e9137c58..8be3d33488 100644 --- a/var/spack/repos/builtin/packages/w3nco/package.py +++ b/var/spack/repos/builtin/packages/w3nco/package.py @@ -16,11 +16,6 @@ class W3nco(CMakePackage): homepage = "https://noaa-emc.github.io/NCEPLIBS/NCEPLIBS-w3nco/" url = "https://github.com/NOAA-EMC/NCEPLIBS-w3nco/archive/refs/tags/v2.4.1.tar.gz" - maintainers( - "t-brown", - "AlexanderRichert-NOAA", - "Hang-Lei-NOAA", - "edwardhartnett", - ) + maintainers("t-brown", "AlexanderRichert-NOAA", "Hang-Lei-NOAA", "edwardhartnett") version("2.4.1", sha256="48b06e0ea21d3d0fd5d5c4e7eb50b081402567c1bff6c4abf4fd4f3669070139") diff --git a/var/spack/repos/builtin/packages/wannier90/package.py b/var/spack/repos/builtin/packages/wannier90/package.py index c98fbd8de6..a354f7a2f1 100644 --- a/var/spack/repos/builtin/packages/wannier90/package.py +++ b/var/spack/repos/builtin/packages/wannier90/package.py @@ -63,7 +63,6 @@ def makefile_name(self): return abspath def edit(self, spec, prefix): - lapack = self.spec["lapack"].libs blas = self.spec["blas"].libs mpi = self.spec["mpi"].libs @@ -81,9 +80,7 @@ def edit(self, spec, prefix): filter_file(key, value, self.makefile_name) if self.spec.satisfies("%gcc@10:"): - fflags = [ - "-fallow-argument-mismatch", - ] + fflags = ["-fallow-argument-mismatch"] filter_file(r"(^FCOPTS=.*)", r"\1 {0}".format(" ".join(fflags)), self.makefile_name) if "@:2 +shared" in self.spec: diff --git a/var/spack/repos/builtin/packages/wget/package.py b/var/spack/repos/builtin/packages/wget/package.py index 27e79db810..1f1784ff1a 100644 --- a/var/spack/repos/builtin/packages/wget/package.py +++ b/var/spack/repos/builtin/packages/wget/package.py @@ -57,10 +57,7 @@ class Wget(AutotoolsPackage, GNUMirrorPackage): def configure_args(self): spec = self.spec - args = [ - "--with-ssl={0}".format(spec.variants["ssl"].value), - "--without-included-regex", - ] + args = ["--with-ssl={0}".format(spec.variants["ssl"].value), "--without-included-regex"] if "+zlib" in spec: args.append("--with-zlib") diff --git a/var/spack/repos/builtin/packages/wgrib2/package.py b/var/spack/repos/builtin/packages/wgrib2/package.py index 34a552ffc3..4cd400c992 100644 --- a/var/spack/repos/builtin/packages/wgrib2/package.py +++ b/var/spack/repos/builtin/packages/wgrib2/package.py @@ -15,12 +15,7 @@ class Wgrib2(MakefilePackage): homepage = "https://www.cpc.ncep.noaa.gov/products/wesley/wgrib2" url = "https://www.ftp.cpc.ncep.noaa.gov/wd51we/wgrib2/wgrib2.tgz.v2.0.8" - maintainers( - "t-brown", - "AlexanderRichert-NOAA", - "Hang-Lei-NOAA", - "edwardhartnett", - ) + maintainers("t-brown", "AlexanderRichert-NOAA", "Hang-Lei-NOAA", "edwardhartnett") version( "3.1.1", @@ -155,7 +150,6 @@ def edit(self, spec, prefix): makefile.filter(r"^%s=.*" % makefile_option, "{}={}".format(makefile_option, value)) def setup_build_environment(self, env): - if self.spec.compiler.name in "intel": comp_sys = "intel_linux" elif self.spec.compiler.name in ["gcc", "clang", "apple-clang"]: @@ -164,7 +158,6 @@ def setup_build_environment(self, env): env.set("COMP_SYS", comp_sys) def build(self, spec, prefix): - # Get source files for netCDF4 builds if self.spec.satisfies("+netcdf4"): with working_dir(self.build_directory): diff --git a/var/spack/repos/builtin/packages/wrf-io/package.py b/var/spack/repos/builtin/packages/wrf-io/package.py index bb238f862f..71e85be873 100644 --- a/var/spack/repos/builtin/packages/wrf-io/package.py +++ b/var/spack/repos/builtin/packages/wrf-io/package.py @@ -16,12 +16,7 @@ class WrfIo(CMakePackage): homepage = "https://noaa-emc.github.io/NCEPLIBS-wrf_io" url = "https://github.com/NOAA-EMC/NCEPLIBS-wrf_io/archive/refs/tags/v1.2.0.tar.gz" - maintainers( - "t-brown", - "AlexanderRichert-NOAA", - "Hang-Lei-NOAA", - "edwardhartnett", - ) + maintainers("t-brown", "AlexanderRichert-NOAA", "Hang-Lei-NOAA", "edwardhartnett") version("1.2.0", sha256="000cf5294a2c68460085258186e1f36c86d3d0d9c433aa969a0f92736b745617") diff --git a/var/spack/repos/builtin/packages/wrf/package.py b/var/spack/repos/builtin/packages/wrf/package.py index 1cf811dcb9..f197d9b956 100644 --- a/var/spack/repos/builtin/packages/wrf/package.py +++ b/var/spack/repos/builtin/packages/wrf/package.py @@ -93,11 +93,7 @@ class Wrf(Package): url="https://github.com/wrf-model/WRF/archive/V3.9.1.1.tar.gz", ) - variant( - "build_type", - default="dmpar", - values=("serial", "smpar", "dmpar", "dm+sm"), - ) + variant("build_type", default="dmpar", values=("serial", "smpar", "dmpar", "dm+sm")) variant( "nesting", default="basic", @@ -121,11 +117,7 @@ class Wrf(Package): "em_scm_xy", ), ) - variant( - "pnetcdf", - default=True, - description="Parallel IO support through Pnetcdf library", - ) + variant("pnetcdf", default=True, description="Parallel IO support through Pnetcdf library") variant("chem", default=False, description="Enable WRF-Chem", when="@4:") variant("netcdf_classic", default=False, description="Use NetCDF without HDF5 compression") @@ -255,7 +247,6 @@ def patch(self): filter_file("^#!/bin/csh", "#!/usr/bin/env csh", *files) def answer_configure_question(self, outputbuf): - # Platform options question: if "Please select from among the following" in outputbuf: options = collect_platform_options(outputbuf) @@ -323,7 +314,6 @@ def do_configure_fixup(self): config.filter("^DM_CC.*mpicc", "DM_CC = {0}".format(self.spec["mpi"].mpicc)) def configure(self, spec, prefix): - # Remove broken default options... self.do_configure_fixup() @@ -403,7 +393,6 @@ def run_compile_script(self): return False def build(self, spec, prefix): - result = self.run_compile_script() if not result: diff --git a/var/spack/repos/builtin/packages/xsbench/package.py b/var/spack/repos/builtin/packages/xsbench/package.py index 4ef593e4a2..4e152807cc 100644 --- a/var/spack/repos/builtin/packages/xsbench/package.py +++ b/var/spack/repos/builtin/packages/xsbench/package.py @@ -46,7 +46,6 @@ def build_directory(self): @property def build_targets(self): - targets = [] cflags = "" diff --git a/var/spack/repos/builtin/packages/xyce/package.py b/var/spack/repos/builtin/packages/xyce/package.py index cdcc489834..51062dc8f3 100644 --- a/var/spack/repos/builtin/packages/xyce/package.py +++ b/var/spack/repos/builtin/packages/xyce/package.py @@ -105,7 +105,6 @@ class Xyce(CMakePackage): # Issue #1712 forces explicitly enumerating blas packages to propagate variants with when("+pymi_static_tpls"): - # BLAS depends_on("openblas~shared", when="^openblas") depends_on("netlib-lapack~shared", when="^netlib-lapack~external-blas") diff --git a/var/spack/repos/builtin/packages/yambo/package.py b/var/spack/repos/builtin/packages/yambo/package.py index d84ee743da..95a61ca46e 100644 --- a/var/spack/repos/builtin/packages/yambo/package.py +++ b/var/spack/repos/builtin/packages/yambo/package.py @@ -87,7 +87,6 @@ def enable_or_disable_openmp(self, activated): return "--enable-open-mp" if activated else "--disable-open-mp" def configure_args(self): - args = [ # As of version 4.2.1 there are hard-coded paths that make # the build process fail if the target prefix is not the diff --git a/var/spack/repos/builtin/packages/zoltan/package.py b/var/spack/repos/builtin/packages/zoltan/package.py index 9af9503b48..98322f8078 100644 --- a/var/spack/repos/builtin/packages/zoltan/package.py +++ b/var/spack/repos/builtin/packages/zoltan/package.py @@ -88,10 +88,7 @@ def configure_args(self): self.get_config_flag("f90interface", "fortran"), self.get_config_flag("mpi", "mpi"), ] - config_cflags = [ - "-O0" if "+debug" in spec else "-O3", - "-g" if "+debug" in spec else "", - ] + config_cflags = ["-O0" if "+debug" in spec else "-O3", "-g" if "+debug" in spec else ""] config_ldflags = [] # PGI runtime libraries diff --git a/var/spack/repos/tutorial/packages/hdf5/package.py b/var/spack/repos/tutorial/packages/hdf5/package.py index dd9192a9ca..0fceeef891 100644 --- a/var/spack/repos/tutorial/packages/hdf5/package.py +++ b/var/spack/repos/tutorial/packages/hdf5/package.py @@ -284,11 +284,7 @@ def libs(self): "libhdf5_java", "libhdf5", ], - ("cxx", "hl"): [ - "libhdf5_hl_cpp", - "libhdf5_hl", - "libhdf5", - ], + ("cxx", "hl"): ["libhdf5_hl_cpp", "libhdf5_hl", "libhdf5"], ("fortran", "hl"): [ "libhdf5_hl_fortran", "libhdf5_hl_f90cstub", @@ -297,29 +293,11 @@ def libs(self): "libhdf5_f90cstub", "libhdf5", ], - ("hl",): [ - "libhdf5_hl", - "libhdf5", - ], - ("cxx", "fortran"): [ - "libhdf5_fortran", - "libhdf5_f90cstub", - "libhdf5_cpp", - "libhdf5", - ], - ("cxx",): [ - "libhdf5_cpp", - "libhdf5", - ], - ("fortran",): [ - "libhdf5_fortran", - "libhdf5_f90cstub", - "libhdf5", - ], - ("java",): [ - "libhdf5_java", - "libhdf5", - ], + ("hl",): ["libhdf5_hl", "libhdf5"], + ("cxx", "fortran"): ["libhdf5_fortran", "libhdf5_f90cstub", "libhdf5_cpp", "libhdf5"], + ("cxx",): ["libhdf5_cpp", "libhdf5"], + ("fortran",): ["libhdf5_fortran", "libhdf5_f90cstub", "libhdf5"], + ("java",): ["libhdf5_java", "libhdf5"], } # Turn the query into the appropriate key diff --git a/var/spack/repos/tutorial/packages/netlib-lapack/package.py b/var/spack/repos/tutorial/packages/netlib-lapack/package.py index 471382047b..ff98d722e3 100644 --- a/var/spack/repos/tutorial/packages/netlib-lapack/package.py +++ b/var/spack/repos/tutorial/packages/netlib-lapack/package.py @@ -88,16 +88,9 @@ def blas_libs(self): query_parameters = self.spec.last_query.extra_parameters query2libraries = { tuple(): ["libblas"], - ("c", "fortran"): [ - "libcblas", - "libblas", - ], - ("c",): [ - "libcblas", - ], - ("fortran",): [ - "libblas", - ], + ("c", "fortran"): ["libcblas", "libblas"], + ("c",): ["libcblas"], + ("fortran",): ["libblas"], } key = tuple(sorted(query_parameters)) libraries = query2libraries[key]