@appland/appmap 3.50.3 → 3.50.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
# [@appland/appmap-v3.50.4](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.50.3...@appland/appmap-v3.50.4) (2022-11-21)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* replace python with python3, use -m ([9f09a94](https://github.com/getappmap/appmap-js/commit/9f09a9498da655d3ec64791efe906c44f607eef8))
|
|
7
|
+
|
|
1
8
|
# [@appland/appmap-v3.50.3](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.50.2...@appland/appmap-v3.50.3) (2022-11-18)
|
|
2
9
|
|
|
3
10
|
|
|
@@ -30,8 +30,8 @@ class PythonInstaller extends agentInstaller_1.default {
|
|
|
30
30
|
async environment() {
|
|
31
31
|
// Python version is returned as a string similar to:
|
|
32
32
|
// Python 3.7.0
|
|
33
|
-
const version = await (0, commandUtil_1.getOutput)('
|
|
34
|
-
const pythonPath = await (0, commandUtil_1.getOutput)('
|
|
33
|
+
const version = await (0, commandUtil_1.getOutput)('python3', ['--version'], this.path);
|
|
34
|
+
const pythonPath = await (0, commandUtil_1.getOutput)('python3', ['-c', 'import sys; print(sys.prefix)'], this.path);
|
|
35
35
|
return {
|
|
36
36
|
'Python version': version.ok ? version.output.split(/\s/)[1] : chalk_1.default.red(version.output),
|
|
37
37
|
'Python package directory': pythonPath.ok ? pythonPath.output : chalk_1.default.red(pythonPath.output),
|
|
@@ -123,10 +123,10 @@ class PipInstaller extends PythonInstaller {
|
|
|
123
123
|
return (0, utils_1.exists)(this.buildFilePath);
|
|
124
124
|
}
|
|
125
125
|
async checkConfigCommand() {
|
|
126
|
-
let commandArgs = ['install', '-r', this.buildFile];
|
|
126
|
+
let commandArgs = ['-m', 'pip', 'install', '-r', this.buildFile];
|
|
127
127
|
let supportsDryRun;
|
|
128
128
|
try {
|
|
129
|
-
const pipVersionOutput = await (0, commandUtil_1.getOutput)('
|
|
129
|
+
const pipVersionOutput = await (0, commandUtil_1.getOutput)('python3', ['-m', 'pip', '--version'], this.path);
|
|
130
130
|
const pipVersion = semver_1.default.coerce(pipVersionOutput.output);
|
|
131
131
|
if (!pipVersion) {
|
|
132
132
|
throw new errors_1.UserConfigError('Could not detect pip version');
|
|
@@ -139,7 +139,7 @@ class PipInstaller extends PythonInstaller {
|
|
|
139
139
|
if (supportsDryRun) {
|
|
140
140
|
commandArgs.push('--dry-run');
|
|
141
141
|
}
|
|
142
|
-
return new commandStruct_1.default('
|
|
142
|
+
return new commandStruct_1.default('python3', commandArgs, this.path);
|
|
143
143
|
}
|
|
144
144
|
async installAgent() {
|
|
145
145
|
const encodedFile = new encodedFile_1.default(this.buildFilePath);
|
|
@@ -155,11 +155,11 @@ class PipInstaller extends PythonInstaller {
|
|
|
155
155
|
requirements = PKG_DEPENDENCY + os_1.default.EOL + requirements;
|
|
156
156
|
}
|
|
157
157
|
encodedFile.write(requirements);
|
|
158
|
-
const cmd = new commandStruct_1.default('
|
|
158
|
+
const cmd = new commandStruct_1.default('python3', ['-m', 'pip', 'install', '-r', this.buildFile], this.path);
|
|
159
159
|
await (0, commandRunner_1.run)(cmd);
|
|
160
160
|
}
|
|
161
161
|
async initCommand() {
|
|
162
|
-
return new commandStruct_1.default('
|
|
162
|
+
return new commandStruct_1.default('python3', ['-m', 'appmap.command.appmap_agent_init'], this.path);
|
|
163
163
|
}
|
|
164
164
|
async verifyCommand() {
|
|
165
165
|
return undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pythonAgentInstaller.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/pythonAgentInstaller.ts"],"names":[],"mappings":";;;;;;AAAA,2CAA2C;AAC3C,yCAAyC;AACzC,kDAA0B;AAC1B,4CAAoB;AACpB,+BAA4B;AAC5B,oDAA4B;AAC5B,oEAA4C;AAC5C,uCAAqC;AACrC,sCAA4C;AAC5C,sEAA8C;AAC9C,mDAAsC;AACtC,oEAA4C;AAC5C,+CAA0C;AAE1C,MAAM,oBAAoB,GAAG,0BAA0B,CAAC;AACxD,8CAA8C;AAC9C,MAAM,cAAc,GAAG,oBAAoB,CAAC;AAE5C,MAAe,eAAgB,SAAQ,wBAAc;IACnD,YAAY,IAAY,EAAE,IAAY;QACpC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACpB,CAAC;IAED,IAAI,aAAa;QACf,OAAO,kDAAkD,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,WAAW;QACf,qDAAqD;QACrD,eAAe;QACf,MAAM,OAAO,GAAG,MAAM,IAAA,uBAAS,EAAC,
|
|
1
|
+
{"version":3,"file":"pythonAgentInstaller.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/pythonAgentInstaller.ts"],"names":[],"mappings":"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"}
|