Skip to content

Commit afd4d03

Browse files
Rename dependency attribute is_resolved
Renaming the dependency attribute is_resolved to is_pinned to more accurately represent this attribute accurately. This is more relevant after the changes in aboutcode-org/scancode.io#1066 Reference: aboutcode-org/scancode.io#1066 Signed-off-by: Ayan Sinha Mahapatra <[email protected]>
1 parent 2b09be1 commit afd4d03

File tree

734 files changed

+13254
-13254
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

734 files changed

+13254
-13254
lines changed

docs/source/cli-reference/basic-options.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@
175175
"scope": "dependencies",
176176
"is_runtime": true,
177177
"is_optional": false,
178-
"is_resolved": false,
178+
"is_pinned": false,
179179
"resolved_package": {},
180180
"extra_data": {},
181181
"dependency_uid": "pkg:bower/get-size?uuid=fixed-uid-done-for-testing-5642512d1758",
@@ -341,7 +341,7 @@
341341
"scope": "dependencies",
342342
"is_runtime": true,
343343
"is_optional": false,
344-
"is_resolved": false,
344+
"is_pinned": false,
345345
"resolved_package": {},
346346
"extra_data": {}
347347
}

etc/scripts/sch2js/doc/DependentPackage-json-schema.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
}
6464
]
6565
},
66-
"is_resolved": {
66+
"is_pinned": {
6767
"oneOf": [
6868
{
6969
"type": "boolean",

etc/scripts/sch2js/doc/Package-json-schema.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@
455455
}
456456
]
457457
},
458-
"is_resolved": {
458+
"is_pinned": {
459459
"oneOf": [
460460
{
461461
"type": "boolean",

src/formattedcode/output_cyclonedx.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ def from_package(cls, package, components_by_purl):
519519
for dependency in package.get('dependencies', []):
520520
dpurl = dependency['purl']
521521

522-
if dependency['is_resolved']:
522+
if dependency['is_pinned']:
523523
dependencies_by_dependent[purl].add(dpurl)
524524
else:
525525
existing = components_by_purl.get(dpurl)

src/packagedcode/alpine.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,7 @@ def parse_apkbuild_text(text, datasource_id, package_type, strict=False, package
754754
variables, errors = get_apkbuild_variables(text=text)
755755
unresolved = [
756756
v for v in variables
757-
if not v.is_resolved()
757+
if not v.is_pinned()
758758
and v.name in ESSENTIAL_APKBUILD_VARIABLES
759759
]
760760

@@ -1014,7 +1014,7 @@ def D_dependencies_handler(value, dependencies=None, **kwargs):
10141014

10151015
requirement = None
10161016
version = None
1017-
is_resolved = False
1017+
is_pinned = False
10181018
segments = split_name_and_requirement(dep)
10191019
if len(segments) == 1:
10201020
# we have no requirement...just a plain name
@@ -1027,7 +1027,7 @@ def D_dependencies_handler(value, dependencies=None, **kwargs):
10271027
operator = ''.join(sorted(operator))
10281028
if operator == '=':
10291029
version = ver
1030-
is_resolved = True
1030+
is_pinned = True
10311031

10321032
requirement = operator + ver
10331033

@@ -1042,7 +1042,7 @@ def D_dependencies_handler(value, dependencies=None, **kwargs):
10421042
purl=purl,
10431043
scope=scope,
10441044
extracted_requirement=requirement,
1045-
is_resolved=is_resolved,
1045+
is_pinned=is_pinned,
10461046
)
10471047
if dependency not in dependencies:
10481048
dependencies.append(dependency.to_dict())

src/packagedcode/bashparse.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ class ShellVariable:
144144
value = attr.ib()
145145
is_array = attr.ib(default=False, repr=False)
146146

147-
def is_resolved(self):
147+
def is_pinned(self):
148148
"""
149149
Return True if this variable is fully resolved and does not need further
150150
shell expansion.
@@ -243,15 +243,15 @@ def reportable(v):
243243
for var in variables:
244244

245245
if not environment:
246-
if reportable(var) and not var.is_resolved():
246+
if reportable(var) and not var.is_pinned():
247247
errors.append(f'Unresolvable first variable: {var}')
248248

249249
if not var.is_array:
250250
# we do not know how to expand an array
251251
environment[var.name] = var.value
252252
continue
253253

254-
if var.is_resolved():
254+
if var.is_pinned():
255255
if not var.is_array:
256256
# we do not know how to expand an array
257257
environment[var.name] = var.value
@@ -282,7 +282,7 @@ def reportable(v):
282282
# we do not know how to expand an array
283283
environment[var.name] = expanded
284284

285-
if reportable(var) and not var.is_resolved():
285+
if reportable(var) and not var.is_pinned():
286286
errors.append(
287287
f'Partially resolved variable: {var} envt: '
288288
f'{environment}'

src/packagedcode/build_gradle.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ def build_package(cls, dependencies, package_only=False):
360360
extracted_requirement=version,
361361
is_runtime=is_runtime,
362362
is_optional=is_optional,
363-
is_resolved=bool(version),
363+
is_pinned=bool(version),
364364
)
365365
)
366366

src/packagedcode/cargo.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ def parse(cls, location, package_only=False):
299299
scope='dependencies',
300300
is_runtime=True,
301301
is_optional=False,
302-
is_resolved=True,
302+
is_pinned=True,
303303
)
304304
)
305305

@@ -346,7 +346,7 @@ def dependency_mapper(dependencies, scope='dependencies'):
346346
scope=scope,
347347
is_runtime=is_runtime,
348348
is_optional=is_optional,
349-
is_resolved=False,
349+
is_pinned=False,
350350
extra_data=extra_data,
351351
)
352352

src/packagedcode/cocoapods.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ def get_pods_dependency_with_resolved_package(
345345
extracted_requirement=xreq,
346346
is_runtime=False,
347347
is_optional=True,
348-
is_resolved=True,
348+
is_pinned=True,
349349
is_direct=is_direct,
350350
resolved_package=resolved_package,
351351
)
@@ -377,7 +377,7 @@ def get_dependencies_for_resolved_package(cls, dependency_data, dep_pods):
377377
extracted_requirement=dep_xreq,
378378
is_runtime=False,
379379
is_optional=True,
380-
is_resolved=True,
380+
is_pinned=True,
381381
is_direct=True,
382382
).to_dict()
383383
dependencies_for_resolved.append(dependency_for_resolved)

src/packagedcode/conan.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -282,9 +282,9 @@ def get_dependencies(requires):
282282
dependent_packages = []
283283
for req in requires:
284284
name, constraint = req.split("/", 1)
285-
is_resolved = is_constraint_resolved(constraint)
285+
is_pinned = is_constraint_resolved(constraint)
286286
version = None
287-
if is_resolved:
287+
if is_pinned:
288288
version = constraint
289289
purl = PackageURL(type="conan", name=name, version=version)
290290
dependent_packages.append(
@@ -293,7 +293,7 @@ def get_dependencies(requires):
293293
scope="install",
294294
is_runtime=True,
295295
is_optional=False,
296-
is_resolved=is_resolved,
296+
is_pinned=is_pinned,
297297
extracted_requirement=constraint,
298298
)
299299
)

0 commit comments

Comments
 (0)