Skip to content

Fix local commoncode wheel installation on Windows #5413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Shrashti1234 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix local commoncode wheel installation on Windows #5413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions AUTHORS.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ The following organizations or individuals have contributed to ScanCode:
- Sebastian Schuberth @sschuberth
- Shankhadeep Dey @Iamshankhadeep
- Sharikzama @ZamaSharik
- Shrashti @Shrashti1234
- Shrijal Acharya @OctoPie23
- Shivam Chauhan @chashiv
- Shivam Sandbhor @sbs2001
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ Changelog
Next release
--------------

- Install the locally built commoncode wheel on Windows without hardcoding
its version, and fail if building or installing that wheel fails.

- Fix the optional ``licenses`` extra dependency typo to install
``licensedcode-data``.
https://github.com/aboutcode-org/scancode-toolkit/pull/5056
Expand Down
18 changes: 17 additions & 1 deletion configure.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,23 @@ if %ERRORLEVEL% neq 0 (
%FLOT_REQUIREMENTS%

"%CFG_BIN_DIR%\flot" --pyproject pyproject-commoncode.toml
"%CFG_BIN_DIR%\pip" install --force-reinstall ./dist/commoncode-32.5.2-py3-none-any.whl
if errorlevel 1 exit /b 1

@rem # Discover the local wheel without pinning its filename to a release.
set "COMMONCODE_WHEEL="
set "COMMONCODE_WHEEL_COUNT=0"
for %%W in ("%CFG_ROOT_DIR%\dist\commoncode-*.whl") do (
if exist "%%W" (
set /a COMMONCODE_WHEEL_COUNT+=1 >nul
set "COMMONCODE_WHEEL=%%~fW"
)
)
if not "%COMMONCODE_WHEEL_COUNT%"=="1" (
echo ERROR: Expected one local commoncode wheel in dist. Remove stale wheels and retry.
exit /b 1
)
"%CFG_BIN_DIR%\pip" install --force-reinstall "%COMMONCODE_WHEEL%"
if errorlevel 1 exit /b 1

"%CFG_BIN_DIR%\pip" install ^
--upgrade ^
Expand Down
Loading