Skip to content

Commit f60f6c2

Browse files
committed
Add has_single_resource to Project #436 #447
* Increase field sizes in DiscoveredDependency Signed-off-by: Jono Yang <[email protected]>
1 parent 8963d7f commit f60f6c2

File tree

3 files changed

+34
-3
lines changed

3 files changed

+34
-3
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Generated by Django 4.0.6 on 2022-07-21 19:32
2+
3+
from django.db import migrations, models
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
('scanpipe', '0019_codebaseresource_package_data_discovereddependency'),
10+
]
11+
12+
operations = [
13+
migrations.AlterField(
14+
model_name='discovereddependency',
15+
name='extracted_requirement',
16+
field=models.CharField(help_text='The version requirements of this dependency.', max_length=64),
17+
),
18+
migrations.AlterField(
19+
model_name='discovereddependency',
20+
name='scope',
21+
field=models.CharField(help_text='The scope of this dependency, how it is used in a project.', max_length=64),
22+
),
23+
]

scanpipe/models.py

+10-2
Original file line numberDiff line numberDiff line change
@@ -853,6 +853,14 @@ def error_count(self):
853853
"""
854854
return self.projecterrors.count()
855855

856+
@property
857+
def has_single_resource(self):
858+
"""
859+
Return True if we only have a single CodebaseResource associated to this
860+
project, False otherwise.
861+
"""
862+
return self.codebaseresources.count() == 1
863+
856864

857865
class ProjectRelatedQuerySet(models.QuerySet):
858866
def project(self, project):
@@ -1919,13 +1927,13 @@ class DiscoveredDependency(
19191927
),
19201928
)
19211929
extracted_requirement = models.CharField(
1922-
max_length=32,
1930+
max_length=64,
19231931
help_text=_(
19241932
"The version requirements of this dependency."
19251933
),
19261934
)
19271935
scope = models.CharField(
1928-
max_length=32,
1936+
max_length=64,
19291937
help_text=_(
19301938
"The scope of this dependency, how it is used in a project."
19311939
),

scanpipe/pipes/scancode.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ def assemble_packages(project):
371371
items = handler.assemble(
372372
package_data=package_data,
373373
resource=resource,
374-
codebase=None,
374+
codebase=project,
375375
)
376376

377377
for item in items:

0 commit comments

Comments
 (0)