Skip to content

Commit 6c0e96d

Browse files
Update Configure and release scripts
Signed-off-by: Ayan Sinha Mahapatra <asmahapatra@aboutcode.org>
1 parent 5856d9b commit 6c0e96d

File tree

3 files changed

+10
-16
lines changed

3 files changed

+10
-16
lines changed

configure

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,10 @@ CLI_ARGS=$1
142142
################################
143143

144144
BASE=".[packages]"
145-
BASE_DEV=".[packages,testing]"
145+
BASE_DEV=".[packages,dev]"
146146
if [[ $OSTYPE == 'darwin'* ]]; then
147147
BASE="."
148-
BASE_DEV=".[testing]"
148+
BASE_DEV=".[dev]"
149149
fi
150150

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

etc/release/scancode-create-pypi-sdist.sh renamed to etc/release/licensedcode-create-pypi-wheel-and-sdist.sh

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,22 @@
99
#
1010

1111
################################################################################
12-
# ScanCode release build script for PyPI sdists
12+
# ScanCode release build script for PyPI wheels.
13+
# Build a wheel for the current Python version
1314
################################################################################
1415

1516
set -e
1617
# Un-comment to trace execution
1718
#set -x
1819

1920
./configure --dev
20-
venv/bin/python setup.py --quiet sdist
21+
venv/bin/scancode-reindex-licenses
22+
venv/bin/scancode-reindex-package-patterns
23+
venv/bin/scancode-train-gibberish-model
2124

22-
rm -rf build .eggs src/scancode_toolkit*.egg-info src/scancode_toolkit_mini*.egg-info
23-
cp setup.cfg setup-main.cfg
24-
cp setup-mini.cfg setup.cfg
25-
26-
venv/bin/python setup.py --quiet sdist
27-
28-
cp setup-main.cfg setup.cfg
29-
rm setup-main.cfg
25+
# build license data packages
26+
venv/bin/flot --pyproject pyproject-licensedcode-data.toml --wheel --sdist
27+
venv/bin/flot --pyproject pyproject-licensedcode-index.toml --wheel --sdist
3028

3129
venv/bin/twine check dist/*
3230

etc/release/scancode-create-pypi-wheel-and-sdist.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ venv/bin/scancode-reindex-licenses
2222
venv/bin/scancode-reindex-package-patterns
2323
venv/bin/scancode-train-gibberish-model
2424

25-
# build license data packages
26-
venv/bin/flot --pyproject pyproject-licensedcode-data.toml --wheel --sdist
27-
venv/bin/flot --pyproject pyproject-licensedcode-index.toml --wheel --sdist
28-
2925
# build code packages
3026
venv/bin/flot --pyproject pyproject-scancode-toolkit.toml --wheel --sdist
3127
venv/bin/flot --pyproject pyproject-scancode-toolkit-mini.toml --wheel --sdist

0 commit comments

Comments
 (0)