Update to use python system logger in license_utils

dcicutils/license_utils.py

@@ -2,10 +2,11 @@
 import datetime
 import io
 import json
-import logging
+# import logging
 import os
 import re
 import subprocess
+import warnings
 
 try:
     import piplicenses
@@ -30,8 +31,8 @@
 from dcicutils.misc_utils import PRINT, get_error_message, local_attrs
 
 
-logging.basicConfig()
-logger = logging.getLogger(__name__)
+# logging.basicConfig()
+# logger = logging.getLogger(__name__)
 
 _FRAMEWORK = 'framework'
 _LANGUAGE = 'language'
@@ -270,7 +271,7 @@ def report(message):
             if analysis:
                 analysis.miscellaneous.append(message)
             else:
-                logger.warning(message)
+                warnings.warn(message)
         parsed = cls.parse_simple_license_file(filename=filename)
         if check_license_title:
             license_title = parsed['license-title']
@@ -488,11 +489,11 @@ class MyOrgLicenseChecker(LicenseChecker):
         cls.analyze_license_file(analysis=analysis)
         cls.show_unacceptable_licenses(analysis=analysis)
         if analysis.unexpected_missing:
-            logger.warning(there_are(analysis.unexpected_missing, kind='unexpectedly missing license', punctuate=True))
+            warnings.warn(there_are(analysis.unexpected_missing, kind='unexpectedly missing license', punctuate=True))
         if analysis.no_longer_missing:
-            logger.warning(there_are(analysis.no_longer_missing, kind='no-longer-missing license', punctuate=True))
+            warnings.warn(there_are(analysis.no_longer_missing, kind='no-longer-missing license', punctuate=True))
         for message in analysis.miscellaneous:
-            logger.warning(message)
+            warnings.warn(message)
         if analysis.unacceptable:
             raise LicenseAcceptabilityCheckFailure(unacceptable_licenses=analysis.unacceptable)
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dcicutils"
-version = "7.6.0.2b5"
+version = "7.6.0.2b6"
 description = "Utility package for interacting with the 4DN Data Portal and other 4DN resources"
 authors = ["4DN-DCIC Team <[email protected]>"]
 license = "MIT"

test/test_license_utils.py

@@ -11,7 +11,7 @@
     LicenseFrameworkRegistry, LicenseFramework, PythonLicenseFramework, JavascriptLicenseFramework,
     LicenseAnalysis, LicenseChecker, LicenseStatus, LicenseFileParser,
     LicenseCheckFailure, LicenseOwnershipCheckFailure, LicenseAcceptabilityCheckFailure,
-    logger as license_logger,
+    warnings as license_utils_warnings_module,
 )
 from dcicutils.misc_utils import ignored, file_contents
 from dcicutils.qa_utils import printed_output, MockFileSystem
@@ -371,7 +371,7 @@ def check_license_checker_full_scenario_failing(*, perturb_setup, checker,
                       file=fp)
                 print(license_text_for_testing, file=fp)
 
-            with mock.patch.object(license_logger, 'warning') as mock_license_logger:
+            with mock.patch.object(license_utils_warnings_module, 'warn') as mock_license_logger:
 
                 license_warnings = []
 
@@ -520,7 +520,7 @@ def test_license_checker_full_scenario_succeeding():
 
         with mock.patch.object(PythonLicenseFramework, "get_dependencies") as mock_get_dependencies:
 
-            with mock.patch.object(license_logger, 'warning') as mock_license_logger:
+            with mock.patch.object(license_utils_warnings_module, 'warn') as mock_license_logger:
 
                 license_warnings = []
 
@@ -655,7 +655,7 @@ def test_validate_simple_license_file():
 
     with mfs.mock_exists_open_remove():
 
-        with mock.patch.object(license_logger, 'warning') as mock_license_logger:
+        with mock.patch.object(license_utils_warnings_module, 'warn') as mock_license_logger:
 
             license_warnings = []