From 1987242c735657e8978196df314c429ddaa8ae1b Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <thomas@kluyver.me.uk>
Date: Wed, 20 Apr 2022 13:53:06 +0100
Subject: [PATCH] Use absolute path to Python executable
---
src/xfel_calibrate/repeat.py | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/xfel_calibrate/repeat.py b/src/xfel_calibrate/repeat.py
index 564968826..91ed3e5c8 100644
--- a/src/xfel_calibrate/repeat.py
+++ b/src/xfel_calibrate/repeat.py
@@ -38,17 +38,18 @@ def get_python(args, py_version):
env_mgr = EnvsManager(
Path(args.env_cache), PyenvEnvMaker()
)
- return env_mgr.get_env(py_version, reqs) / 'bin' / 'python'
+ return env_mgr.get_env(py_version, reqs).resolve() / 'bin' / 'python'
elif args.python:
- return args.python
- return sys.executable
+ return args.python.resolve()
+ return Path(sys.executable)
def main(argv=None):
ap = argparse.ArgumentParser()
ap.add_argument("from_dir", type=Path, help="A directory containing steps.json")
env_args = ap.add_mutually_exclusive_group()
- env_args.add_argument("--python", help="Path to Python executable to run notebooks")
+ env_args.add_argument("--python", type=Path,
+ help="Path to Python executable to run notebooks")
env_args.add_argument(
"--env-cache",
help="Make/reuse a virtualenv in this cache directory with the Python "
--
GitLab