Skip to content

Commit 1164e86

Browse files
authored
Revert "feat(OSM-2442): upgrade parser for poetry v2 support" (#262)
* Revert "feat(OSM-2442): upgrade parser for poetry v2 support (#260)" This reverts commit 23da360. * feat: upgrade lockfile parser
1 parent d6fe74b commit 1164e86

File tree

8 files changed

+1
-979
lines changed

8 files changed

+1
-979
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"@snyk/cli-interface": "^2.11.2",
2828
"@snyk/dep-graph": "^1.28.1",
2929
"shescape": "1.6.1",
30-
"snyk-poetry-lockfile-parser": "1.8.0",
30+
"snyk-poetry-lockfile-parser": "^1.8.1",
3131
"tmp": "0.2.3"
3232
},
3333
"devDependencies": {

test/fixtures/poetry-v2-project/poetry.lock

Lines changed: 0 additions & 106 deletions
This file was deleted.

test/fixtures/poetry-v2-project/pyproject.toml

Lines changed: 0 additions & 16 deletions
This file was deleted.

test/system/inspect.spec.ts

Lines changed: 0 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -834,42 +834,6 @@ describe('inspect', () => {
834834

835835
expect(result.dependencyGraph.equals(expected)).toBeTruthy();
836836
});
837-
it('should return expected dependencies for poetry-v2-app', async () => {
838-
const workspace = 'poetry-v2-app';
839-
testUtils.chdirWorkspaces(workspace);
840-
841-
const result = await inspect('.', FILENAMES.poetry.lockfile);
842-
expect(result).toMatchObject({
843-
plugin: {
844-
name: 'snyk-python-plugin',
845-
runtime: expect.any(String), // any version of Python
846-
targetFile: FILENAMES.poetry.manifest,
847-
},
848-
package: null, // no dep-tree
849-
dependencyGraph: {}, // match any dep-graph (equality checked below)
850-
});
851-
852-
const builder = new DepGraphBuilder(
853-
{ name: 'poetry' },
854-
{ name: 'poetry-fixtures-project', version: '0.1.0' }
855-
);
856-
const expected = builder
857-
.addPkgNode({ name: 'jinja2', version: '3.1.5' }, 'jinja2', {
858-
labels: { scope: 'prod' },
859-
})
860-
.connectDep(builder.rootNodeId, 'jinja2')
861-
.addPkgNode({ name: 'markupsafe', version: '3.0.2' }, 'markupsafe', {
862-
labels: { scope: 'prod', pkgIdProvenance: '[email protected]' },
863-
})
864-
.connectDep('jinja2', 'markupsafe')
865-
.addPkgNode({ name: 'isodd', version: '0.1.2' }, 'isodd', {
866-
labels: { scope: 'prod', pkgIdProvenance: '[email protected]' },
867-
})
868-
.connectDep(builder.rootNodeId, 'isodd')
869-
.build();
870-
871-
expect(result.dependencyGraph.equals(expected)).toBeTruthy();
872-
});
873837

874838
it('should return expected dependencies for poetry-optional-dependencies', async () => {
875839
const workspace = 'poetry-app-optional-dependencies';
@@ -889,25 +853,6 @@ describe('inspect', () => {
889853

890854
compareTransitiveLines(result.dependencyGraph, expected);
891855
});
892-
893-
it('should return expected dependencies for poetry-v2-app-optional-dependencies', async () => {
894-
const workspace = 'poetry-v2-app-optional-dependencies';
895-
testUtils.chdirWorkspaces(workspace);
896-
897-
const result = await inspect('.', FILENAMES.poetry.lockfile);
898-
899-
const expected = [
900-
{
901-
pkg: {
902-
name: 'opentelemetry-distro',
903-
version: '0.35b0',
904-
},
905-
directDeps: ['opentelemetry-distro'],
906-
},
907-
];
908-
909-
compareTransitiveLines(result.dependencyGraph, expected);
910-
});
911856
});
912857

913858
it('should return correct target file for poetry project when relative path to poetry lock file is passed', async () => {
@@ -920,16 +865,6 @@ describe('inspect', () => {
920865
expect(result.plugin.targetFile).toEqual(expectedTargetFile);
921866
});
922867

923-
it('should return correct target file for poetry v2 project when relative path to poetry lock file is passed', async () => {
924-
const dirname = 'test/fixtures/poetry-v2-project';
925-
const manifestFilePath = `${dirname}/poetry.lock`;
926-
927-
const result = await inspect('.', manifestFilePath);
928-
929-
const expectedTargetFile = `${dirname}/pyproject.toml`;
930-
expect(result.plugin.targetFile).toEqual(expectedTargetFile);
931-
});
932-
933868
describe('Pipfile projects', () => {
934869
const mockedExecuteSync = jest.spyOn(subProcess, 'executeSync');
935870
const mockedExecute = jest.spyOn(subProcess, 'execute');

0 commit comments

Comments
 (0)