Skip to content

Commit 97d0909

Browse files
Include licensedcode_index wheel as thirdparty
Fix release archive smoke tests. Signed-off-by: Ayan Sinha Mahapatra <asmahapatra@aboutcode.org>
1 parent 30a6184 commit 97d0909

File tree

5 files changed

+15
-6
lines changed

5 files changed

+15
-6
lines changed

configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ fi
151151
# Requirement arguments passed to pip and used by default or with --dev.
152152
REQUIREMENTS="--no-build-isolation --editable $BASE --constraint requirements.txt --constraint requirements-linux.txt"
153153
DEV_REQUIREMENTS="--no-build-isolation --editable $BASE_DEV --constraint requirements.txt --constraint requirements-linux.txt --constraint requirements-dev.txt"
154-
PROD_REQUIREMENTS="--no-build-isolation scancode_toolkit*.whl licensedcode_index*.whl"
154+
PROD_REQUIREMENTS="--no-build-isolation scancode_toolkit*.whl"
155155
FLOT_REQUIREMENTS="etc/thirdparty/flot*.whl"
156156

157157
# where we create a virtualenv

configure.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
@rem # Requirement arguments passed to pip and used by default or with --dev.
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"
31-
set "PROD_REQUIREMENTS=--no-build-isolation scancode_toolkit*.whl licensedcode_index*.whl"
32-
set "FLOT_REQUIREMENTS=etc/thirdparty/flot*.whl"
31+
set "PROD_REQUIREMENTS=--no-build-isolation scancode_toolkit*.whl"
32+
set "FLOT_REQUIREMENTS=etc/thirdparty/flot-0.7.3-py3-none-any.whl.ABOUT"
3333

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

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,16 @@ venv/bin/flot --pyproject pyproject-licensedcode-index.toml --wheel
7272

7373
cp -r \
7474
dist/scancode_*.whl \
75-
dist/licensedcode_index*.whl \
7675
scancode extractcode configure \
7776
*.rst \
7877
samples \
7978
*NOTICE *LICENSE *ABOUT \
8079
$release_dir
8180

81+
cp -r \
82+
dist/licensedcode_index*.whl \
83+
$release_dir/thirdparty
84+
8285
tarball=scancode-toolkit-$(git describe --tags)_py$python_dot_version-$operating_system.tar.gz
8386
mkdir -p release
8487
tar -cvzf release/$tarball $release_dir

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,16 @@ venv/bin/flot --pyproject pyproject-licensedcode-index.toml --wheel
7070

7171
cp -r \
7272
dist/scancode_*.whl \
73-
dist/licensedcode_index*.whl \
7473
scancode extractcode configure \
7574
*.rst \
7675
samples \
7776
*NOTICE *LICENSE *ABOUT \
7877
$release_dir
7978

79+
cp -r \
80+
dist/licensedcode_index*.whl \
81+
$release_dir/thirdparty
82+
8083
tarball=scancode-toolkit-$(git describe --tags)_py$python_dot_version-$operating_system.tar.gz
8184
mkdir -p release
8285
tar -cvzf release/$tarball $release_dir

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,16 @@ venv/bin/flot --pyproject pyproject-licensedcode-index.toml --wheel
7070

7171
cp -r \
7272
dist/scancode_*.whl \
73-
dist/licensedcode_index*.whl \
7473
scancode.bat extractcode.bat configure.bat \
7574
*.rst \
7675
samples \
7776
*NOTICE *LICENSE *ABOUT \
7877
$release_dir
7978

79+
cp -r \
80+
dist/licensedcode_index*.whl \
81+
$release_dir/thirdparty
82+
8083
zipball=scancode-toolkit-$(git describe --tags)_py$python_dot_version-$operating_system.zip
8184
mkdir -p release
8285
zip -r release/$zipball $release_dir

0 commit comments

Comments
 (0)