Skip to content

Commit 1668805

Browse files
Test release apps and wheels without dummy dists
Signed-off-by: Ayan Sinha Mahapatra <asmahapatra@aboutcode.org>
1 parent 144cf2f commit 1668805

11 files changed

Lines changed: 7 additions & 37 deletions

.github/workflows/scancode-release.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ jobs:
271271
strategy:
272272
fail-fast: true
273273
matrix:
274-
os: [macos-14, macos-15, macos-14-intel, macos-15-intel]
274+
os: [macos-14, macos-15, macos-15-intel]
275275
pyver: ["3.10", "3.11", "3.12", "3.13", "3.14"]
276276

277277
steps:
@@ -287,7 +287,7 @@ jobs:
287287
- name: Install system dependencies
288288
run: |
289289
brew update
290-
brew install p7zip libarchive libmagic
290+
brew install libarchive libmagic
291291
292292
- name: Download wheels artifact
293293
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131
@@ -307,7 +307,7 @@ jobs:
307307
done
308308
for f in `find dist -type f -name "scancode_toolkit_mini-*.whl"`; \
309309
do \
310-
venv/bin/python -m pip install --find-links=./etc/thirdparty/dummy_dist --force-reinstall "$f[full]" ; \
310+
venv/bin/python -m pip install --force-reinstall "$f[full]" ; \
311311
venv/bin/scancode -clipeu --json-pp - some.file ; \
312312
done
313313
@@ -428,9 +428,8 @@ jobs:
428428
shell: bash
429429

430430
strategy:
431-
fail-fast: true
432431
matrix:
433-
os: [macos-14, macos-15]
432+
os: [macos-14, macos-15, macos-15-intel]
434433
pyver: ["3.10", "3.11", "3.12", "3.13", "3.14"]
435434

436435
steps:
@@ -446,7 +445,7 @@ jobs:
446445
- name: Install system dependencies
447446
run: |
448447
brew update
449-
brew install p7zip libarchive libmagic
448+
brew install libarchive libmagic
450449
451450
- name: Download a single artifact macos_app_py_${{ matrix.pyver }}
452451
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131

configure

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ BASE_DEV=".[packages,dev]"
149149
if [[ $OSTYPE == 'darwin'* ]]; then
150150
BASE="."
151151
BASE_DEV=".[dev]"
152-
PIP_EXTRA_ARGS="--find-links=./etc/thirdparty/dummy_dist"
153152
fi
154153

155154
# Requirement arguments passed to pip and used by default or with --dev.

configure.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
set "REQUIREMENTS=--no-build-isolation --editable . --constraint requirements.txt"
3030
set "DEV_REQUIREMENTS=--no-build-isolation --editable .[dev] --constraint requirements.txt --constraint requirements-dev.txt"
3131
set "PROD_REQUIREMENTS=--no-build-isolation scancode_toolkit*.whl"
32-
set "FLOT_REQUIREMENTS=etc/thirdparty/flot*.whl"
32+
set "FLOT_REQUIREMENTS= .\etc\thirdparty\flot*.whl"
3333

3434
@rem # where we create a virtualenv
3535
set "VIRTUALENV_DIR=venv"

etc/release/scancode-create-release-app-macos.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ cp -r etc/thirdparty $release_dir/etc
6565
venv/bin/scancode-reindex-package-patterns
6666
venv/bin/scancode-train-gibberish-model
6767
venv/bin/scancode-reindex-licenses
68-
venv/bin/flot --pyproject pyproject-scancode-toolkit-mini.toml --wheel
68+
venv/bin/flot --pyproject pyproject-scancode-toolkit.toml --wheel
6969
venv/bin/flot --pyproject pyproject-licensedcode-index.toml --wheel
7070

7171
cp -r \
@@ -80,10 +80,6 @@ cp -r \
8080
dist/licensedcode_index*.whl \
8181
$release_dir/thirdparty
8282

83-
cp -r \
84-
etc/thirdparty/dummy_dist/*.whl \
85-
$release_dir/thirdparty
86-
8783
tarball=scancode-toolkit-$(git describe --tags)_py$python_dot_version-$operating_system.tar.gz
8884
mkdir -p release
8985
tar -cvzf release/$tarball $release_dir

etc/thirdparty/dummy_dist/README.txt

Lines changed: 0 additions & 24 deletions
This file was deleted.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)