From 11d71ca85e1724f2bac1e9d7d366e3b8097add0d Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Mon, 27 Jun 2022 18:15:25 +0200 Subject: Rename os_facts.lp to os_compatibility.lp (#31206) Follow-up from #31170 --- lib/spack/spack/solver/asp.py | 2 +- lib/spack/spack/solver/os_compatibility.lp | 22 ++++++++++++++++++++++ lib/spack/spack/solver/os_facts.lp | 22 ---------------------- 3 files changed, 23 insertions(+), 23 deletions(-) create mode 100644 lib/spack/spack/solver/os_compatibility.lp delete mode 100644 lib/spack/spack/solver/os_facts.lp (limited to 'lib') diff --git a/lib/spack/spack/solver/asp.py b/lib/spack/spack/solver/asp.py index bb05fb599e..38c03008e2 100644 --- a/lib/spack/spack/solver/asp.py +++ b/lib/spack/spack/solver/asp.py @@ -631,7 +631,7 @@ class PyclingoDriver(object): # Load the file itself self.control.load(os.path.join(parent_dir, 'concretize.lp')) - self.control.load(os.path.join(parent_dir, "os_facts.lp")) + self.control.load(os.path.join(parent_dir, "os_compatibility.lp")) self.control.load(os.path.join(parent_dir, "display.lp")) timer.phase("load") diff --git a/lib/spack/spack/solver/os_compatibility.lp b/lib/spack/spack/solver/os_compatibility.lp new file mode 100644 index 0000000000..e3d322b8f6 --- /dev/null +++ b/lib/spack/spack/solver/os_compatibility.lp @@ -0,0 +1,22 @@ +% Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +% Spack Project Developers. See the top-level COPYRIGHT file for details. +% +% SPDX-License-Identifier: (Apache-2.0 OR MIT) + +% OS compatibility rules for reusing solves. +% os_compatible(RecentOS, OlderOS) +% OlderOS binaries can be used on RecentOS + +% macOS +os_compatible("monterey", "bigsur"). +os_compatible("bigsur", "catalina"). + +% Ubuntu +os_compatible("ubuntu22.04", "ubuntu21.10"). +os_compatible("ubuntu21.10", "ubuntu21.04"). +os_compatible("ubuntu21.04", "ubuntu20.10"). +os_compatible("ubuntu20.10", "ubuntu20.04"). +os_compatible("ubuntu20.04", "ubuntu19.10"). +os_compatible("ubuntu19.10", "ubuntu19.04"). +os_compatible("ubuntu19.04", "ubuntu18.10"). +os_compatible("ubuntu18.10", "ubuntu18.04"). diff --git a/lib/spack/spack/solver/os_facts.lp b/lib/spack/spack/solver/os_facts.lp deleted file mode 100644 index e3d322b8f6..0000000000 --- a/lib/spack/spack/solver/os_facts.lp +++ /dev/null @@ -1,22 +0,0 @@ -% Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -% Spack Project Developers. See the top-level COPYRIGHT file for details. -% -% SPDX-License-Identifier: (Apache-2.0 OR MIT) - -% OS compatibility rules for reusing solves. -% os_compatible(RecentOS, OlderOS) -% OlderOS binaries can be used on RecentOS - -% macOS -os_compatible("monterey", "bigsur"). -os_compatible("bigsur", "catalina"). - -% Ubuntu -os_compatible("ubuntu22.04", "ubuntu21.10"). -os_compatible("ubuntu21.10", "ubuntu21.04"). -os_compatible("ubuntu21.04", "ubuntu20.10"). -os_compatible("ubuntu20.10", "ubuntu20.04"). -os_compatible("ubuntu20.04", "ubuntu19.10"). -os_compatible("ubuntu19.10", "ubuntu19.04"). -os_compatible("ubuntu19.04", "ubuntu18.10"). -os_compatible("ubuntu18.10", "ubuntu18.04"). -- cgit v1.2.3-70-g09d2