Skip to content

Commit fca6f82

Browse files
authored
Merge pull request #3199 from nexB/support-py-311
Support python 3.11
2 parents 282aab0 + a7cf773 commit fca6f82

File tree

6 files changed

+45
-41
lines changed

6 files changed

+45
-41
lines changed

.github/workflows/about-files-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
max-parallel: 4
1414
matrix:
15-
python-version: [3.7]
15+
python-version: [3.9]
1616

1717
steps:
1818
- name: Checkout code

azure-pipelines.yml

+22-22
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595
parameters:
9696
job_name: ubuntu18_cpython
9797
image_name: ubuntu-18.04
98-
python_versions: ['3.8', '3.9', '3.10']
98+
python_versions: ['3.8', '3.9', '3.10', '3.11']
9999
python_architecture: x64
100100
test_suites:
101101
all: venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
@@ -104,7 +104,7 @@ jobs:
104104
parameters:
105105
job_name: ubuntu20_cpython
106106
image_name: ubuntu-20.04
107-
python_versions: ['3.8', '3.9', '3.10']
107+
python_versions: ['3.8', '3.9', '3.10', '3.11']
108108
python_architecture: x64
109109
test_suites:
110110
all: venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
@@ -113,7 +113,7 @@ jobs:
113113
parameters:
114114
job_name: ubuntu22_cpython
115115
image_name: ubuntu-22.04
116-
python_versions: ['3.8', '3.9', '3.10']
116+
python_versions: ['3.8', '3.9', '3.10', '3.11']
117117
python_architecture: x64
118118
test_suites:
119119
all: venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
@@ -122,7 +122,7 @@ jobs:
122122
parameters:
123123
job_name: macos11_cpython
124124
image_name: macos-11
125-
python_versions: ['3.8', '3.9', '3.10']
125+
python_versions: ['3.8', '3.9', '3.10', '3.11']
126126
python_architecture: x64
127127
test_suites:
128128
all: venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
@@ -131,7 +131,7 @@ jobs:
131131
parameters:
132132
job_name: macos12_cpython
133133
image_name: macos-12
134-
python_versions: ['3.8', '3.9', '3.10']
134+
python_versions: ['3.8', '3.9', '3.10', '3.11']
135135
python_architecture: x64
136136
test_suites:
137137
all: venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
@@ -149,7 +149,7 @@ jobs:
149149
parameters:
150150
job_name: win2019_cpython_2
151151
image_name: windows-2019
152-
python_versions: ['3.9', '3.10']
152+
python_versions: ['3.9', '3.10', '3.11']
153153
python_architecture: x64
154154
test_suites:
155155
all: venv\Scripts\pytest -n 2 -vvs tests\scancode\test_cli.py
@@ -167,7 +167,7 @@ jobs:
167167
parameters:
168168
job_name: win2022_cpython_2
169169
image_name: windows-2022
170-
python_versions: ['3.9', '3.10']
170+
python_versions: ['3.9', '3.10', '3.11']
171171
python_architecture: x64
172172
test_suites:
173173
all: venv\Scripts\pytest -n 2 -vvs tests\scancode\test_cli.py
@@ -182,7 +182,7 @@ jobs:
182182
parameters:
183183
job_name: ubuntu20_test_all_supported_click_versions
184184
image_name: ubuntu-20.04
185-
python_versions: ['3.8', '3.9', '3.10']
185+
python_versions: ['3.8', '3.9', '3.10', '3.11']
186186
python_architecture: x64
187187
test_suites:
188188
click_versions: |
@@ -202,55 +202,55 @@ jobs:
202202
parameters:
203203
job_name: ubuntu22_cpython_latest_from_pip
204204
image_name: ubuntu-22.04
205-
python_versions: ['3.8', '3.9', '3.10']
205+
python_versions: ['3.8', '3.9', '3.10', '3.11']
206206
test_suites:
207-
all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[dev] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
207+
all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[testing] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
208208

209209
- template: etc/ci/azure-posix.yml
210210
parameters:
211211
job_name: ubuntu18_cpython_latest_from_pip
212212
image_name: ubuntu-18.04
213-
python_versions: ['3.8', '3.9', '3.10']
213+
python_versions: ['3.8', '3.9', '3.10', '3.11']
214214
test_suites:
215-
all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[dev] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
215+
all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[testing] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
216216

