Skip to content

Commit e6f4419

Browse files
committed
temporarly rollback is_bundled support
Signed-off-by: uttam282005 <uttam282005@gmail.com>
1 parent cdd76f1 commit e6f4419

4 files changed

Lines changed: 3 additions & 363 deletions

File tree

src/packagedcode/npm.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -690,7 +690,6 @@ def parse(cls, location, package_only=False):
690690
is_dev = dep_data.get('dev', False)
691691
is_optional = dep_data.get('optional', False)
692692
is_devoptional = dep_data.get('devOptional', False)
693-
is_bundled = dep_data.get('bundled', False)
694693
if is_dev or is_devoptional:
695694
is_runtime = False
696695
is_optional = True
@@ -719,9 +718,7 @@ def parse(cls, location, package_only=False):
719718
version_string = dep_data.get('version')
720719
version_info = parse_npm_version(version_string)
721720

722-
extra_data = {
723-
'is_bundled': is_bundled
724-
}
721+
extra_data = {}
725722
if version_info['type'] != "semver":
726723
extra_data['version_type'] = version_info['type'],
727724
extra_data['url'] = version_info['url']
@@ -743,8 +740,9 @@ def parse(cls, location, package_only=False):
743740
is_optional=is_optional,
744741
is_pinned=True,
745742
is_direct=False,
746-
extra_data=extra_data
747743
)
744+
if extra_data:
745+
dependency.extra_data = extra_data
748746

749747
# URLs and checksums
750748
misc = get_urls(ns, name, version)

tests/packagedcode/data/npm/package-lock-bundled/package-lock.json

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

tests/packagedcode/data/npm/package-lock-bundled/package-lock.json-expected

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

tests/packagedcode/test_npm.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -289,12 +289,6 @@ def test_parse_package_lock_v2_alias(self):
289289
packages = npm.NpmPackageLockJsonHandler.parse(test_file)
290290
self.check_packages_data(packages, expected_loc, regen=REGEN_TEST_FIXTURES)
291291

292-
def test_parse_package_lock_with_bundled_dependencies(self):
293-
test_file = self.get_test_loc('npm/package-lock-bundled/package-lock.json')
294-
expected_loc = self.get_test_loc('npm/package-lock-bundled/package-lock.json-expected')
295-
packages = npm.NpmPackageLockJsonHandler.parse(test_file)
296-
self.check_packages_data(packages, expected_loc, regen=REGEN_TEST_FIXTURES)
297-
298292
def test_parse_package_lock_with_git_sources(self):
299293
test_file = self.get_test_loc('npm/package-lock-git/package-lock.json')
300294
expected_loc = self.get_test_loc('npm/package-lock-git/package-lock.json-expected')

0 commit comments

Comments
 (0)