diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 238e404..b23b71a 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -61,7 +61,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 diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 4749644..ddc8886 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.8] + python-version: ['3.10', '3.11', '3.12'] steps: - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} diff --git a/README.md b/README.md index ba52c45..c405f3c 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ It is a package that supports common utils used by FOSSLight Scanner. ## 📋 Prerequisite -FOSSLight Util needs a Python 3.6+. +FOSSLight Util needs a Python 3.10+. ## 🎉 How to install diff --git a/requirements-dev.txt b/requirements-dev.txt index 54813f0..b59e49c 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,6 +1,6 @@ -tox>=4.18.1 +tox pytest pytest-cov pytest-flake8 -flake8==3.9.2 +flake8 fosslight-source diff --git a/requirements.txt b/requirements.txt index 36a0e0b..6593fc1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,8 +10,7 @@ beautifulsoup4 jsonmerge spdx-tools==0.8.*;sys_platform=="linux" setuptools>=65.5.1 # not directly required, pinned by Snyk to avoid a vulnerability -numpy; python_version < '3.8' -numpy>=1.22.2; python_version >= '3.8' +numpy requests GitPython cyclonedx-python-lib==8.5.*;sys_platform=="linux" diff --git a/setup.py b/setup.py index 0dc74e6..9086313 100644 --- a/setup.py +++ b/setup.py @@ -26,17 +26,12 @@ download_url='https://github.com/fosslight/fosslight_util', classifiers=['License :: OSI Approved :: Apache Software License', "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.11", + "Programming Language :: Python :: 3.12", ], install_requires=required, package_data={'fosslight_util': ['resources/frequentLicenselist.json', 'resources/licenses.json']}, include_package_data=True, - extras_require={":python_version<'3.7'": ["pygit2==1.6.1"], - ":python_version>='3.7'": ["pygit2>=1.10.1"]}, entry_points={ "console_scripts": [ "fosslight_download = fosslight_util.download:main",