Skip to content
This repository has been archived by the owner on Dec 23, 2021. It is now read-only.

Commit

Permalink
dependency fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
andreamah committed Apr 17, 2020
1 parent 8ad93f6 commit d701e8d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 9 deletions.
6 changes: 1 addition & 5 deletions src/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,6 @@ export const CONSTANTS = {
"error.noProgramFoundDebug",
"Cannot find a program to debug."
),
NO_PIP: localize(
"error.noPip",
"We found that you don't have Pip installed on your computer, please install it and try again."
),
NO_PYTHON_PATH: localize(
"error.noPythonPath",
"We found that you don't have Python 3 installed on your computer, please install the latest version, add it to your PATH and try again."
Expand Down Expand Up @@ -533,7 +529,7 @@ export const STATUS_BAR_PRIORITY = {
};

export const VERSIONS = {
MIN_PY_VERSION: "3.7.0",
MIN_PY_VERSION: "Python 3.7.0",
};

export const HELPER_FILES = {
Expand Down
2 changes: 1 addition & 1 deletion src/install_dependencies.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import pathlib
import os

os.chdir(pathlib.Path(__file__).parent.parent.absolute())
os.chdir(str(pathlib.Path(__file__).parent.parent.absolute()))
subprocess.check_call(
[sys.executable, "-m", "pip", "install", "-r", "./out/requirements.txt"]
)
6 changes: 3 additions & 3 deletions src/service/setupService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -304,15 +304,15 @@ export class SetupService {

public isPipInstalled = async (pythonExecutablePath: string) => {
try {
const { stdout } = await this.executePythonCommand(
await this.executePythonCommand(
pythonExecutablePath,
" -m pip"
);
return true;
} catch (err) {
vscode.window
.showErrorMessage(
`We found that you may not Pip installed on your interpreter at ${pythonExecutablePath}, please install it and try again.`,
`We found that you may not have Pip installed on your interpreter at ${pythonExecutablePath}, please install it and try again.`,
DialogResponses.INSTALL_PIP
)
.then((selection: vscode.MessageItem | undefined) => {
Expand Down Expand Up @@ -447,7 +447,7 @@ export class SetupService {
);
vscode.window
.showErrorMessage(
`Virtual environment for download could not be completed. Using original interpreter at: ${pythonExecutable}.`,
`Virtual environment for download could not be completed. Using original interpreter at: ${pythonExecutable}. If you're on Linux, try running "sudo apt-get install python3-venv".`,
DialogResponses.READ_INSTALL_MD
)
.then((selection: vscode.MessageItem | undefined) => {
Expand Down

0 comments on commit d701e8d

Please sign in to comment.