Merge pull request #171 from fosslight/develop

Change the minimum Python version to 3.10

Author: dd-jy

.github/workflows/publish-release.yml

@@ -70,10 +70,10 @@ jobs:
     - uses: actions/[email protected]
       with:
         ref: main
-    - name: Set up Python 3.8
+    - name: Set up Python 3.11
       uses: actions/setup-python@v4
       with:
-        python-version: '3.8'
+        python-version: '3.11'
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
@@ -93,7 +93,7 @@ jobs:
         asset_content_type: ${{ matrix.ASSET_MIME}}
 
   deploy:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs: build
     steps:
     - uses: actions/[email protected]
@@ -102,7 +102,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v4
       with:
-        python-version: '3.8'
+        python-version: '3.11'
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip

.github/workflows/pull-request.yml

@@ -23,7 +23,7 @@ jobs:
             TARGET: ubuntu
             CMD_BUILD: >
                 tox -e ubuntu
-            OUT_FILE_NAME: fosslight_bin_ubuntu18
+            OUT_FILE_NAME: fosslight_bin_ubuntu
             ASSET_MIME: application/octet-stream
           - os: windows-latest
             TARGET: windows
@@ -36,10 +36,10 @@ jobs:
             ASSET_MIME: application/vnd.microsoft.portable-executable
     steps:
     - uses: actions/checkout@v3
-    - name: Set up Python 3.8
+    - name: Set up Python 3.11
       uses: actions/setup-python@v4
       with:
-        python-version: '3.8'
+        python-version: '3.11'
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip

requirements-dev.txt

@@ -1,5 +1,5 @@
 tox
-flake8==3.9.2
+flake8
 pytest
 pytest-cov
 pytest-flake8

setup.py

@@ -46,10 +46,10 @@
         classifiers=[
             "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
             "Programming Language :: Python :: 3",
-            "Programming Language :: Python :: 3.6",
-            "Programming Language :: Python :: 3.7",
-            "Programming Language :: Python :: 3.8",
-            "Programming Language :: Python :: 3.9"],
+            "Programming Language :: Python :: 3.10",
+            "Programming Language :: Python :: 3.11",
+            "Programming Language :: Python :: 3.12"],
+        python_requires='>=3.10,<3.13',
         install_requires=required,
         package_data={
             _PACKAGE_NAME: [

src/fosslight_prechecker/_add.py

@@ -257,7 +257,6 @@ def is_exclude_dir(dir_path: str) -> Optional[bool]:
 
 
 def get_spdx_license_list():
-    global spdx_licenses
     try:
         success, error_msg, licenses = get_spdx_licenses_json()
         if success is False:

src/fosslight_prechecker/_precheck.py

@@ -37,7 +37,6 @@
 
 
 def exclude_untracked_files(path: str) -> None:
-    global DEFAULT_EXCLUDE_EXTENSION_FILES
     try:
         cmd_result = subprocess.check_output(['git', 'ls-files', '-o'], universal_newlines=True)
         cmd_result = cmd_result.split('\n')
@@ -51,7 +50,6 @@ def exclude_untracked_files(path: str) -> None:
 
 
 def exclude_gitignore_files(path: str) -> None:
-    global DEFAULT_EXCLUDE_EXTENSION_FILES
     try:
         root_path = VCSStrategyGit.find_root(os.getcwd())
         if root_path:
@@ -89,7 +87,6 @@ def exclude_git_related_files(path: str) -> None:
 
 
 def find_oss_pkg_info_and_exclude_file(path: str, abs_path_to_exclude: List) -> List[str]:
-    global DEFAULT_EXCLUDE_EXTENSION_FILES
     oss_pkg_info = []
     git_present = shutil.which("git")
 
@@ -140,7 +137,6 @@ def find_oss_pkg_info_and_exclude_file(path: str, abs_path_to_exclude: List) ->
 
 
 def create_reuse_dep5_file(path: str) -> Tuple[bool, str, str]:
-    global DEFAULT_EXCLUDE_EXTENSION_FILES
     # Create .reuse/dep5 for excluding directories from reuse.
     _DEFAULT_CONFIG_PREFIX = "Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/\nUpstream-Name: \
                         reuse\nUpstream-Contact: Carmen Bianca Bakker <[email protected]>\nSource: https://github.com/fsfe/reuse-tool\n"
@@ -201,8 +197,6 @@ def remove_reuse_dep5_file(
 
 
 def precheck_for_files(path: str, files: List[str]) -> Tuple[List[str], List[str], Project]:
-    global DEFAULT_EXCLUDE_EXTENSION_FILES
-
     missing_license_list = []
     missing_copyright_list = []
 
@@ -287,7 +281,6 @@ def filter_missing_list(missing_list: List[str], abs_path_to_exclude: List) -> L
 
 
 def dump_error_msg(error_msg: str, exit=False) -> None:
-    global error_items
     error_items.append(error_msg)
     if exit:
         logger.error(error_msg)

src/fosslight_prechecker/_result_html.py

@@ -5,7 +5,7 @@
 import os
 from reuse import report
 from reuse.project import Project
-from fosslight_prechecker._constant import HTML_FORMAT_PREFIX, HTML_CELL_PREFIX, HTML_FORMAT_SUFFIX, HTML_EXPAND_PREFIX,\
+from fosslight_prechecker._constant import HTML_FORMAT_PREFIX, HTML_CELL_PREFIX, HTML_FORMAT_SUFFIX, HTML_EXPAND_PREFIX, \
                                            HTML_COMPLIANCE_SUFFIX, HTML_RESULT_PRINT_LIMIT, HTML_RESULT_EXPAND_LIMIT, HTML_CELL_HEAD_ROW
 from typing import Any