Move importers/osv_v2.py to pipes/osv_v2.py

Signed-off-by: ziad hany <ziadhany2016@gmail.com>

Author: ziadhany

vulnerabilities/pipelines/v2_importers/github_osv_importer.py

@@ -14,8 +14,8 @@
 from fetchcode.vcs import fetch_via_vcs
 
 from vulnerabilities.importer import AdvisoryData
-from vulnerabilities.importers.osv_v2 import parse_advisory_data_v3
 from vulnerabilities.pipelines import VulnerableCodeBaseImporterPipelineV2
+from vulnerabilities.pipes.osv_v2 import parse_advisory_data_v3
 from vulnerabilities.utils import get_advisory_url
 
 

vulnerabilities/pipelines/v2_importers/oss_fuzz.py

@@ -14,8 +14,8 @@
 from fetchcode.vcs import fetch_via_vcs
 
 from vulnerabilities.importer import AdvisoryData
-from vulnerabilities.importers.osv_v2 import parse_advisory_data_v3
 from vulnerabilities.pipelines import VulnerableCodeBaseImporterPipelineV2
+from vulnerabilities.pipes.osv_v2 import parse_advisory_data_v3
 from vulnerabilities.utils import get_advisory_url
 
 logger = logging.getLogger(__name__)

vulnerabilities/pipelines/v2_importers/pypa_importer.py

@@ -14,8 +14,8 @@
 from fetchcode.vcs import fetch_via_vcs
 
 from vulnerabilities.importer import AdvisoryData
-from vulnerabilities.importers.osv_v2 import parse_advisory_data_v3
 from vulnerabilities.pipelines import VulnerableCodeBaseImporterPipelineV2
+from vulnerabilities.pipes.osv_v2 import parse_advisory_data_v3
 from vulnerabilities.utils import get_advisory_url
 
 

vulnerabilities/pipelines/v2_importers/pysec_importer.py

@@ -15,8 +15,8 @@
 import requests
 
 from vulnerabilities.importer import AdvisoryData
-from vulnerabilities.importers.osv_v2 import parse_advisory_data_v3
 from vulnerabilities.pipelines import VulnerableCodeBaseImporterPipelineV2
+from vulnerabilities.pipes.osv_v2 import parse_advisory_data_v3
 
 
 class PyPIImporterPipeline(VulnerableCodeBaseImporterPipelineV2):

vulnerabilities/importers/osv_v2.py vulnerabilities/pipes/osv_v2.pyvulnerabilities/importers/osv_v2.py renamed to vulnerabilities/pipes/osv_v2.py

@@ -8,6 +8,7 @@
 #
 import json
 import os
+from pathlib import Path
 from unittest import TestCase
 
 import saneyaml
@@ -17,13 +18,12 @@
 from univers.versions import MavenVersion
 from univers.versions import PypiVersion
 
-from vulnerabilities.importers.osv_v2 import get_explicit_affected_range
-from vulnerabilities.importers.osv_v2 import get_version_ranges_constraints
-from vulnerabilities.importers.osv_v2 import parse_advisory_data_v3
+from vulnerabilities.pipes.osv_v2 import get_explicit_affected_range
+from vulnerabilities.pipes.osv_v2 import get_version_ranges_constraints
+from vulnerabilities.pipes.osv_v2 import parse_advisory_data_v3
 from vulnerabilities.tests import util_tests
 
-BASE_DIR = os.path.dirname(os.path.abspath(__file__))
-TEST_DATA = os.path.join(BASE_DIR, "test_data/osv_test")
+TEST_DATA = Path(__file__).parent.parent / "test_data" / "osv_test"
 
 
 def test_get_version_ranges_constraints():