Make Windows app testing work

Signed-off-by: Philippe Ombredanne <[email protected]>

Author: pombredanne

.github/workflows/scancode-release.yml

@@ -335,12 +335,13 @@ jobs:
             --dest $thirdparty_dir \
             --sdists --use-cached-index
           cp dist/scancode_*.whl $release_dir
+          mkdir -p $release_dir/etc/thirdparty
+          cp -r etc/thirdparty $release_dir/etc/thirdparty
           cp -r \
-            scancode extractcode configure \
+            scancode.bat extractcode.bat configure.bat \
             *.rst \
             samples \
             *NOTICE *LICENSE *ABOUT \
-            etc/thirdparty \
             $release_dir
           zipball=scancode-toolkit-$(git describe --tags)_py$python_dot_version-$operating_system.zip
           zip -r dist/$zipball $release_dir
@@ -621,8 +622,7 @@ jobs:
 
       - name: test install app archive
         run: |
-          for %%F in (dist/*.zip) do python etc/release/scancode_release_tests.py %%F
-
+          for /f %%F in (dist/*.zip) do python etc/release/scancode_release_tests.py dist/%%F
 
 #  publish_to_gh_release:
 #    name: Publish to GH Release

configure.bat

@@ -30,7 +30,6 @@ set "REQUIREMENTS=--editable . --constraint requirements.txt"
 set "DEV_REQUIREMENTS=--editable .[testing] --constraint requirements.txt --constraint requirements-dev.txt"
 set "DOCS_REQUIREMENTS=--editable .[docs] --constraint requirements.txt"
 set "REL_REQUIREMENTS=--requirement etc/scripts/requirements.txt"
-set "PROD_REQUIREMENTS=scancode_toolkit*.whl"
 
 @rem # where we create a virtualenv
 set "VIRTUALENV_DIR=venv"
@@ -58,7 +57,9 @@ set "CFG_BIN_DIR=%CFG_ROOT_DIR%\%VIRTUALENV_DIR%\Scripts"
 @rem # offline mode for scancode installation with no index at all
 if exist "%CFG_ROOT_DIR%\thirdparty" (
     set PIP_EXTRA_ARGS=--no-index --find-links "%CFG_ROOT_DIR%\thirdparty"
-    set "CFG_REQUIREMENTS=%PROD_REQUIREMENTS%"
+    for %%i in (scancode_toolkit*.whl) do set "CFG_REQUIREMENTS=%CFG_ROOT_DIR%\%%i[full]"
+    @rem echo PROD_REQUIREMENTS: %PROD_REQUIREMENTS%
+    @rem set "CFG_REQUIREMENTS=%PROD_REQUIREMENTS%"
 ) else (
     set "CFG_REQUIREMENTS=%REQUIREMENTS%"
 )

etc/release/scancode_release_tests.py

@@ -17,7 +17,6 @@
 on_windows = "win32" in str(sys.platform).lower()
 
 
-
 def run_app_smoke_tests(app_archive):
     """
     Run basic "smoke" scancode tests for the app release archive `app_archive`
@@ -46,18 +45,13 @@ def run_app_smoke_tests(app_archive):
     with open("some.file", "w") as sf:
         sf.write("license: gpl-2.0")
 
-
     print(f"Configuring scancode for release: {app_archive}")
     cpath = os.path.join(extract_loc, "configure")
-    if on_windows:
-        cpath += ".bat"
 
     run_command([cpath])
 
     # minimal tests: update when new scans are available
     scpath = os.path.join(extract_loc, "scancode")
-    if on_windows:
-        scpath += ".bat"
 
     args = [
         scpath,