added verbose plural name for PackageRelatedVulnerability model

.gitignore

@@ -115,7 +115,10 @@ bin
 include
 lib64
 share
+Pipfile
 
+# editors
+.vscode/
 
 # pytest
 .pytest_cache

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "python.pythonPath": "C:\\Users\\Shivam Sharma\\.virtualenvs\\vulnerablecode-MrLwLfAt\\Scripts\\python.exe"
+}

Pipfile

@@ -0,0 +1,66 @@
+[[source]]
+url = "https://pypi.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+aiohttp = "==3.6.2"
+asgiref = "==3.2.7"
+attrs = "==19.3.0"
+backcall = "==0.1.0"
+beautifulsoup4 = "==4.7.1"
+cached-property = "==1.5.1"
+cffi = "==1.14.0"
+contextlib2 = "==0.5.5"
+decorator = "==4.4.2"
+dephell-specifier = "==0.2.1"
+dj-database-url = "==0.4.2"
+django = "==3.0.7"
+django-filter = "==2.2.0"
+djangorestframework = "==3.11.0"
+django-widget-tweaks = "==1.4.8"
+drf-yasg = "==1.17.1"
+gunicorn = "==19.7.1"
+importlib-metadata = "==1.3.0"
+ipython = "==7.13.0"
+ipython-genutils = "==0.2.0"
+jedi = "==0.17.0"
+lxml = "==4.3.3"
+more-itertools = "==8.0.2"
+packageurl-python = "==0.9.3"
+parso = "==0.7.0"
+pexpect = "==4.8.0"
+pickleshare = "==0.7.5"
+pluggy = "==0.13.1"
+prompt-toolkit = "==3.0.5"
+psycopg2 = "==2.8.4"
+ptyprocess = "==0.6.0"
+py = "==1.8.0"
+pycodestyle = "==2.5.0"
+pycparser = "==2.20"
+pygit2 = "==1.2.0"
+pygments = "==2.6.1"
+pyparsing = "==2.4.5"
+pytest = "==5.3.2"
+pytest-dependency = "==0.4.0"
+pytest-django = "==3.7.0"
+pytest-mock = "==1.13.0"
+python-dateutil = "==2.8.1"
+pytz = "==2019.3"
+schema = "==0.7.1"
+six = "==1.13.0"
+soupsieve = "==1.9.5"
+sqlparse = "==0.3.0"
+tqdm = "==4.41.1"
+traitlets = "==4.3.3"
+wcwidth = "==0.1.7"
+whitenoise = "==5.0.1"
+zipp = "==0.6.0"
+requests = "==2.23.0"
+toml = "==0.10.2"
+pyyaml = "==5.3.1"
+
+[dev-packages]
+
+[requires]
+python_version = "3.9"

vulnerabilities/importers/__init__.py

@@ -44,4 +44,7 @@
 from vulnerabilities.importers.suse_backports import SUSEBackportsDataSource
 from vulnerabilities.importers.ubuntu import UbuntuDataSource
 from vulnerabilities.importers.ubuntu_usn import UbuntuUSNDataSource
+<<<<<<< HEAD
+=======
 from vulnerabilities.importers.apache_tomcat import ApacheTomcatDataSource
+>>>>>>> 167734ec853c305a0b2c833512f14a95d4a1a281

vulnerabilities/importers/elixir_security.py

@@ -31,7 +31,10 @@
 from vulnerabilities.data_source import Advisory
 from vulnerabilities.data_source import Reference
 from vulnerabilities.package_managers import HexVersionAPI
+<<<<<<< HEAD
+=======
 from vulnerabilities.helpers import load_yaml
+>>>>>>> 167734ec853c305a0b2c833512f14a95d4a1a281
 
 
 class ElixirSecurityDataSource(GitDataSource):
@@ -142,3 +145,11 @@ def process_file(self, path):
             cve_id=cve_id,
             vuln_references=vuln_references,
         )
+<<<<<<< HEAD
+
+
+def load_yaml(path):
+    with open(path) as f:
+        return yaml.safe_load(f)
+=======
+>>>>>>> 167734ec853c305a0b2c833512f14a95d4a1a281

vulnerabilities/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 3.0.7 on 2020-09-14 06:17
+# Generated by Django 3.0.7 on 2021-01-10 15:11
 
 import django.contrib.postgres.fields.jsonb
 from django.db import migrations, models
@@ -64,6 +64,7 @@ class Migration(migrations.Migration):
                 ('vulnerability', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='vulnerabilities.Vulnerability')),
             ],
             options={
+                'verbose_name_plural': 'PackageRelatedVulnerabilities',
                 'unique_together': {('package', 'vulnerability')},
             },
         ),

vulnerabilities/models.py

@@ -146,6 +146,7 @@ class PackageRelatedVulnerability(models.Model):
 
     class Meta:
         unique_together = ("package", "vulnerability")
+        verbose_name_plural = "PackageRelatedVulnerabilities"
 
 
 class ImportProblem(models.Model):