Skip to content

chore: use bin path instead of env dir #180

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.

Sign up for GitHub

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

Draft
flying-sheep wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

chore: use bin path instead of env dir #180

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 8 additions & 5 deletions src/hatch-env-manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { homedir } from 'node:os'
import paths from 'node:path'
import {
EventEmitter,
Expand Down Expand Up @@ -344,7 +345,7 @@ export class HatchEnvManager implements EnvironmentManager {
}

#hatch2pythonEnv(
executable: string,
hatchBin: string,
{ name, path, conf, projectPath }: HatchEnvInfo,
): HatchEnvironment {
const shellActivation: Map<string, PythonCommandRunConfiguration[]> =
Expand All @@ -353,21 +354,23 @@ export class HatchEnvManager implements EnvironmentManager {
new Map()

shellActivation.set('unknown', [
{ executable, args: [`--env=${name}`, 'shell'] },
{ executable: hatchBin, args: [`--env=${name}`, 'shell'] },
])
shellDeactivation.set('unknown', [{ executable: 'exit' }])

const pyBin = envBin(path, 'python')

const envInfo: PythonEnvironmentInfo = {
name,
description: conf.description,
displayName: name,
displayPath: path,
displayPath: path.replace(homedir(), '~'),
tooltip: path,
environmentPath: Uri.file(path),
environmentPath: Uri.file(pyBin),
sysPrefix: path,
version: '1', // TODO
execInfo: {
run: { executable: envBin(path, 'python') },
run: { executable: pyBin },
shellActivation,
shellDeactivation,
},
Expand Down