diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 25cc701..9ce092e 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -60,7 +60,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: '3.8' + python-version: '3.10' - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 5f1a264..351e964 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -16,7 +16,7 @@ jobs: build: strategy: matrix: - python-version: [3.8, 3.11] + python-version: ["3.11"] os: [ubuntu-latest, windows-latest] runs-on: ${{ matrix.os }} steps: @@ -35,7 +35,7 @@ jobs: build_macos: strategy: matrix: - python-version: [3.9, 3.11] + python-version: ["3.11"] runs-on: macos-latest steps: - uses: actions/checkout@v3 diff --git a/requirements-dev.txt b/requirements-dev.txt index 2007d85..897b0f0 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -2,8 +2,8 @@ tox pytest pytest-cov pytest-flake8 -flake8==3.9.2 +flake8 dataclasses scanoss -importlib-metadata==4.12.0 +importlib-metadata pytest-xdist \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index ee4b985..6e86703 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,12 +1,9 @@ pyparsing -scanoss>=1.18.0,<=1.26.3 +scanoss>=1.18.0 XlsxWriter fosslight_util>=2.1.10 PyYAML wheel>=0.38.1 intbitset fosslight_binary>=5.0.0 -scancode-toolkit==32.0.*;sys_platform=="darwin" -scancode-toolkit==32.2.*;sys_platform!="darwin" -psycopg2-binary==2.9.9 -beautifulsoup4==4.12.* \ No newline at end of file +scancode-toolkit \ No newline at end of file diff --git a/setup.py b/setup.py index f465936..11867ff 100644 --- a/setup.py +++ b/setup.py @@ -26,11 +26,10 @@ download_url='https://github.com/fosslight/fosslight_source_scanner', classifiers=['License :: OSI Approved :: Apache Software License', "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11", ], - python_requires=">=3.8", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", ], + python_requires=">=3.10, <3.13", install_requires=required, entry_points={ "console_scripts": [ diff --git a/src/fosslight_source/_scan_item.py b/src/fosslight_source/_scan_item.py index 9080ade..bb9609b 100644 --- a/src/fosslight_source/_scan_item.py +++ b/src/fosslight_source/_scan_item.py @@ -97,7 +97,7 @@ def get_print_array(self) -> list: return print_rows def __eq__(self, other: object) -> bool: - if type(other) == str: + if isinstance(other, str): return self.source_name_or_path == other else: return self.source_name_or_path == other.source_name_or_path diff --git a/src/fosslight_source/cli.py b/src/fosslight_source/cli.py index 6bd6547..d7c0bb3 100755 --- a/src/fosslight_source/cli.py +++ b/src/fosslight_source/cli.py @@ -43,7 +43,6 @@ def main() -> None: - global logger _result_log = {} path_to_scan = os.getcwd()