Skip to content

Commit 05b9b7f

Browse files
Rename dependency is_resolved to is_pinned (#3888)
* 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 <ayansmahapatra@gmail.com>
1 parent 9b3cf12 commit 05b9b7f

File tree

748 files changed

+13358
-13342
lines changed

Some content is hidden

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

748 files changed

+13358
-13342
lines changed

CHANGELOG.rst

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,20 @@ v33.0.0 (next next, roadmap)
3737
of these in other summary plugins.
3838
See https://github.com/nexB/scancode-toolkit/issues/1745
3939

40+
Major API/other changes:
41+
42+
- Output Format Version updated to 4.0.0 (major version bump)
43+
- Dependency attribute rename: ``is_resolved`` renamed to ``is_pinned``
44+
See https://github.com/nexB/scancode-toolkit/pull/3888 for more details.
45+
46+
Changes in Output Data Structure:
47+
48+
- The data structure of the JSON output has changed for
49+
dependencies at file level package_data, and at top-level.
50+
Note that the change is a modification to the JSON output,
51+
so we have a major version bump ``3.2.0`` to ``4.0.0``:
52+
53+
- Dependency attribute ``is_resolved`` renamed to ``is_pinned``
4054
- Update link references of ownership from nexB to aboutcode-org
4155
See https://github.com/aboutcode-org/scancode-toolkit/issues/3885
4256

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,8 @@
175175
"scope": "dependencies",
176176
"is_runtime": true,
177177
"is_optional": false,
178-
"is_resolved": false,
178+
"is_pinned": false,
179+
"is_direct": true,
179180
"resolved_package": {},
180181
"extra_data": {},
181182
"dependency_uid": "pkg:bower/get-size?uuid=fixed-uid-done-for-testing-5642512d1758",
@@ -341,7 +342,8 @@
341342
"scope": "dependencies",
342343
"is_runtime": true,
343344
"is_optional": false,
344-
"is_resolved": false,
345+
"is_pinned": false,
346+
"is_direct": true,
345347
"resolved_package": {},
346348
"extra_data": {}
347349
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,12 @@
6363
}
6464
]
6565
},
66-
"is_resolved": {
66+
"is_pinned": {
6767
"oneOf": [
6868
{
6969
"type": "boolean",
70-
"title": "is resolved flag",
71-
"description": "True if this dependency version requirement has been resolved and this dependency url points to an exact version."
70+
"title": "is pinned flag",
71+
"description": "True if this dependency version requirement has been pinned and this dependency points to an exact version."
7272
},
7373
{
7474
"type": "null"

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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -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/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: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -270,9 +270,9 @@ def assemble(
270270
yield resource
271271

272272

273-
def is_constraint_resolved(constraint):
273+
def is_constraint_pinned(constraint):
274274
"""
275-
Checks if a constraint is resolved and it specifies an exact version.
275+
Checks if a constraint is pinned and it specifies an exact version.
276276
"""
277277
range_characters = {">", "<", "[", "]", ">=", "<="}
278278
return not any(char in range_characters for char in constraint)
@@ -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_pinned(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)