Update dependencies #224

Signed-off-by: Jono Yang <[email protected]>

matchcode_pipeline/api.py

@@ -15,6 +15,7 @@
 from rest_framework.decorators import action
 
 from scanpipe.api import ExcludeFromListViewMixin
+from scanpipe.api.serializers import InputSourceSerializer
 from scanpipe.api.serializers import SerializerExcludeFieldsMixin
 from scanpipe.api.serializers import StrListField
 from scanpipe.api.views import ProjectFilterSet
@@ -65,7 +66,11 @@ class MatchingSerializer(ExcludeFromListViewMixin, serializers.ModelSerializer):
     )
     webhook_url = serializers.CharField(write_only=True, required=False)
     runs = RunSerializer(many=True, read_only=True)
-    input_sources = serializers.JSONField(source="input_sources_list", read_only=True)
+    input_sources = InputSourceSerializer(
+        source="inputsources",
+        many=True,
+        read_only=True,
+    )
     codebase_resources_summary = serializers.SerializerMethodField()
     discovered_packages_summary = serializers.SerializerMethodField()
     discovered_dependencies_summary = serializers.SerializerMethodField()

matchcode_pipeline/tests/test_api.py

@@ -99,13 +99,27 @@ def test_matchcode_pipeline_api_matching_detail(self):
         expected = {'java_to_class': 1}
         self.assertEqual(expected, response.data['codebase_relations_summary'])
 
-        self.project1.add_input_source(filename='file1', source='uploaded')
-        self.project1.add_input_source(filename='file2', source='https://download.url')
+        input1 = self.project1.add_input_source(filename='file1', is_uploaded=True)
+        input2 = self.project1.add_input_source(filename='file2', download_url='https://download.url')
         self.project1.save()
         response = self.csrf_client.get(self.project1_detail_url)
         expected = [
-            {'filename': 'file1', 'source': 'uploaded'},
-            {'filename': 'file2', 'source': 'https://download.url'},
+            {
+                "filename": "file1",
+                "download_url": "",
+                "is_uploaded": True,
+                "tag": "",
+                "exists": False,
+                "uuid": str(input1.uuid),
+            },
+            {
+                "filename": "file2",
+                "download_url": "https://download.url",
+                "is_uploaded": False,
+                "tag": "",
+                "exists": False,
+                "uuid": str(input2.uuid),
+            },
         ]
         self.assertEqual(expected, response.data['input_sources'])
 

packagedb/migrations/0082_delete_apiuser.py → packagedb/migrations/0083_delete_apiuser.py

