Skip to content

Commit 09f2b99

Browse files
Update Python support to 3.10+ and remove scanners' version limits (#211)
* Support Python 3.10+,remove scanner version limit * Set action for 3.11 only and limit python <3.13 Signed-off-by: Wonjae Park <[email protected]>
1 parent 51533fc commit 09f2b99

File tree

7 files changed

+11
-16
lines changed

7 files changed

+11
-16
lines changed

.github/workflows/publish-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
- name: Set up Python
6161
uses: actions/setup-python@v4
6262
with:
63-
python-version: '3.8'
63+
python-version: '3.10'
6464
- name: Install dependencies
6565
run: |
6666
python -m pip install --upgrade pip

.github/workflows/pull-request.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
build:
1717
strategy:
1818
matrix:
19-
python-version: [3.8, 3.11]
19+
python-version: ["3.11"]
2020
os: [ubuntu-latest, windows-latest]
2121
runs-on: ${{ matrix.os }}
2222
steps:
@@ -35,7 +35,7 @@ jobs:
3535
build_macos:
3636
strategy:
3737
matrix:
38-
python-version: [3.9, 3.11]
38+
python-version: ["3.11"]
3939
runs-on: macos-latest
4040
steps:
4141
- uses: actions/checkout@v3

requirements-dev.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ tox
22
pytest
33
pytest-cov
44
pytest-flake8
5-
flake8==3.9.2
5+
flake8
66
dataclasses
77
scanoss
8-
importlib-metadata==4.12.0
8+
importlib-metadata
99
pytest-xdist

requirements.txt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
pyparsing
2-
scanoss>=1.18.0,<=1.26.3
2+
scanoss>=1.18.0
33
XlsxWriter
44
fosslight_util>=2.1.10
55
PyYAML
66
wheel>=0.38.1
77
intbitset
88
fosslight_binary>=5.0.0
9-
scancode-toolkit==32.0.*;sys_platform=="darwin"
10-
scancode-toolkit==32.2.*;sys_platform!="darwin"
11-
psycopg2-binary==2.9.9
12-
beautifulsoup4==4.12.*
9+
scancode-toolkit

setup.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,10 @@
2626
download_url='https://github.com/fosslight/fosslight_source_scanner',
2727
classifiers=['License :: OSI Approved :: Apache Software License',
2828
"Programming Language :: Python :: 3",
29-
"Programming Language :: Python :: 3.8",
30-
"Programming Language :: Python :: 3.9",
3129
"Programming Language :: Python :: 3.10",
32-
"Programming Language :: Python :: 3.11", ],
33-
python_requires=">=3.8",
30+
"Programming Language :: Python :: 3.11",
31+
"Programming Language :: Python :: 3.12", ],
32+
python_requires=">=3.10, <3.13",
3433
install_requires=required,
3534
entry_points={
3635
"console_scripts": [

src/fosslight_source/_scan_item.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ def get_print_array(self) -> list:
9797
return print_rows
9898

9999
def __eq__(self, other: object) -> bool:
100-
if type(other) == str:
100+
if isinstance(other, str):
101101
return self.source_name_or_path == other
102102
else:
103103
return self.source_name_or_path == other.source_name_or_path

src/fosslight_source/cli.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343

4444

4545
def main() -> None:
46-
global logger
4746
_result_log = {}
4847

4948
path_to_scan = os.getcwd()

0 commit comments

Comments
 (0)