217217
- template: etc/ci/azure-posix.yml
218218
parameters:
219219
job_name: ubuntu20_cpython_latest_from_pip
220220
image_name: ubuntu-20.04
221-
python_versions: ['3.8', '3.9', '3.10']
221+
python_versions: ['3.8', '3.9', '3.10', '3.11']
222222
test_suites:
223-
all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[dev] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
223+
all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[testing] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
224224

225225
- template: etc/ci/azure-posix.yml
226226
parameters:
227227
job_name: macos11_cpython_latest_from_pip
228228
image_name: macos-11
229-
python_versions: ['3.8', '3.9', '3.10']
229+
python_versions: ['3.8', '3.9', '3.10', '3.11']
230230
test_suites:
231-
all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[dev] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
231+
all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[testing] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
232232

233233
- template: etc/ci/azure-posix.yml
234234
parameters:
235235
job_name: macos12_cpython_latest_from_pip
236236
image_name: macos-12
237-
python_versions: ['3.8', '3.9', '3.10']
237+
python_versions: ['3.8', '3.9', '3.10', '3.11']
238238
test_suites:
239-
all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[dev] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
239+
all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[testing] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
240240

241241
- template: etc/ci/azure-win.yml
242242
parameters:
243243
job_name: win2019_cpython_latest_from_pip
244244
image_name: windows-2019
245-
python_versions: ['3.8', '3.9', '3.10']
245+
python_versions: ['3.8', '3.9', '3.10', '3.11']
246246
test_suites:
247-
all: venv\Scripts\pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[dev] && venv\Scripts\pytest -n 2 -vvs tests\scancode\test_cli.py
247+
all: venv\Scripts\pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[testing] && venv\Scripts\pytest -n 2 -vvs tests\scancode\test_cli.py
248248

249249
- template: etc/ci/azure-win.yml
250250
parameters:
251251
job_name: win2022_cpython_latest_from_pip
252252
image_name: windows-2022
253-
python_versions: ['3.8', '3.9', '3.10']
253+
python_versions: ['3.8', '3.9', '3.10', '3.11']
254254
test_suites:
255-
all: venv\Scripts\pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[dev] && venv\Scripts\pytest -n 2 -vvs tests\scancode\test_cli.py
255+
all: venv\Scripts\pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[testing] && venv\Scripts\pytest -n 2 -vvs tests\scancode\test_cli.py
256256

requirements-native.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cffi==1.15.1
2-
intbitset==3.0.1
3-
lxml==4.9.1
2+
intbitset==3.0.2
3+
lxml==4.9.2
44
MarkupSafe==2.1.1
5-
pyahocorasick==2.0.0b1
5+
pyahocorasick==2.0.0
66
PyYAML==6.0

requirements.txt

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
attrs==21.4.0
1+
attrs==22.1
22
banal==1.0.6
33
beautifulsoup4==4.11.1
44
binaryornot==0.4.4
@@ -28,14 +28,14 @@ html5lib==1.1
2828
idna==3.3
2929
importlib-metadata==4.12.0
3030
inflection==0.5.1
31-
intbitset==3.0.1
31+
intbitset==3.0.2
3232
isodate==0.6.1
3333
jaraco.functools==3.5.1
3434
javaproperties==0.8.1
3535
Jinja2==3.1.2
3636
jsonstreams==0.6.0
3737
license-expression==30.0.0
38-
lxml==4.9.1
38+
lxml==4.9.2
3939
MarkupSafe==2.1.1
4040
more-itertools==8.13.0
4141
normality==2.3.3
@@ -51,7 +51,7 @@ pluggy==1.0.0
5151
plugincode==31.0.0
5252
ply==3.11
5353
publicsuffix2==2.20191221
54-
pyahocorasick==2.0.0b1
54+
pyahocorasick==2.0.0
5555
pycparser==2.21
5656
pygmars==0.7.0
5757
Pygments==2.12.0
@@ -61,7 +61,7 @@ pytz==2022.1
6161
PyYAML==6.0
6262
rdflib==6.2.0
6363
requests==2.28.1
64-
saneyaml==0.5.2
64+
saneyaml==0.6.0
6565
six==1.16.0
6666
soupsieve==2.3.2.post1
6767
spdx-tools==0.7.0a3