@@ -5,7 +5,7 @@
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("packagedb", "0081_apiuser"),
+        ("packagedb", "0082_packagewatch"),
     ]
 
     operations = [

requirements-dev.txt

@@ -1,13 +1,9 @@
-aboutcode-toolkit==9.0.0
-black==23.11.0
-et-xmlfile==1.1.0
+black==24.1.1
 execnet==2.0.2
 iniconfig==2.0.0
-mock==5.1.0
 mypy-extensions==1.0.0
-openpyxl==3.1.2
-pathspec==0.11.2
-platformdirs==4.0.0
-pytest==7.4.3
-pytest-django==4.7.0
+pathspec==0.12.1
+platformdirs==4.1.0
+pytest==8.0.0
+pytest-django==4.8.0
 pytest-xdist==3.5.0

requirements.txt

@@ -1,8 +1,9 @@
+aboutcode-toolkit==10.1.0
 arrow==1.2.3
 asgiref==3.7.2
-attrs==23.1.0
+attrs==23.2.0
 banal==1.0.6
-beautifulsoup4==4.12.2
+beautifulsoup4==4.12.3
 binaryornot==0.4.4
 bitarray==2.6.0
 boolean.py==4.0
@@ -13,96 +14,132 @@ charset-normalizer==3.3.2
 click==8.1.7
 colorama==0.4.6
 commoncode==31.0.3
+construct==2.10.70
 container-inspector==32.0.1
-cryptography==41.0.5
+crispy-bootstrap3==2022.1
+crontab==1.0.1
+cryptography==42.0.2
+cyclonedx-python-lib==3.1.5
 debian-inspector==31.0.0
 Deprecated==1.2.14
-Django==4.2.6
+Django==5.0.1
+django-crispy-forms==2.1
 django-environ==0.11.2
-django-filter==23.3
+django-filter==23.5
+django-probes==1.7.0
+django-rq==2.10.1
+django-taggit==5.0.1
 djangorestframework==3.14.0
+dnspython==2.5.0
 dockerfile-parse==2.0.1
 dparse2==0.7.0
+email-validator==2.1.0.post1
+et-xmlfile==1.1.0
 extractcode==31.0.0
 extractcode-7z==16.5.210531
 extractcode-libarchive==3.5.1.210531
 fasteners==0.19
 fetchcode==0.3.0
+fetchcode-container==1.2.3.210512
 fingerprints==1.2.3
+fontawesomefree==6.5.1
+freezegun==1.4.0
 ftfy==6.1.3
 ftputil==5.0.4
 gemfileparser2==0.9.3
+gitdb==4.0.11
+GitPython==3.1.40
 gunicorn==21.2.0
+hoppr-cyclonedx-models==0.4.10
 html5lib==1.1
-idna==3.4
-importlib-metadata==6.8.0
+idna==3.6
+importlib-metadata==7.0.1
+inflection==0.5.1
 intbitset==3.0.2
 isodate==0.6.1
 jaraco.functools==4.0.0
 javaproperties==0.8.1
 jawa==2.2.0
-Jinja2==3.1.2
+Jinja2==3.1.3
+jsonschema==4.19.1
+jsonschema-specifications==2023.12.1
 jsonstreams==0.6.0
-license-expression==30.1.1
-lxml==4.9.3
+license-expression==30.2.0
+lxml==4.9.4
 Markdown==3.5.1
-MarkupSafe==2.1.3
-more-itertools==10.1.0
+MarkupSafe==2.1.4
+mock==5.1.0
+more-itertools==10.2.0
 natsort==8.2.0
 normality==2.5.0
+openpyxl==3.1.2
+packagedcode-msitools==0.101.210706
 packageurl-python==0.11.2
 packaging==23.2
 packvers==21.5
 parameter-expansion-patched==0.3.1
-pdfminer.six==20221105
+pdfminer.six==20231228
 pefile==2023.2.7
 pip==22.2.2
 pip-requirements-parser==32.0.1
 pkginfo2==30.0.0
-pluggy==1.3.0
+pluggy==1.4.0
 plugincode==32.0.0
 ply==3.11
-psycopg==3.1.12
-psycopg-binary==3.1.12
+psycopg==3.1.17
+psycopg-binary==3.1.17
 publicsuffix2==2.20191221
 pyahocorasick==2.0.0
 pycparser==2.21
+pydantic==1.10.14
 PyGithub==1.56
 pygmars==0.8.0
 Pygments==2.17.2
+pyinstrument==4.6.1
 PyJWT==2.8.0
 pymaven-patch==0.3.0
 PyNaCl==1.5.0
 pyparsing==3.1.1
 python-dateutil==2.8.2
-pytz==2023.3.post1
+python-inspector==0.10.0
+pytz==2023.4
 PyYAML==6.0.1
 rdflib==7.0.0
 redis==5.0.1
+referencing==0.33.0
+regipy==3.1.6
 reppy2==0.3.6
 requests==2.31.0
+resolvelib==1.0.1
+rpds-py==0.17.1
+rpm-inspector-rpm==4.16.1.3.210404
 rq==1.15.1
+rq-scheduler==0.13.1
 rubymarshal==1.0.3
 saneyaml==0.6.0
 scancode-toolkit==32.0.8
+scancodeio==33.0.0
 semantic-version==2.10.0
 semver==3.0.2
 setuptools==65.3.0
 six==1.16.0
+smmap==5.0.1
+sortedcontainers==2.4.0
 soupsieve==2.5
 spdx-tools==0.7.0rc0
 sqlparse==0.4.4
 text-unidecode==1.3
 toml==0.10.2
 typecode==30.0.1
 typecode-libmagic==5.39.210531
-typing_extensions==4.8.0
+typing_extensions==4.9.0
 univers==30.11.0
-urllib3==2.1.0
+urllib3==2.2.0
 urlpy==0.5
-wcwidth==0.2.12
+wcwidth==0.2.13
 webencodings==0.5.1
 wheel==0.37.1
 wrapt==1.16.0
+XlsxWriter==3.1.9
 xmltodict==0.13.0
 zipp==3.17.0

setup.cfg

@@ -39,28 +39,28 @@ install_requires =
     bitarray == 2.6.0
     debian-inspector == 31.0.0
     commoncode == 31.0.3
-    Django == 4.2.6
+    Django == 5.0.1
     django-environ == 0.11.2
     django-rq == 2.10.1
     djangorestframework == 3.14.0
-    django-filter == 23.3
+    django-filter == 23.5
     fetchcode == 0.3.0
     gunicorn == 21.2.0
     ftputil == 5.0.4
     jawa == 2.2.0
     markdown == 3.5.1
     natsort == 8.2.0
     packageurl-python == 0.11.2
-    psycopg[binary]==3.1.12
+    psycopg[binary]==3.1.17
     PyGithub == 1.56
     reppy2 == 0.3.6
     rq-scheduler == 0.13.1
     rubymarshal == 1.0.3
     scancode-toolkit[full] == 32.0.8
     urlpy == 0.5
-    matchcode-toolkit == 1.1.3
+    matchcode-toolkit == 2.0.1
     univers == 30.11.0
-    scancodeio == 32.7.0
+    scancodeio == 33.0.0
 setup_requires = setuptools_scm[toml] >= 4
 
 python_requires = >=3.8
@@ -69,17 +69,13 @@ python_requires = >=3.8
 where = .
 
 [options.extras_require]
-matchcodeio =
-    scancodeio
-
 testing =
     pytest >= 6, != 7.0.0
     pytest-xdist >= 2
     pytest-django
     aboutcode-toolkit >= 6.0.0
     black
     mock
-    scancodeio
 
 docs =
     Sphinx==5.0.2