Skip to content

Commit fe8c22d

Browse files
committed
Build app for all Python versions
Use python3 as the base Python used on Posix Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
1 parent c06705c commit fe8c22d

File tree

2 files changed

+13
-16
lines changed

2 files changed

+13
-16
lines changed

.github/workflows/scancode-release.yml

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -148,18 +148,17 @@ jobs:
148148
operating_system=linux
149149
python_dot_version=3.8
150150
python_version=38
151-
echo -n "python$python_dot_version" > PYTHON_EXECUTABLE
151+
echo -n "python3" > PYTHON_EXECUTABLE
152152
rm -rf thirdparty build dist
153153
rm -rf .eggs src/scancode_toolkit.egg-info src/scancode_toolkit_mini.egg-info
154154
mkdir -p thirdparty
155155
venv/bin/python etc/scripts/fetch_thirdparty.py \
156156
--requirements=requirements-linux.txt \
157157
--requirements=requirements.txt \
158-
--sdist-only libfwsi-python \
159158
--dest=thirdparty \
160-
--python-version=$python_version \
161159
--operating-system=$operating_system \
162160
--wheels
161+
# --python-version=$python_version \
163162
venv/bin/python etc/scripts/fetch_thirdparty.py \
164163
--requirements=requirements-native.txt \
165164
--requirements=requirements-linux.txt \
@@ -171,7 +170,7 @@ jobs:
171170
--dest=thirdparty \
172171
--sdists
173172
venv/bin/python setup.py --quiet sdist --formats=$formats
174-
venv/bin/python etc/release/scancode_rename_archives.py dist/ _py$python_version-$operating_system
173+
venv/bin/python etc/release/scancode_rename_archives.py dist/ _py3-$operating_system
175174
176175
- name: Collect built linux app
177176
uses: actions/upload-artifact@v3
@@ -203,25 +202,23 @@ jobs:
203202
./configure --dev
204203
./scancode --reindex-licenses
205204
206-
207205
- name: Build mac app archive
208206
run: |
209207
source venv/bin/activate
210208
formats=xztar
211209
operating_system=macos
212210
python_dot_version=3.8
213211
python_version=38
214-
echo -n "python$python_dot_version" > PYTHON_EXECUTABLE
212+
echo -n "python3" > PYTHON_EXECUTABLE
215213
rm -rf thirdparty build dist
216214
rm -rf .eggs src/scancode_toolkit.egg-info src/scancode_toolkit_mini.egg-info
217215
mkdir -p thirdparty
218216
venv/bin/python etc/scripts/fetch_thirdparty.py \
219217
--requirements=requirements.txt \
220-
--sdist-only libfwsi-python \
221218
--dest=thirdparty \
222-
--python-version=$python_version \
223219
--operating-system=$operating_system \
224220
--wheels
221+
# --python-version=$python_version \
225222
venv/bin/python etc/scripts/fetch_thirdparty.py \
226223
--requirements=requirements-native.txt \
227224
--wheel-only extractcode \
@@ -233,7 +230,7 @@ jobs:
233230
--dest=thirdparty \
234231
--sdists
235232
venv/bin/python setup.py --quiet sdist --formats=$formats
236-
venv/bin/python etc/release/scancode_rename_archives.py dist/ _py$python_version-$operating_system
233+
venv/bin/python etc/release/scancode_rename_archives.py dist/ _py3-$operating_system
237234
238235
- name: Collect built mac app
239236
uses: actions/upload-artifact@v3
@@ -278,11 +275,10 @@ jobs:
278275
mkdir -p thirdparty
279276
venv/bin/python etc/scripts/fetch_thirdparty.py \
280277
--requirements=requirements.txt \
281-
--sdist-only libfwsi-python \
282278
--dest=thirdparty \
283-
--python-version=$python_version \
284279
--operating-system=$operating_system \
285280
--wheels
281+
# --python-version=$python_version \
286282
venv/bin/python etc/scripts/fetch_thirdparty.py \
287283
--requirements=requirements-native.txt \
288284
--wheel-only extractcode \
@@ -464,7 +460,7 @@ jobs:
464460
strategy:
465461
fail-fast: true
466462
matrix:
467-
os: [ubuntu-20.04]
463+
os: [ubuntu-18.04, ubuntu-20.04, ubuntu-22.04]
468464
pyver: [3.8]
469465

470466
steps:
@@ -502,7 +498,7 @@ jobs:
502498
strategy:
503499
fail-fast: true
504500
matrix:
505-
os: [macos-12]
501+
os: [macos-10.15, macos-11, macos-12]
506502
pyver: [3.8]
507503

508504
steps:
@@ -540,7 +536,7 @@ jobs:
540536
strategy:
541537
fail-fast: true
542538
matrix:
543-
os: [windows-2022]
539+
os: [windows-2019, windows-2022]
544540
pyver: [3.8]
545541

546542
steps:

README.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,14 +133,15 @@ Installation
133133
============
134134

135135
Before installing ScanCode make sure that you have installed the prerequisites
136-
properly. This means installing Python 3.98 for x86/64 architectures. (Python 3.7+ is supported).
136+
properly. This means installing Python 3.8 for x86/64 architectures.
137+
We support Python 3.7, 3.8, 3.9 and 3.10.
137138

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

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

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

146147
- `Development installation from source code using a git clone

0 commit comments

Comments
 (0)