Skip to content

Cherry-pick Pipfile detection fix for 2018.2.1 #1002

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

Merged
merged 2 commits into from
Mar 9, 2018
Merged

Cherry-pick Pipfile detection fix for 2018.2.1 #1002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06470be
Detect pipenv by looking for Pipfile, not pipfile (#994)
wjt Mar 9, 2018
1bd76fa
Prep for 2018.2.1
brettcannon Mar 9, 2018
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
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## 2018.2.1 (09 Mar 2018)

### Fixes

1. Check for `Pipfile` and not `pipfile` when looking for pipenv usage
(thanks to [Will Thompson for the fix](https://github.com/wjt))

## 2018.2.0 (08 Mar 2018)

[Release pushed by one week]
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "python",
"displayName": "Python",
"description": "Linting, Debugging (multi-threaded, remote), Intellisense, code formatting, refactoring, unit tests, snippets, and more.",
"version": "2018.2.0",
"version": "2018.2.1",
"publisher": "ms-python",
"author": {
"name": "Microsoft Corporation"
Expand Down
2 changes: 1 addition & 1 deletion src/client/interpreter/locators/services/pipEnvService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ export class PipEnvService extends CacheableLocatorService {

private async getInterpreterPathFromPipenv(cwd: string): Promise<string | undefined> {
// Quick check before actually running pipenv
if (!await this.fs.fileExistsAsync(path.join(cwd, 'pipfile'))) {
if (!await this.fs.fileExistsAsync(path.join(cwd, 'Pipfile'))) {
return;
}
const venvFolder = await this.invokePipenv('--venv', cwd);
Expand Down