Merge pull request #60 from oeg-upm/dev

Fixed issue with input url and added somef configuration to its harvester

Author: andriumon

.gitignore

@@ -1,5 +1,6 @@
 rsfc_env/
 rsfc_output/
+test_env/
 build/
 dist/
 outputs/

CITATION.cff

@@ -26,4 +26,4 @@ keywords:
   - indicators
   - fairness
 license: MIT
-version: 0.0.9
+version: 0.1.0

codemeta.json

@@ -34,6 +34,6 @@
     "operatingSystem": "Linux",
     "programmingLanguage": "Python",
     "relatedLink": "https://github.com/EVERSE-ResearchSoftware/indicators",
-    "version": "0.0.9",
+    "version": "0.1.0",
     "developmentStatus": "wip"
 }

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "rsfc"
-version = "0.0.9"
+version = "0.1.0"
 description = "EVERSE Research Software Fairness Checks"
 authors = ["Andres Montero <andres.montero.martin@upm.es>"]
 license = "MIT"

src/rsfc/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 
 
-__version__ = "0.0.9"
+__version__ = "0.1.0"
 

src/rsfc/harvesters/somef_harvester.py

@@ -2,13 +2,29 @@
 import contextlib
 import json
 from somef import somef_cli
+import subprocess
 import os
 
 class SomefHarvester:
 
     def __init__(self, repo_url):
+        self.somef_configure()
         self.somef_data = self.somef_assessment(repo_url, 0.8)
 
+        
+    def somef_configure(self):
+        
+        print("Configuring SOMEF...")
+
+        try:
+            subprocess.run(
+                ["somef", "configure", "-a"],
+                check=True,
+                stdout=subprocess.DEVNULL,
+                stderr=subprocess.DEVNULL
+            )
+        except subprocess.CalledProcessError as e:
+            raise RuntimeError("SOMEF configuration failed") from e
 
     def somef_assessment(self, repo_url, threshold):
 

src/rsfc/main.py

@@ -11,13 +11,14 @@ def main():
     print("Making preparations...")
 
     from rsfc.rsfc_core import start_assessment
-    from rsfc.utils.rsfc_helpers import resolve_w3id
+    from rsfc.utils.rsfc_helpers import resolve_w3id, remove_git_from_url
     import os
     import json
 
     print("Checking if url is w3id")
 
     repo_url = resolve_w3id(args.repo)
+    repo_url = remove_git_from_url(repo_url)
 
     rsfc_asmt, table = start_assessment(repo_url, args.ftr, args.id)
 

src/rsfc/model/indicator.py

@@ -107,9 +107,6 @@ def __init__(self, somef, cd, cf, gh):
             "RSFC-15-2": [
                 (rt.test_license_spdx_compliant, [somef.somef_data])
             ],
-            "RSFC-15-3": [
-                (rt.test_license_information_provided, [somef.somef_data])
-            ],
             "RSFC-16-1": [
                 (rt.test_license_info_in_metadata_files, [somef.somef_data, cd.codemeta_data, cf.cff_data])
             ],

src/rsfc/rsfc_tests/rsfc_tests.py

@@ -990,7 +990,7 @@ def test_license_spdx_compliant(somef_data):
     return check.convert()
 
 
-def test_license_information_provided(somef_data):
+'''def test_license_information_provided(somef_data):
     
     if 'license' not in somef_data:
         output = "false"
@@ -1010,7 +1010,7 @@ def test_license_information_provided(somef_data):
                 
     check = ch.Check(constants.INDICATORS_DICT['software_has_license'], 'RSFC-15-3', "License information is provided", constants.PROCESS_LICENSE_INFORMATION_PROVIDED, output, evidence, suggest)
     
-    return check.convert()
+    return check.convert()'''
 
 ################################################### FRSM_16 ###################################################
 

src/rsfc/utils/constants.py

@@ -419,7 +419,7 @@
     'rsfc' : {
         'name' : 'RSFC',
         'id' : 'https://w3id.org/rsfc/',
-        'version' : '0.0.9'
+        'version' : '0.1.0'
     }
 }