Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Create lib64 symlink for 64-bit, non-macOS, POSIX environments #3584

Merged
merged 3 commits into from
May 14, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Revert test changes
  • Loading branch information
charliermarsh committed May 14, 2024
commit 62a3cb0cfa78883fe3b755e4b1871b3813289f1a
2 changes: 1 addition & 1 deletion crates/uv-interpreter/python/get_interpreter_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,7 @@ def main() -> None:
"gil_disabled": bool(sysconfig.get_config_var("Py_GIL_DISABLED")),
# Determine if the interpreter is 32-bit or 64-bit.
# https://github.com/python/cpython/blob/b228655c227b2ca298a8ffac44d14ce3d22f6faa/Lib/venv/__init__.py#L136
"pointer_size": "64" if sys.maxsize > 2 ** 32 else "32",
"pointer_size": "64" if sys.maxsize > 2**32 else "32",
}
print(json.dumps(interpreter_info))

Expand Down
5 changes: 0 additions & 5 deletions crates/uv-interpreter/src/environment.rs
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,6 @@ impl PythonEnvironment {
} else {
let purelib = self.interpreter.purelib();
let platlib = self.interpreter.platlib();

println!("purelib: {:?}", purelib);
println!("platlib: {:?}", platlib);
println!("is_same_file(purelib, platlib): {:?}", is_same_file(purelib, platlib));

Either::Right(std::iter::once(purelib).chain(
if purelib == platlib || is_same_file(purelib, platlib).unwrap_or(false) {
None
Expand Down
1 change: 1 addition & 0 deletions crates/uv-interpreter/src/interpreter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -672,6 +672,7 @@ mod tests {
"purelib": "lib/python3.12/site-packages",
"scripts": "bin"
},
"pointer_size": "64",
"gil_disabled": true
}
"##};
Expand Down
Loading