Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 2 additions & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -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.*
scancode-toolkit
7 changes: 3 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion src/fosslight_source/_scan_item.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/fosslight_source/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@


def main() -> None:
global logger
_result_log = {}

path_to_scan = os.getcwd()
Expand Down
Loading