Skip to content

Commit

Permalink
Merge pull request #207 from snyk/fix/setup-py-another-setuptools-import
Browse files Browse the repository at this point in the history
fix: support another kind of setuptools import
  • Loading branch information
admons authored May 8, 2023
2 parents 7bb0a7e + ba14e84 commit 3266372
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 1 deletion.
2 changes: 1 addition & 1 deletion pysrc/setup_file.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def _save_passed_args(**kwargs):

distutils.core.setup = _save_passed_args
setuptools.setup = _save_passed_args
setup_py_content = setup_py_content.replace("setup(", "passed_arguments = setup(")
setup_py_content = re.sub(r"(setuptools\.)?setup\(", r"passed_arguments = \g<0>", setup_py_content)

# Fetch the arguments that were passed to the setup.py
exec(setup_py_content, globals())
Expand Down
18 changes: 18 additions & 0 deletions test/unit/setup_file.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import path = require('path');
import { executeSync } from '../../lib/dependencies/sub-process';

describe('Test setup_file.py', () => {
it.each`
setupPyContent
${'import setuptools;setuptools.setup(name="test")'}
${'from setuptools import setup;setup(name="test")'}
`("parse works for '$setupPyContent'", ({ setupPyContent }) => {
const result = executeSync(
'python',
['-c', `from setup_file import parse; parse('${setupPyContent}')`],
{ cwd: path.resolve(__dirname, '../../pysrc') }
);

expect(result.status).toBe(0);
});
});

0 comments on commit 3266372

Please sign in to comment.