From 4a429ec315266d50da3032f02cdbbe8fc2cc73ef Mon Sep 17 00:00:00 2001
From: Nicholas Sly <nicholas.sly@gmail.com>
Date: Tue, 6 Dec 2022 09:28:00 -0800
Subject: mercurial/py-pybind11: print_string no longer exists (#34340)
* Fix mercurial print_str failure.
* Perform same fix on py-pybind11 for print_string missing method.
Co-authored-by: Nicholas Cameron Sly <sly1@llnl.gov>
---
var/spack/repos/builtin/packages/mercurial/package.py | 3 +--
var/spack/repos/builtin/packages/py-pybind11/package.py | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
(limited to 'var')
diff --git a/var/spack/repos/builtin/packages/mercurial/package.py b/var/spack/repos/builtin/packages/mercurial/package.py
index a32e2d190d..748c546b85 100644
--- a/var/spack/repos/builtin/packages/mercurial/package.py
+++ b/var/spack/repos/builtin/packages/mercurial/package.py
@@ -69,8 +69,7 @@ class Mercurial(PythonPackage):
hgrc_filename = etc_dir.hgrc
# Use certifi to find the location of the CA certificate
- print_str = self.spec["python"].package.print_string("certifi.where()")
- certificate = python("-c", "import certifi; " + print_str, output=str)
+ certificate = python("-c", "import certifi; print(certifi.where())", output=str)
if not certificate:
tty.warn(
diff --git a/var/spack/repos/builtin/packages/py-pybind11/package.py b/var/spack/repos/builtin/packages/py-pybind11/package.py
index 1ebc198bf6..5e80f0d61c 100644
--- a/var/spack/repos/builtin/packages/py-pybind11/package.py
+++ b/var/spack/repos/builtin/packages/py-pybind11/package.py
@@ -105,8 +105,7 @@ class CMakeBuilder(spack.build_systems.cmake.CMakeBuilder):
python = self.spec["python"].command
py_inc = python(
"-c",
- "import pybind11 as py; "
- + self.spec["python"].package.print_string("py.get_include()"),
+ "import pybind11 as py; print(py.get_include())",
output=str,
).strip()
for inc in [py_inc, self.prefix.include]:
--
cgit v1.2.3-70-g09d2