Skip to content

Merge environment and compare environments #14026

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
Karthik Nadig (karthiknadig) merged 10 commits into from
Sep 28, 2020
Merged

Merge environment and compare environments #14026

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0047176
Add some heuristic functions
karthiknadig Sep 21, 2020
89d7b82
Support merging.
karthiknadig Sep 21, 2020
7d60921
Clean up identifier code
karthiknadig Sep 22, 2020
e1f5d65
Tweaks and fixes
karthiknadig Sep 22, 2020
a4f8a9d
More clean up.
karthiknadig Sep 22, 2020
a4392e5
versions tweak
karthiknadig Sep 24, 2020
6a3838f
Address comments
karthiknadig Sep 25, 2020
4cdfcb0
more comments
karthiknadig Sep 28, 2020
e40f8de
Fix merge issues.
karthiknadig Sep 28, 2020
ecae324
Fix more merge issues.
karthiknadig Sep 28, 2020
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
Next Next commit
more comments
  • Loading branch information
@karthiknadig
karthiknadig committed Sep 28, 2020
commit 4cdfcb01a598f6f8f4afa5791de71d178ae6fa62
16 changes: 14 additions & 2 deletions src/client/pythonEnvironments/base/info/env.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,22 @@ import { Architecture } from '../../../common/utils/platform';
import { arePathsSame } from '../../common/externalDependencies';
import { areEqualVersions, areEquivalentVersions } from './pythonVersion';

/**
* Checks if two environments are same.
* @param {string | PythonEnvInfo} left: environment to compare.
* @param {string | PythonEnvInfo} right: environment to compare.
* @param {boolean} allowPartialMatch: allow partial matches of properties when comparing.
*
* Remarks: The current comparison assumes that if the path to the executables are the same
* then it is the same environment. Additionally, if the paths are not same but executables
* are in the same directory and the version of python is the same than we can assume it
* to be same environment. This later case is needed for comparing windows store python,
* where multiple versions of python executables are all put in the same directory.
*/
export function areSameEnvironment(
left: string | PythonEnvInfo,
right: string | PythonEnvInfo,
allowPartialMatch?:boolean,
allowPartialMatch?: boolean,
): boolean {
const leftFilename = typeof left === 'string' ? left : left.executable.filename;
const rightFilename = typeof right === 'string' ? right : right.executable.filename;
Expand Down Expand Up @@ -88,7 +100,7 @@ function getFileInfoHeuristic(file:FileInfo): number {
infoLevel += 2; // W1
}

if (file.ctime || file.mtime) {
if (file.ctime) {
infoLevel += 1; // W0
}
Comment thread
karthiknadig marked this conversation as resolved.

Expand Down
8 changes: 1 addition & 7 deletions src/client/pythonEnvironments/base/info/pythonVersion.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,7 @@ export function parseVersion(versionStr: string): PythonVersion {
* @returns {boolean}
*/
export function areEqualVersions(left: PythonVersion, right:PythonVersion): boolean {
return (
left.major === right.major
&& left.minor === right.minor
&& left.micro === right.micro
&& left.release.level === right.release.level
&& left.release.serial === right.release.serial
);
return left === right;
}

/**
Expand Down