Skip to content

Commit

Permalink
Merge pull request #3199 from nexB/support-py-311
Browse files Browse the repository at this point in the history
Support python 3.11
  • Loading branch information
pombredanne authored Jan 17, 2023
2 parents 282aab0 + a7cf773 commit fca6f82
Show file tree
Hide file tree
Showing 6 changed files with 45 additions and 41 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/about-files-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
max-parallel: 4
matrix:
python-version: [3.7]
python-version: [3.9]

steps:
- name: Checkout code
Expand Down
44 changes: 22 additions & 22 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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: |
Expand All @@ -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

6 changes: 3 additions & 3 deletions requirements-native.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cffi==1.15.1
intbitset==3.0.1
lxml==4.9.1
intbitset==3.0.2
lxml==4.9.2
MarkupSafe==2.1.1
pyahocorasick==2.0.0b1
pyahocorasick==2.0.0
PyYAML==6.0
10 changes: 5 additions & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
attrs==21.4.0
attrs==22.1
banal==1.0.6
beautifulsoup4==4.11.1
binaryornot==0.4.4
Expand Down Expand Up @@ -28,14 +28,14 @@ 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
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
Expand All @@ -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
Expand All @@ -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
Expand Down
12 changes: 7 additions & 5 deletions setup-mini.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -62,7 +63,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
Expand All @@ -78,13 +80,13 @@ 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
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
Expand All @@ -97,12 +99,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
Expand Down
12 changes: 7 additions & 5 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -62,7 +63,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
Expand All @@ -78,13 +80,13 @@ 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
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
Expand All @@ -97,12 +99,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
Expand Down

0 comments on commit fca6f82

Please sign in to comment.