Skip to content

Commit aa0c217

Browse files
AyanSinhaMahapatraAyanSinhaMahapatra
authored
Fix click compatibility issues (#4591)
* Update commoncode with click compatibility fixes Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com> * Explcitly set default values for all click options Reference: #4572 Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com> * Drop python 3.9 support Python 3.9 will be EOL in a week and we have already dropped this in commoncode so we are also dropping python here. Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com> * Fix reindex console script with correct defaults Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com> --------- Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
1 parent 93a2d69 commit aa0c217

36 files changed

+123
-83
lines changed

‎.github/workflows/scancode-release.yml‎

Lines changed: 11 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ name: Create ScanCode release archives, then test and publish to GH and PyPI
55
# Summary of the steps:
66
# - Build wheel and sdist for the "main" scancode, then build these for the "mini" flavor
77
# - test each wheel and sdist on every possible OS x Python version combinations
8-
# - Build release app archives, one for each of linux, windows, macos on Python 3.9 to 3.13
8+
# - Build release app archives, one for each of linux, windows, macos on Python 3.10 to 3.13
99
# - test each on its target OS and Python version
1010
# - Create gh-release and upload app archives to release
1111
# - Upload all wheels and sdist to PyPI
@@ -34,7 +34,7 @@ jobs:
3434
strategy:
3535
fail-fast: true
3636
matrix:
37-
pyver: ["3.9", "3.10", "3.11", "3.12", "3.13"]
37+
pyver: ["3.10", "3.11", "3.12", "3.13"]
3838

3939
steps:
4040
- uses: actions/checkout@v4
@@ -100,7 +100,7 @@ jobs:
100100
strategy:
101101
fail-fast: true
102102
matrix:
103-
pyver: ["3.9", "3.10", "3.11", "3.12", "3.13"]
103+
pyver: ["3.10", "3.11", "3.12", "3.13"]
104104

105105
steps:
106106
- uses: actions/checkout@v4
@@ -135,7 +135,7 @@ jobs:
135135
strategy:
136136
fail-fast: true
137137
matrix:
138-
pyver: ["3.9", "3.10", "3.11", "3.12", "3.13"]
138+
pyver: ["3.10", "3.11", "3.12", "3.13"]
139139

140140
steps:
141141
- uses: actions/checkout@v4
@@ -170,7 +170,7 @@ jobs:
170170
strategy:
171171
fail-fast: true
172172
matrix:
173-
pyver: ["3.9", "3.10", "3.11", "3.12", "3.13"]
173+
pyver: ["3.10", "3.11", "3.12", "3.13"]
174174

175175
steps:
176176
- uses: actions/checkout@v4
@@ -240,7 +240,7 @@ jobs:
240240
fail-fast: true
241241
matrix:
242242
os: [ubuntu-24.04, ubuntu-24.04, macos-13, macos-14]
243-
pyver: ["3.9", "3.10", "3.11", "3.12", "3.13"]
243+
pyver: ["3.10", "3.11", "3.12", "3.13"]
244244

245245
steps:
246246
- uses: actions/checkout@v4
@@ -286,7 +286,7 @@ jobs:
286286
fail-fast: true
287287
matrix:
288288
os: [windows-2025, windows-2022]
289-
pyver: ["3.9", "3.10", "3.11", "3.12", "3.13"]
289+
pyver: ["3.10", "3.11", "3.12", "3.13"]
290290

291291
steps:
292292
- uses: actions/checkout@v4
@@ -331,7 +331,7 @@ jobs:
331331
fail-fast: true
332332
matrix:
333333
os: [ubuntu-24.04, ubuntu-24.04]
334-
pyver: ["3.9", "3.10", "3.11", "3.12", "3.13"]
334+
pyver: ["3.10", "3.11", "3.12", "3.13"]
335335

336336
steps:
337337
- uses: actions/checkout@v4
@@ -376,7 +376,7 @@ jobs:
376376
fail-fast: true
377377
matrix:
378378
os: [macos-13, macos-14]
379-
pyver: ["3.9", "3.10", "3.11", "3.12", "3.13"]
379+
pyver: ["3.10", "3.11", "3.12", "3.13"]
380380

381381
steps:
382382
- uses: actions/checkout@v4
@@ -421,7 +421,7 @@ jobs:
421421
fail-fast: true
422422
matrix:
423423
os: [windows-2025, windows-2022]
424-
pyver: ["3.9", "3.10", "3.11", "3.12", "3.13"]
424+
pyver: ["3.10", "3.11", "3.12", "3.13"]
425425

426426
steps:
427427
- uses: actions/checkout@v4
@@ -469,12 +469,6 @@ jobs:
469469
name: source_app
470470
path: dist
471471

472-
- name: Download a single artifact macos_app for python 3.9
473-
uses: actions/download-artifact@v4
474-
with:
475-
name: macos_app_py_3.9
476-
path: dist
477-
478472
- name: Download a single artifact macos_app for python 3.10
479473
uses: actions/download-artifact@v4
480474
with:
@@ -499,12 +493,6 @@ jobs:
499493
name: macos_app_py_3.13
500494
path: dist
501495

502-
- name: Download a single artifact linux_app for python 3.9
503-
uses: actions/download-artifact@v4
504-
with:
505-
name: linux_app_py_3.9
506-
path: dist
507-
508496
- name: Download a single artifact linux_app for python 3.10
509497
uses: actions/download-artifact@v4
510498
with:
@@ -529,12 +517,6 @@ jobs:
529517
name: linux_app_py_3.13
530518
path: dist
531519

532-
- name: Download a single artifact windows_app for python 3.9
533-
uses: actions/download-artifact@v4
534-
with:
535-
name: windows_app_py_3.9
536-
path: dist
537-
538520
- name: Download a single artifact windows_app for python 3.10
539521
uses: actions/download-artifact@v4
540522
with:
@@ -585,7 +567,7 @@ jobs:
585567
strategy:
586568
fail-fast: false
587569
matrix:
588-
dist_names: ["wheels-3.9", "wheels-3.10", "wheels-3.11", "wheels-3.12", "wheels-3.13", sdists]
570+
dist_names: ["wheels-3.10", "wheels-3.11", "wheels-3.12", "wheels-3.13", sdists]
589571

590572
steps:
591573
- name: Set up Python

‎INSTALL.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ Prerequisites
1616
-------------
1717

1818
Before installing ScanCode make sure you have installed these prerequisites.
19-
The main one is to have Python installed version 3.9, 3.10, 3.11, 3.12 or 3.13.
19+
The main one is to have Python installed version 3.10, 3.11, 3.12 or 3.13.
2020

2121
- For Linux(Ubuntu):
22-
``sudo apt install python3.9-dev bzip2 xz-utils zlib1g libxml2-dev libxslt1-dev``
22+
``sudo apt install python3.10-dev bzip2 xz-utils zlib1g libxml2-dev libxslt1-dev``
2323
- For MacOS: Install Python 3.x from https://www.python.org/
2424
- For Windows: Install Python 3.x from https://www.python.org/ using the 64 bits amd64 variant
2525
- For FreeBSD: (this needs to be documented)

‎README.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,15 +139,15 @@ Installation
139139
============
140140

141141
Before installing ScanCode make sure that you have installed the prerequisites
142-
properly. This means installing Python 3.10 for x86/64 architectures.
143-
We support Python 3.9, 3.10, 3.11, 3.12 and 3.13.
142+
properly. This means installing Python 3.13 for x86/64 architectures.
143+
We support Python 3.10, 3.11, 3.12 and 3.13.
144144

145145
See `prerequisites <https://scancode-toolkit.readthedocs.io/en/latest/getting-started/install.html#prerequisites>`_
146146
for detailed information on the support platforms and Python versions.
147147

148148
There are a few common ways to `install ScanCode <https://scancode-toolkit.readthedocs.io/en/latest/getting-started/install.html>`_.
149149

150-
- `**Installation as an application: Install Python 3.9, download a release archive, extract and run**.
150+
- `**Installation as an application: Install Python 3.13, download a release archive, extract and run**.
151151
<https://scancode-toolkit.readthedocs.io/en/latest/getting-started/install.html#installation-as-an-application-downloading-releases>`_
152152
This is the recommended installation method.
153153

‎azure-pipelines.yml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ jobs:
123123
job_name: ubuntu24_cpython
124124
image_name: ubuntu-24.04
125125
python_architecture: x64
126-
python_versions: ['3.9', '3.10', '3.11', '3.12', '3.13']
126+
python_versions: ['3.10', '3.11', '3.12', '3.13']
127127
test_suites:
128128
all: venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py --reruns 2
129129

@@ -132,15 +132,15 @@ jobs:
132132
job_name: ubuntu22_cpython
133133
image_name: ubuntu-22.04
134134
python_architecture: x64
135-
python_versions: ['3.9', '3.10', '3.11', '3.12', '3.13']
135+
python_versions: ['3.10', '3.11', '3.12', '3.13']
136136
test_suites:
137137
all: venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py --reruns 2
138138

139139
- template: etc/ci/azure-posix.yml
140140
parameters:
141141
job_name: macos14_cpython
142142
image_name: macOS-14
143-
python_versions: ['3.9', '3.10', '3.11', '3.12', '3.13']
143+
python_versions: ['3.10', '3.11', '3.12', '3.13']
144144
python_architecture: x64
145145
test_suites:
146146
all: venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py --reruns 2
@@ -149,15 +149,15 @@ jobs:
149149
parameters:
150150
job_name: macos13_cpython
151151
image_name: macOS-13
152-
python_versions: ['3.9', '3.10', '3.11', '3.12', '3.13']
152+
python_versions: ['3.10', '3.11', '3.12', '3.13']
153153
test_suites:
154154
all: venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py --reruns 2
155155

156156
- template: etc/ci/azure-win.yml
157157
parameters:
158158
job_name: win2025_cpython
159159
image_name: windows-2025
160-
python_versions: ['3.9']
160+
python_versions: ['3.10']
161161
python_architecture: x64
162162
test_suites:
163163
all: venv\Scripts\pytest -n 2 -vvs tests\scancode\test_cli.py --reruns 2
@@ -167,7 +167,7 @@ jobs:
167167
job_name: win2022_cpython
168168
image_name: windows-2022
169169
python_architecture: x64
170-
python_versions: ['3.9', '3.10', '3.11', '3.12', '3.13']
170+
python_versions: ['3.10', '3.11', '3.12', '3.13']
171171
test_suites:
172172
all: venv\Scripts\pytest -n 2 -vvs tests\scancode\test_cli.py --reruns 2
173173

@@ -180,11 +180,11 @@ jobs:
180180
parameters:
181181
job_name: ubuntu22_test_all_supported_click_versions
182182
image_name: ubuntu-22.04
183-
python_versions: ['3.9', '3.10', '3.11', '3.12', '3.13']
183+
python_versions: ['3.10', '3.11', '3.12', '3.13']
184184
python_architecture: x64
185185
test_suites:
186186
click_versions: |
187-
for clk_ver in 8.2.0 8.2.1 8.1.7 8.1.6 8.1.5 8.1.4 8.1.3 8.1.2 8.1.1 8.1.0 8.0.4 8.0.2 8.0.3 8.0.1 7.1.2 7.1.1 7.1 6.7;
187+
for clk_ver in 8.3.0 8.2.0 8.2.1 8.1.7 8.1.6 8.1.5 8.1.4 8.1.3 8.1.2 8.1.1 8.1.0 8.0.4 8.0.2 8.0.3 8.0.1 7.1.2 7.1.1 7.1 6.7;
188188
do
189189
venv/bin/pip install click==$clk_ver;
190190
venv/bin/scancode -i samples/ -n3 --json foo.json;
@@ -200,47 +200,47 @@ jobs:
200200
parameters:
201201
job_name: ubuntu22_cpython_latest_from_pip
202202
image_name: ubuntu-22.04
203-
python_versions: ['3.9', '3.10', '3.11', '3.12', '3.13']
203+
python_versions: ['3.10', '3.11', '3.12', '3.13']
204204
test_suites:
205205
all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[testing] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
206206

207207
- template: etc/ci/azure-posix.yml
208208
parameters:
209209
job_name: ubuntu24_cpython_latest_from_pip
210210
image_name: ubuntu-24.04
211-
python_versions: ['3.9', '3.10', '3.11', '3.12', '3.13']
211+
python_versions: ['3.10', '3.11', '3.12', '3.13']
212212
test_suites:
213213
all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[testing] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
214214

215215
- template: etc/ci/azure-posix.yml
216216
parameters:
217217
job_name: macos14_cpython_latest_from_pip
218218
image_name: macos-14
219-
python_versions: ['3.9', '3.10', '3.11', '3.12', '3.13']
219+
python_versions: ['3.10', '3.11', '3.12', '3.13']
220220
test_suites:
221221
all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[testing] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
222222

223223
- template: etc/ci/azure-posix.yml
224224
parameters:
225225
job_name: macos13_cpython_latest_from_pip
226226
image_name: macos-13
227-
python_versions: ['3.9', '3.10', '3.11', '3.12', '3.13']
227+
python_versions: ['3.10', '3.11', '3.12', '3.13']
228228
test_suites:
229229
all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[testing] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
230230

231231
- template: etc/ci/azure-win.yml
232232
parameters:
233233
job_name: win2019_cpython_latest_from_pip
234234
image_name: windows-2025
235-
python_versions: ['3.9', '3.10', '3.11', '3.12', '3.13']
235+
python_versions: ['3.10', '3.11', '3.12', '3.13']
236236
test_suites:
237237
all: venv\Scripts\pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[testing] && venv\Scripts\pytest -n 2 -vvs tests\scancode\test_cli.py
238238

239239
- template: etc/ci/azure-win.yml
240240
parameters:
241241
job_name: win2022_cpython_latest_from_pip
242242
image_name: windows-2022
243-
python_versions: ['3.9', '3.10', '3.11', '3.12', '3.13']
243+
python_versions: ['3.10', '3.11', '3.12', '3.13']
244244
test_suites:
245245
all: venv\Scripts\pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[testing] && venv\Scripts\pytest -n 2 -vvs tests\scancode\test_cli.py
246246

‎docs/source/contribute/contrib_dev.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ recursive dependencies.
186186

187187
There are utility scripts in ``etc/release`` that can help with the dependencies
188188
management process in particular to build or update wheels with native code for
189-
multiple OSes (Linux, macOS and Windows) and multiple Python versions (3.9+),
189+
multiple OSes (Linux, macOS and Windows) and multiple Python versions (3.10+),
190190
which is not a completely simple operation (and requires eventually 12 wheels
191191
and one source distribution to be published as we support 3 OSes and 5 Python
192192
versions).

‎docs/source/getting-started/install.rst‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ For advanced usage and experienced users, you can also use any of these mode:
4444
Before Installing
4545
-----------------
4646

47-
- ScanCode requires a Python version between 3.9 to 3.13 and is
47+
- ScanCode requires a Python version between 3.10 to 3.13 and is
4848
tested on Linux, macOS, and Windows. It should work fine on FreeBSD.
4949

5050
.. _system_requirements:
@@ -71,8 +71,8 @@ System Requirements
7171
Prerequisites
7272
^^^^^^^^^^^^^
7373

74-
ScanCode needs a Python 3.9+ interpreter; We support all Python versions from
75-
3.9 to 3.12. The default version for the application archives is Python 3.9
74+
ScanCode needs a Python 3.10+ interpreter; We support all Python versions from
75+
3.10 to 3.12. The default version for the application archives is Python 3.10
7676

7777
- **On Linux**:
7878

@@ -90,11 +90,11 @@ ScanCode needs a Python 3.9+ interpreter; We support all Python versions from
9090

9191
- On RPM-based distros run::
9292

93-
sudo yum install python3.9-devel zlib bzip2-libs xz-libs libxml2-devel libxslt-devel libpopt0
93+
sudo yum install python3.10-devel zlib bzip2-libs xz-libs libxml2-devel libxslt-devel libpopt0
9494

9595
- On Fedora 22 and later run::
9696

97-
sudo dnf install python3.9-devel xz-libs zlib libxml2-devel libxslt-devel bzip2-libs libpopt0
97+
sudo dnf install python3.10-devel xz-libs zlib libxml2-devel libxslt-devel bzip2-libs libpopt0
9898

9999

100100
If these packages are not available from your package manager, you must
@@ -103,13 +103,13 @@ ScanCode needs a Python 3.9+ interpreter; We support all Python versions from
103103

104104
- **On Mac**:
105105

106-
The default Python 3 provided with macOS is 3.9.
107-
Alternatively you can download and install Python 3.9 from https://www.python.org/
106+
The default Python 3 provided with macOS is 3.10.
107+
Alternatively you can download and install Python 3.10 from https://www.python.org/
108108

109109

110110
- **On Windows**:
111111

112-
Download and install Python 3.9 from https://www.python.org/
112+
Download and install Python 3.10 from https://www.python.org/
113113

114114
.. Note::
115115

@@ -136,15 +136,15 @@ under assets options.
136136

137137
ScanCode app archives come with packaged with all required dependencies except
138138
for Python that has to be downloaded and installed separately.
139-
On more recent versions of Ubuntu, you will have to install Python 3.9 manually.
139+
On more recent versions of Ubuntu, you will have to install Python 3.10 manually.
140140
One possibility is to use the Deadsnakes PPA (Personal Package Archive) which is
141141
a project that provides older Python version builds for Debian and Ubuntu and is
142142
available at https://github.com/deadsnakes/ and https://launchpad.net/~deadsnakes/+archive/ubuntu/ppa
143143
::
144144

145145
sudo apt-get update && sudo apt-get upgrade
146146
sudo add-apt-repository ppa:deadsnakes/ppa --yes
147-
sudo apt-get install python3.9 python3.9-distutils
147+
sudo apt-get install python3.10 python3.10-distutils
148148

149149
.. _linux_mac_app_install:
150150

0 commit comments

Comments
 (0)