Merge pull request winpython#931 from stonebig/master

stonebig · web-flow · commit 644acf1a3354 · 2021-02-13T21:06:26.000+01:00
remove 'log' temporary hack and workaround rmdir issue
diff --git a/generate_a_winpython_distro.bat b/generate_a_winpython_distro.bat
@@ -41,7 +41,7 @@ rem Override other scripts (simpler maintenance)
 set my_buildenv=C:\WinPython-64bit-3.6.8.0
 
 rem handle alpha set my_release_level=a0
-if "%my_release_level%"=="" set my_release_level=b1
+if "%my_release_level%"=="" set my_release_level=b3
 
 rem ---------
 rem newAge 20191022
@@ -125,6 +125,13 @@ set build_det=\%my_flavor%
 if "%my_flavor%"=="" set build_det=
 
 dir %build_det%
+
+rem 2021-02-13 workaround to hard to remove json files
+echo ren bu%my_flavor% bu%my_flavor%_old
+ren bu%my_flavor% bu%my_flavor%_old
+start rmdir /S /Q bu%my_flavor%_old
+
+
 echo rmdir /S /Q bu%my_flavor%
 rem  pause
 rmdir /S /Q bu%my_flavor%
@@ -219,16 +226,12 @@ rem F/2020-07-05: install msvc_runtime before packages that may want to compile
 
 rem 2020-12-05 : add a constraints.txt file from a recent pip list
 
-rem 2021-01-09 : temporary log file to trace conflicts on very loong resolver time
-rem if issue, search "ERROR:" in --log C:\WinP\log.txt
-echo ".">C:\WinP\log.txt
 
-echo pip install -r %my_requirements% -c %my_constraints% --pre  --no-index --trusted-host=None --log C:\WinP\log.txt --find-links=C:\WinP\packages.srcreq  --upgrade %new_resolver%
-echo pip install -r %my_requirements% -c %my_constraints% --pre  --no-index --trusted-host=None --log C:\WinP\log.txt --find-links=C:\WinP\packages.srcreq  --upgrade %new_resolver%>>%my_archive_log%
-start notepad.exe C:\WinP\log.txt
+echo pip install -r %my_requirements% -c %my_constraints% --pre  --no-index --trusted-host=None --find-links=C:\WinP\packages.srcreq  --upgrade %new_resolver%
+echo pip install -r %my_requirements% -c %my_constraints% --pre  --no-index --trusted-host=None --find-links=C:\WinP\packages.srcreq  --upgrade %new_resolver%>>%my_archive_log%
 echo if pip doesn't work, check the path of %my_WINPYDIRBASE%
 
-pip install -r %my_requirements% -c %my_constraints% --pre  --no-index --trusted-host=None --log C:\WinP\log.txt  --find-links=C:\WinP\packages.srcreq  --upgrade %new_resolver%>>%my_archive_log%
+pip install -r %my_requirements% -c %my_constraints% --pre  --no-index --trusted-host=None --find-links=C:\WinP\packages.srcreq  --upgrade %new_resolver%>>%my_archive_log%
 
 echo mid of step 2/3
 
@@ -263,5 +266,7 @@ echo END OF creation>>%my_archive_log%
 echo %date% %time%  >>%my_archive_log%
 echo ===============>>%my_archive_log%
 
+rem show logs
+start notepad.exe %my_archive_log%
 set path=%my_original_path%
 rem pause
diff --git a/run_complement_newbuild.bat b/run_complement_newbuild.bat
@@ -8,9 +8,8 @@ rem 2021-01-30: jupyterlab2 final stuff removal
 
 
 rem if build error, launch "WinPython Command Prompt.exe" dos ico, then try manual install of requirements.txt 
-rem that is:  pip install --pre  --no-index --trusted-host=None --log C:\WinP\log.txt  --find-links=C:\WinP\packages.srcreq -c C:\WinP\constraints.txt -r   c:\....\requirements.txt 
+rem that is:  pip install --pre  --no-index --trusted-host=None --find-links=C:\WinP\packages.srcreq -c C:\WinP\constraints.txt -r   c:\....\requirements.txt 
 rem           ( drag & drop "requirements.txt" file in the dos window a the end of the line, to get full path)
-rem if issue, search "ERROR:" in --log C:\WinP\log.txt
 rem then drag & drop "run_complement_newbuild.bat" file in the dos window and launch it
 
 @echo off 
diff --git a/winpython/data/packages.ini b/winpython/data/packages.ini
@@ -2839,3 +2839,12 @@ description = Caching mindful of computation/storage costs
 [pynndescent]
 description = Nearest Neighbor Descent
 
+[torchaudio]
+description = An audio package for PyTorch
+
+[napari-console]
+description = A plugin that adds a console to napari
+
+[docstring-parser]
+description = UNKNOWN
+
