From 7ac60558ef0207b6a677f6bb05a8356d3659c4f0 Mon Sep 17 00:00:00 2001 From: Ayan Sinha Mahapatra Date: Mon, 16 Jan 2023 16:50:47 +0530 Subject: [PATCH 1/5] Bump requirements to support python3.11 #2730 * Bump ahocorasick to v2.0.0 * Bump intbitset to v3.0.2 Additionally also bump saneyamp to v0.6.0 Signed-off-by: Ayan Sinha Mahapatra --- requirements.txt | 6 +++--- setup-mini.cfg | 6 +++--- setup.cfg | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/requirements.txt b/requirements.txt index f741ab16e94..78e1153fa31 100644 --- a/requirements.txt +++ b/requirements.txt @@ -28,7 +28,7 @@ html5lib==1.1 idna==3.3 importlib-metadata==4.12.0 inflection==0.5.1 -intbitset==3.0.1 +intbitset==3.0.2 isodate==0.6.1 jaraco.functools==3.5.1 javaproperties==0.8.1 @@ -51,7 +51,7 @@ pluggy==1.0.0 plugincode==31.0.0 ply==3.11 publicsuffix2==2.20191221 -pyahocorasick==2.0.0b1 +pyahocorasick==2.0.0 pycparser==2.21 pygmars==0.7.0 Pygments==2.12.0 @@ -61,7 +61,7 @@ pytz==2022.1 PyYAML==6.0 rdflib==6.2.0 requests==2.28.1 -saneyaml==0.5.2 +saneyaml==0.6.0 six==1.16.0 soupsieve==2.3.2.post1 spdx-tools==0.7.0a3 diff --git a/setup-mini.cfg b/setup-mini.cfg index 836a436eb88..6dc15ac2b7e 100644 --- a/setup-mini.cfg +++ b/setup-mini.cfg @@ -78,7 +78,7 @@ install_requires = gemfileparser2 >= 0.9.0 html5lib importlib_metadata - intbitset >= 3.0.0 + intbitset >= 3.0.2 jaraco.functools javaproperties >= 0.5 jinja2 >= 2.7.0 @@ -97,12 +97,12 @@ install_requires = pluggy >= 1.0.0 plugincode >= 31.0.0 publicsuffix2 - pyahocorasick >= 2.0.0b1 + pyahocorasick >= 2.0.0 pygmars >= 0.7.0 pygments pymaven_patch >= 0.2.8 requests >= 2.7.0 - saneyaml >= 0.5.2 + saneyaml >= 0.6.0 spdx_tools == 0.7.0a3 text_unidecode >= 1.0 toml >= 0.10.0 diff --git a/setup.cfg b/setup.cfg index 242ee1e2114..c57261d10db 100644 --- a/setup.cfg +++ b/setup.cfg @@ -78,7 +78,7 @@ install_requires = gemfileparser2 >= 0.9.0 html5lib importlib_metadata - intbitset >= 3.0.0 + intbitset >= 3.0.2 jaraco.functools javaproperties >= 0.5 jinja2 >= 2.7.0 @@ -97,12 +97,12 @@ install_requires = pluggy >= 1.0.0 plugincode >= 31.0.0 publicsuffix2 - pyahocorasick >= 2.0.0b1 + pyahocorasick >= 2.0.0 pygmars >= 0.7.0 pygments pymaven_patch >= 0.2.8 requests >= 2.7.0 - saneyaml >= 0.5.2 + saneyaml >= 0.6.0 spdx_tools == 0.7.0a3 text_unidecode >= 1.0 toml >= 0.10.0 From 2d8b809a2b9c7588ca220f0a4455d15f1f248f5f Mon Sep 17 00:00:00 2001 From: Ayan Sinha Mahapatra Date: Mon, 16 Jan 2023 16:52:34 +0530 Subject: [PATCH 2/5] Add python 3.11 to CI #2730 #2731 Signed-off-by: Ayan Sinha Mahapatra --- .github/workflows/about-files-ci.yml | 2 +- azure-pipelines.yml | 44 ++++++++++++++-------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/workflows/about-files-ci.yml b/.github/workflows/about-files-ci.yml index 268c9565211..b5b80b30c98 100644 --- a/.github/workflows/about-files-ci.yml +++ b/.github/workflows/about-files-ci.yml @@ -12,7 +12,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: [3.7] + python-version: [3.9] steps: - name: Checkout code diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a3a8b0f8449..20fc9f46525 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -95,7 +95,7 @@ jobs: parameters: job_name: ubuntu18_cpython image_name: ubuntu-18.04 - python_versions: ['3.8', '3.9', '3.10'] + python_versions: ['3.8', '3.9', '3.10', '3.11'] python_architecture: x64 test_suites: all: venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py @@ -104,7 +104,7 @@ jobs: parameters: job_name: ubuntu20_cpython image_name: ubuntu-20.04 - python_versions: ['3.8', '3.9', '3.10'] + python_versions: ['3.8', '3.9', '3.10', '3.11'] python_architecture: x64 test_suites: all: venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py @@ -113,7 +113,7 @@ jobs: parameters: job_name: ubuntu22_cpython image_name: ubuntu-22.04 - python_versions: ['3.8', '3.9', '3.10'] + python_versions: ['3.8', '3.9', '3.10', '3.11'] python_architecture: x64 test_suites: all: venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py @@ -122,7 +122,7 @@ jobs: parameters: job_name: macos11_cpython image_name: macos-11 - python_versions: ['3.8', '3.9', '3.10'] + python_versions: ['3.8', '3.9', '3.10', '3.11'] python_architecture: x64 test_suites: all: venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py @@ -131,7 +131,7 @@ jobs: parameters: job_name: macos12_cpython image_name: macos-12 - python_versions: ['3.8', '3.9', '3.10'] + python_versions: ['3.8', '3.9', '3.10', '3.11'] python_architecture: x64 test_suites: all: venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py @@ -149,7 +149,7 @@ jobs: parameters: job_name: win2019_cpython_2 image_name: windows-2019 - python_versions: ['3.9', '3.10'] + python_versions: ['3.9', '3.10', '3.11'] python_architecture: x64 test_suites: all: venv\Scripts\pytest -n 2 -vvs tests\scancode\test_cli.py @@ -167,7 +167,7 @@ jobs: parameters: job_name: win2022_cpython_2 image_name: windows-2022 - python_versions: ['3.9', '3.10'] + python_versions: ['3.9', '3.10', '3.11'] python_architecture: x64 test_suites: all: venv\Scripts\pytest -n 2 -vvs tests\scancode\test_cli.py @@ -182,7 +182,7 @@ jobs: parameters: job_name: ubuntu20_test_all_supported_click_versions image_name: ubuntu-20.04 - python_versions: ['3.8', '3.9', '3.10'] + python_versions: ['3.8', '3.9', '3.10', '3.11'] python_architecture: x64 test_suites: click_versions: | @@ -202,55 +202,55 @@ jobs: parameters: job_name: ubuntu22_cpython_latest_from_pip image_name: ubuntu-22.04 - python_versions: ['3.8', '3.9', '3.10'] + python_versions: ['3.8', '3.9', '3.10', '3.11'] test_suites: - all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[dev] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py + all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[testing] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py - template: etc/ci/azure-posix.yml parameters: job_name: ubuntu18_cpython_latest_from_pip image_name: ubuntu-18.04 - python_versions: ['3.8', '3.9', '3.10'] + python_versions: ['3.8', '3.9', '3.10', '3.11'] test_suites: - all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[dev] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py + all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[testing] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py - template: etc/ci/azure-posix.yml parameters: job_name: ubuntu20_cpython_latest_from_pip image_name: ubuntu-20.04 - python_versions: ['3.8', '3.9', '3.10'] + python_versions: ['3.8', '3.9', '3.10', '3.11'] test_suites: - all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[dev] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py + all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[testing] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py - template: etc/ci/azure-posix.yml parameters: job_name: macos11_cpython_latest_from_pip image_name: macos-11 - python_versions: ['3.8', '3.9', '3.10'] + python_versions: ['3.8', '3.9', '3.10', '3.11'] test_suites: - all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[dev] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py + all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[testing] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py - template: etc/ci/azure-posix.yml parameters: job_name: macos12_cpython_latest_from_pip image_name: macos-12 - python_versions: ['3.8', '3.9', '3.10'] + python_versions: ['3.8', '3.9', '3.10', '3.11'] test_suites: - all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[dev] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py + all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[testing] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py - template: etc/ci/azure-win.yml parameters: job_name: win2019_cpython_latest_from_pip image_name: windows-2019 - python_versions: ['3.8', '3.9', '3.10'] + python_versions: ['3.8', '3.9', '3.10', '3.11'] test_suites: - all: venv\Scripts\pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[dev] && venv\Scripts\pytest -n 2 -vvs tests\scancode\test_cli.py + all: venv\Scripts\pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[testing] && venv\Scripts\pytest -n 2 -vvs tests\scancode\test_cli.py - template: etc/ci/azure-win.yml parameters: job_name: win2022_cpython_latest_from_pip image_name: windows-2022 - python_versions: ['3.8', '3.9', '3.10'] + python_versions: ['3.8', '3.9', '3.10', '3.11'] test_suites: - all: venv\Scripts\pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[dev] && venv\Scripts\pytest -n 2 -vvs tests\scancode\test_cli.py + all: venv\Scripts\pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[testing] && venv\Scripts\pytest -n 2 -vvs tests\scancode\test_cli.py From 8e9a4e58346ed25a01287da90c50b456e6211331 Mon Sep 17 00:00:00 2001 From: Philippe Ombredanne Date: Tue, 17 Jan 2023 00:11:41 +0100 Subject: [PATCH 3/5] Bump attrs to > 22.1 to support Python 3.11 But still support older attrs versions on older Python versions Thank-you-to: James Gerity @SnoopJ Reference: https://github.com/python-attrs/attrs/issues/907 Reference: https://github.com/python-attrs/attrs/pull/969 Reference: https://github.com/nexB/scancode-toolkit/pull/3199#issuecomment-1384632285 Signed-off-by: Philippe Ombredanne --- requirements.txt | 2 +- setup-mini.cfg | 3 ++- setup.cfg | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 78e1153fa31..fc6975f2352 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -attrs==21.4.0 +attrs==22.1 banal==1.0.6 beautifulsoup4==4.11.1 binaryornot==0.4.4 diff --git a/setup-mini.cfg b/setup-mini.cfg index 6dc15ac2b7e..1760947a1b3 100644 --- a/setup-mini.cfg +++ b/setup-mini.cfg @@ -62,7 +62,8 @@ py_modules = python_requires = >=3.7 install_requires = - attrs >= 18.1, !=20.1.0 + attrs >= 18.1,!=20.1.0;python_version<'3.11' + attrs >= 22.1;python_version>='3.11' Beautifulsoup4 >= 4.0.0 boolean.py >= 4.0 chardet >= 3.0.0 diff --git a/setup.cfg b/setup.cfg index c57261d10db..df2f8d6258b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -62,7 +62,8 @@ py_modules = python_requires = >=3.7 install_requires = - attrs >= 18.1, !=20.1.0 + attrs >= 18.1,!=20.1.0;python_version<'3.11' + attrs >= 22.1;python_version>='3.11' Beautifulsoup4 >= 4.0.0 boolean.py >= 4.0 chardet >= 3.0.0 From 559012258e96421caf1310dd6bce8b165716ab1b Mon Sep 17 00:00:00 2001 From: Philippe Ombredanne Date: Tue, 17 Jan 2023 00:44:23 +0100 Subject: [PATCH 4/5] Bump lxml to 4.9.2 for Python 3.11 #2730 Also update setup metadata to Python 3.11 Signed-off-by: Philippe Ombredanne --- requirements-native.txt | 2 +- requirements.txt | 2 +- setup-mini.cfg | 3 ++- setup.cfg | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/requirements-native.txt b/requirements-native.txt index b779c559c79..739f30b6795 100644 --- a/requirements-native.txt +++ b/requirements-native.txt @@ -1,6 +1,6 @@ cffi==1.15.1 intbitset==3.0.1 -lxml==4.9.1 +lxml==4.9.2 MarkupSafe==2.1.1 pyahocorasick==2.0.0b1 PyYAML==6.0 diff --git a/requirements.txt b/requirements.txt index fc6975f2352..d97edea593f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -35,7 +35,7 @@ javaproperties==0.8.1 Jinja2==3.1.2 jsonstreams==0.6.0 license-expression==30.0.0 -lxml==4.9.1 +lxml==4.9.2 MarkupSafe==2.1.1 more-itertools==8.13.0 normality==2.3.3 diff --git a/setup-mini.cfg b/setup-mini.cfg index 1760947a1b3..4fe74b3bd10 100644 --- a/setup-mini.cfg +++ b/setup-mini.cfg @@ -21,6 +21,7 @@ classifiers = Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 + Programming Language :: Python :: 3.11 Topic :: Software Development Topic :: Utilities @@ -85,7 +86,7 @@ install_requires = jinja2 >= 2.7.0 jsonstreams >= 0.5.0 license_expression >= 30.0.0 - lxml >= 4.9.1 + lxml >= 4.9.2 MarkupSafe >= 1.0 packageurl_python >= 0.9.0 packvers >= 21.0.0 diff --git a/setup.cfg b/setup.cfg index df2f8d6258b..9ef1107da21 100644 --- a/setup.cfg +++ b/setup.cfg @@ -21,6 +21,7 @@ classifiers = Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 + Programming Language :: Python :: 3.11 Topic :: Software Development Topic :: Utilities @@ -85,7 +86,7 @@ install_requires = jinja2 >= 2.7.0 jsonstreams >= 0.5.0 license_expression >= 30.0.0 - lxml >= 4.9.1 + lxml >= 4.9.2 MarkupSafe >= 1.0 packageurl_python >= 0.9.0 packvers >= 21.0.0 From a7cf7735207398622d7ed8d9d81cfaa0036070fd Mon Sep 17 00:00:00 2001 From: Philippe Ombredanne Date: Tue, 17 Jan 2023 00:46:42 +0100 Subject: [PATCH 5/5] Align native requirements with main ones #2730 This is used when creating release archives Signed-off-by: Philippe Ombredanne --- requirements-native.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements-native.txt b/requirements-native.txt index 739f30b6795..974827d7682 100644 --- a/requirements-native.txt +++ b/requirements-native.txt @@ -1,6 +1,6 @@ cffi==1.15.1 -intbitset==3.0.1 +intbitset==3.0.2 lxml==4.9.2 MarkupSafe==2.1.1 -pyahocorasick==2.0.0b1 +pyahocorasick==2.0.0 PyYAML==6.0