setup-mini.cfg

+7-5
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ classifiers =
2121
Programming Language :: Python :: 3.8
2222
Programming Language :: Python :: 3.9
2323
Programming Language :: Python :: 3.10
24+
Programming Language :: Python :: 3.11
2425
Topic :: Software Development
2526
Topic :: Utilities
2627

@@ -62,7 +63,8 @@ py_modules =
6263
python_requires = >=3.7
6364

6465
install_requires =
65-
attrs >= 18.1, !=20.1.0
66+
attrs >= 18.1,!=20.1.0;python_version<'3.11'
67+
attrs >= 22.1;python_version>='3.11'
6668
Beautifulsoup4 >= 4.0.0
6769
boolean.py >= 4.0
6870
chardet >= 3.0.0
@@ -78,13 +80,13 @@ install_requires =
7880
gemfileparser2 >= 0.9.0
7981
html5lib
8082
importlib_metadata
81-
intbitset >= 3.0.0
83+
intbitset >= 3.0.2
8284
jaraco.functools
8385
javaproperties >= 0.5
8486
jinja2 >= 2.7.0
8587
jsonstreams >= 0.5.0
8688
license_expression >= 30.0.0
87-
lxml >= 4.9.1
89+
lxml >= 4.9.2
8890
MarkupSafe >= 1.0
8991
packageurl_python >= 0.9.0
9092
packvers >= 21.0.0
@@ -97,12 +99,12 @@ install_requires =
9799
pluggy >= 1.0.0
98100
plugincode >= 31.0.0
99101
publicsuffix2
100-
pyahocorasick >= 2.0.0b1
102+
pyahocorasick >= 2.0.0
101103
pygmars >= 0.7.0
102104
pygments
103105
pymaven_patch >= 0.2.8
104106
requests >= 2.7.0
105-
saneyaml >= 0.5.2
107+
saneyaml >= 0.6.0
106108
spdx_tools == 0.7.0a3
107109
text_unidecode >= 1.0
108110
toml >= 0.10.0

setup.cfg

+7-5
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ classifiers =
2121
Programming Language :: Python :: 3.8
2222
Programming Language :: Python :: 3.9
2323
Programming Language :: Python :: 3.10
24+
Programming Language :: Python :: 3.11
2425
Topic :: Software Development
2526
Topic :: Utilities
2627

@@ -62,7 +63,8 @@ py_modules =
6263
python_requires = >=3.7
6364

6465
install_requires =
65-
attrs >= 18.1, !=20.1.0
66+
attrs >= 18.1,!=20.1.0;python_version<'3.11'
67+
attrs >= 22.1;python_version>='3.11'
6668
Beautifulsoup4 >= 4.0.0
6769
boolean.py >= 4.0
6870
chardet >= 3.0.0
@@ -78,13 +80,13 @@ install_requires =
7880
gemfileparser2 >= 0.9.0
7981
html5lib
8082
importlib_metadata
81-
intbitset >= 3.0.0
83+
intbitset >= 3.0.2
8284
jaraco.functools
8385
javaproperties >= 0.5
8486
jinja2 >= 2.7.0
8587
jsonstreams >= 0.5.0
8688
license_expression >= 30.0.0
87-
lxml >= 4.9.1
89+
lxml >= 4.9.2
8890
MarkupSafe >= 1.0
8991
packageurl_python >= 0.9.0
9092
packvers >= 21.0.0
@@ -97,12 +99,12 @@ install_requires =
9799
pluggy >= 1.0.0
98100
plugincode >= 31.0.0
99101
publicsuffix2
100-
pyahocorasick >= 2.0.0b1
102+
pyahocorasick >= 2.0.0
101103
pygmars >= 0.7.0
102104
pygments
103105
pymaven_patch >= 0.2.8
104106
requests >= 2.7.0
105-
saneyaml >= 0.5.2
107+
saneyaml >= 0.6.0
106108
spdx_tools == 0.7.0a3
107109
text_unidecode >= 1.0
108110
toml >= 0.10.0

0 commit comments

Comments
 (0)