Skip to content
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

Jump to bottom

fix: correct cmd to get python version for pipenv projects #244

Merged
merged 1 commit into from
Jul 30, 2024
Merged

fix: correct cmd to get python version for pipenv projects #244

Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions lib/dependencies/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ export async function getDependencies(
options = {};
}
let command = options.command || 'python';
const pythonCmd = command;
const includeDevDeps = !!(options.dev || false);

// handle poetry projects by parsing manifest & lockfile and return a dep-graph
Expand All @@ -51,6 +52,7 @@ export async function getDependencies(
getMetaData(command, baseargs, root, targetFile),
inspectInstalledDeps(
command,
pythonCmd,
baseargs,
root,
targetFile,
Expand Down
3 changes: 2 additions & 1 deletion lib/dependencies/inspect-implementation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@ async function updateSetuptools(

export async function inspectInstalledDeps(
command: string,
pythonCmd: string,
baseargs: string[],
root: string,
targetFile: string,
Expand All @@ -261,7 +262,7 @@ export async function inspectInstalledDeps(
UPDATED_SETUPTOOLS_VERSION,
root,
pythonEnv,
command
pythonCmd
);

// See ../../pysrc/README.md
Expand Down
49 changes: 46 additions & 3 deletions test/system/inspect.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ describe('inspect', () => {
{
pkg: {
name: 'jaraco.collections',
version: '5.0.0',
version: '5.0.1',
},
directDeps: ['irc'],
},
Expand Down Expand Up @@ -163,7 +163,7 @@ describe('inspect', () => {
{
pkg: {
name: 's3transfer',
version: '0.10.0',
version: '0.10.2',
},
directDeps: ['awss'],
},
Expand Down Expand Up @@ -205,7 +205,7 @@ describe('inspect', () => {
{
pkg: {
name: 'jsonschema',
version: '4.21.1',
version: '4.23.0',
},
directDeps: ['openapi-spec-validator'],
},
Expand Down Expand Up @@ -451,6 +451,49 @@ describe('inspect', () => {
});
});

describe('when testing pipenv projects simulating pipenv install', () => {
let tearDown;

afterAll(() => {
tearDown();
});

it.each([
{
workspace: 'pipfile-pipapp-pinned',
targetFile: undefined,
},
{
workspace: 'pipenv-app',
targetFile: undefined,
},
])(
'should get a valid dependency graph for workspace = $workspace',
async ({ workspace, targetFile }) => {
testUtils.chdirWorkspaces(workspace);
testUtils.ensureVirtualenv(workspace);
tearDown = testUtils.activateVirtualenv(workspace);
testUtils.pipenvInstall();
testUtils.chdirWorkspaces(workspace);
const result = await inspect(
'.',
targetFile ? targetFile : FILENAMES.pipenv.manifest
);

const expected = [
{
pkg: {
name: 'markupsafe',
version: '2.1.5',
},
directDeps: ['jinja2'],
},
];
compareTransitiveLines(result.dependencyGraph, expected);
}
);
});

describe('when generating Pipfile depGraphs ', () => {
let tearDown;
beforeAll(() => {
Expand Down
14 changes: 14 additions & 0 deletions test/test-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export {
deactivateVirtualenv,
ensureVirtualenv,
pipInstall,
pipenvInstall,
pipUninstall,
setupPyInstall,
};
Expand Down Expand Up @@ -141,6 +142,19 @@ function pipInstall() {
}
}

function pipenvInstall() {
const proc = subProcess.executeSync('pipenv', ['install']);

if (proc.status !== 0) {
console.log('' + proc.stderr);
throw new Error(
'Failed to install requirements with pipenv.' +
' venv = ' +
JSON.stringify(getActiveVenvName())
);
}
}

function setupPyInstall() {
const proc = subProcess.executeSync('python3', ['setup.py', 'install']);
if (proc.status !== 0) {
Expand Down