Merge branch 'main' into main

Author: Pushpit07

.github/workflows/main.yml

@@ -38,7 +38,7 @@ jobs:
           pip install -r requirements.txt
     
       - name: Run tests
-        run: pytest
+        run: python -m pytest
         env:
           # The hostname, username used to communicate with the PostgreSQL service container
           POSTGRES_HOST: localhost

.travis.yml

@@ -18,7 +18,7 @@ before_script:
 
 script:
   - ./manage.py collectstatic
-  - pytest
+  - python -m pytest
 
 notifications:
   email: false

README.rst

@@ -206,7 +206,7 @@ Run Tests
 Use these commands to run code style checks and the test suite::
 
     black -l 100 --check .
-    DJANGO_DEV=1 pytest
+    DJANGO_DEV=1 python -m pytest
 
 
 Data import

vulnerabilities/importers/nginx.py

@@ -66,7 +66,7 @@ def updated_advisories(self):
 
     def to_advisories(self, data):
         advisories = []
-        soup = BeautifulSoup(data)
+        soup = BeautifulSoup(data, features="lxml")
         vuln_list = soup.select("li p")
 
         # Example value of `vuln_list` :

vulnerabilities/importers/postgresql.py

@@ -58,7 +58,7 @@ def updated_advisories(self):
 
 def to_advisories(data):
     advisories = []
-    soup = BeautifulSoup(data)
+    soup = BeautifulSoup(data, features="lxml")
     table = soup.select("table")[0]
     for row in table.select("tbody tr"):
         ref_col, affected_col, fixed_col, severity_score_col, desc_col = row.select("td")

vulnerablecode/urls.py

@@ -88,7 +88,7 @@ def __init__(self, *args, **kwargs):
 urlpatterns = [
     path("admin/", admin.site.urls),
     path("api/schema/", SpectacularAPIView.as_view(), name="schema"),
-    path("api/schema/swagger-ui/", SpectacularSwaggerView.as_view(), name="swagger-ui"),
+    path("api/docs", SpectacularSwaggerView.as_view(), name="swagger-ui"),
     path("packages/search", PackageSearchView.as_view(), name="package_search"),
     path("packages/<int:pk>", PackageUpdate.as_view(), name="package_view"),
     path("vulnerabilities/<int:pk>", VulnerabilityDetails.as_view(), name="vulnerability_view"),