8000 package names by stonebig · Pull Request #1255 · winpython/winpython · GitHub
[go: up one dir, main page]
Skip to content

package names #1255

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

Merged
merged 2 commits into from
Aug 23, 2023
Merged

package names #1255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f53de87
package names
stonebig Aug 23, 2023
1e68a48
rework build to integrate mkl step
stonebig Aug 23, 2023
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
458 changes: 0 additions & 458 deletions Cod_requirements64.txt
View file
Open in desktop

This file was deleted.

605 changes: 247 additions & 358 deletions Qt5_requirements64.txt
View file
Open in desktop

Large diffs are not rendered by default.

213 changes: 147 additions & 66 deletions generate_a_winpython_distro.bat
View file
Open in desktop
8000
Original file line number Diff line number Diff line change
Expand Up @@ -2,62 +2,61 @@ rem to launch from a winpython package directory, where 'make.py' is
@echo on

rem *****************************
rem 2020-07-05: install msvc_runtime before packages that may want to compile
rem 2020-12-05 : add a constrints.txt file from a recent pip list
rem 2021-03-20 : track successes packages combination are archived for future contraint update
rem 2021-04-22 : patch PyPy3 (as we don't try to copy PyPy3.exe to Python.exe)
rem 2021-04-22b: Patch PyPy3, give '%my_python_target_release%' to make (otherwise known only after unzip)
rem *****************************

if "%my_constraints%"=="" set my_constraints=C:\WinP\constraints.txt

rem *****************************
rem 2021-04-22 : path PyPy3 (as we don't try to copy PyPy3.exe to Python.exe)
rem *****************************
rem just replace python.exe (of the target distribution) per %target_python_exe%
if "%target_python_exe%"=="" set target_python_exe=python.exe

rem 2021-04-22 : path PyPy3 (as we don't try to copy PyPy3.exe to Python.exe)
rem 2023-08-21a: add a pre_step with my_requirements_pre.txt + my_find_links_pre
rem *****************************
rem *****************************
rem 2019-05-10 PATCH for build problem (asking permission to overwrite the file)
rem
rem *****************************
del -y %userprofile%\.jupyter\jupyter_notebook_config.py

rem algorithm:
rem 0.0 Initialize variables
rem 1.0 Do 2021-04-22 : patch PyPy3 (as we don't try to copy PyPy3.exe to Python.exe)
rem 2021-04-22b: Patch PyPy3, give '%my_python_target_release%' to make (otherwise known only after unzip)
rem 2 a Pre-clear of previous build infrastructure
rem 2.0 Create a new build
rem 2.1 Create basic build infrastructure
rem 2.2 check infrastructure is in place
rem 2.3 add mandatory packages for build
rem 2.4 add packages pre_requirements (if any)
rem 2.5 add requirement packages
rem 2.8 post-build (if specific workarounds)
rem 2.9 archive success
rem 3.0 Generate Changelog and binaries

rem ******************************


rem this is initialised per the calling .bat
rem this is pre-initialised per the program calling this .bat
rem set my_original_path=%path%
rem set my_buildenv=C:\WinPython-64bit-3.6.8.0
rem set my_root_dir_for_builds=D:\WinP

rem set my_python_target=34
rem set my_pyver=3.4
rem set my_flavor=mkl
rem set my_release=84

rem *****************************
rem v2 2016-03-19 change
rem we don't use building rootdir (D:\winPython) anymore
rem we use only building basedir (D:\WinPython\basedir34Qt5)

rem set my_find_link=C:\WinP\packages.srcreq

rem this is optionaly pre-initialised per the calling program (simpler to manage here)
rem set my_release_level=


echo ------------------
echo 0.0 Initialize variables
echo ------------------

if "%my_release_level%"=="" set my_release_level=b4

set my_basedir=%my_root_dir_for_builds%\bd%my_python_target%
rem set my_basedir=%my_root_dir_for_builds%\build%my_python_target%\%my_arch%

rem ***********************************************************
rem Override other scripts (simpler maintenance)
set my_buildenv=C:\WinPdev\WPy64-3890

set my_buildenv=C:\WinPython-64bit-3.6.8.0
if "%my_constraints%"=="" set my_constraints=C:\WinP\constraints.txt

rem handle alpha set my_release_level=a0
if "%my_release_level%"=="" set my_release_level=
rem b5
rem 2021-04-22 : path PyPy3 (as we don't try to copy PyPy3.exe to Python.exe)
if "%target_python_exe%"=="" set target_python_exe=python.exe

rem ---------
rem newAge 20191022
rem install with zero package, no installer, then do it from there
rem change is we must help by giving my_python_target_release
rem --------

if %my_python_target%==37 (
set my_python_target_release=3712
Expand All @@ -68,40 +67,48 @@ if %my_python_target%==38 (
set my_release=1
)
if %my_python_target%==39 (
set my_python_target_release=3910
set my_release=0
set my_python_target_release=3915
set my_release=1
)

if %my_python_target%==310 (
set my_python_target_release=3108
set my_release=0
set my_python_target_release=31011
set my_release=2
)


if %my_python_target%==311 (
set my_python_target_release=3110
set my_python_target_release=3114
set my_release=1
)


if %my_python_target%==312 (
set my_python_target_release=3120
set my_release=0
)



rem **** 2018-10-30 create_installer **
if "%my_create_installer%"=="" set my_create_installer=True
rem ***********************************************************

rem set my_flavor=Slim

rem set my_arch=32
rem set my_preclear_build_directory=Yes

rem set my_requi=C:\Winpents=d:\my_req1.txt d:\my_req2.txt d:\my_req3.txt d:\my_req4.txt
rem 20230821 add a requirement_pre.txt +
rem set my_requirements_pre=C:\WinP\bd311\requirements_mkl_pre.txt
rem set my_find_links_pre=C:\WinP\packages_mkl.srcreq

rem set my_requirements=C:\Winpents=d:\my_req1.txt
rem set my_find_links=D:\WinPython\packages.srcreq

rem set my_source_dirs=D:\WinPython\bd34\packages.src D:\WinPython\bd34\packages.win32.Slim
rem set my_toolsdirs=D:\WinPython\bd34\Tools.Slim
rem set my_docsdirs=D:\WinPython\bd34\docs.Slim


rem set my_install_options=--no-index --pre

set my_day=%date:/=-%
Expand Down Expand Up @@ -130,11 +137,16 @@ echo ===============>>%my_archive_log%
if not "%my_preclear_build_directory%"=="Yes" goto no_preclear


echo ------------------
echo 1.0 Do a Pre-clear of previous build infrastructure
echo ------------------
echo ------------------>>%my_archive_log%
echo 1.0 Do Pre-clear >>%my_archive_log%
echo 1.0 Do a Pre-clear of previous build infrastructure>>%my_archive_log%
echo %date% %time% >>%my_archive_log%
echo ------------------>>%my_archive_log%

rem 2019-05-10 PATCH for build problem (asking permission to overwrite the file)
del -y %userprofile%\.jupyter\jupyter_notebook_config.py

cd /D %my_root_dir_for_builds%\bd%my_python_target%

Expand Down Expand Up @@ -165,11 +177,14 @@ echo %date% %time%>>%my_archive_log%

:no_preclear

e

echo ------------------>>%my_archive_log%
echo 2.0 Create a build>>%my_archive_log%
echo -----------------------------
echo 2.0 Create a new build
echo ---------------------------- >>%my_archive_log%
echo 2.0 Create a new build>>%my_archive_log%
echo %date% %time% >>%my_archive_log%
echo ------------------>>%my_archive_log%
echo ---------------------------- >>%my_archive_log%


echo cd /D %~dp0>>%my_archive_log%
Expand All @@ -181,9 +196,13 @@ set path=%my_original_path%
echo call %my_buildenv%\scripts\env.bat>>%my_archive_log%
call %my_buildenv%\scripts\env.bat

echo -----------------------------
echo 2.1 Create basic build infrastructure
echo %date% %time%
echo -----------------------------
echo ----------------------------->>%my_archive_log%
echo 2.0 Create a build newage1/3 >>%my_archive_log%
echo %date% %time% >>%my_archive_log%
echo 2.1 Create basic build infrastructure>>%my_archive_log%
echo %date% %time% >>%my_archive_log%
echo ----------------------------->>%my_archive_log%

rem 2019-10-22 new age step1
Expand All @@ -203,12 +222,12 @@ rem echo python.exe -c "from make import *;make_all(%my_release%, '%my_release_


echo -----------------------------
echo 2.0 Create a build newage2/3
echo %date% %time%
echo -----------------------------
echo 2.2 check infrastructure is in place
echo %date% %time%
echo -----------------------------
echo ----------------------------->>%my_archive_log%
echo 2.0 Create a build newage2/3 >>%my_archive_log%
echo %date% %time% >>%my_archive_log%
echo 2.2 check infrastructure is in place>>%my_archive_log%
echo %date% %time% >>%my_archive_log%
echo ----------------------------->>%my_archive_log%
rem 2019-10-22 new age step2
rem we use final environment to install requirements
Expand Down Expand Up @@ -238,25 +257,77 @@ set
echo beg of step 2/3
rem ok no pause

echo -----------------------------
echo 2.3 add mandatory packages for build
echo %date% %time%
echo -----------------------------
echo ----------------------------->>%my_archive_log%
echo 2.3 add mandatory packages for build>>%my_archive_log%
echo %date% %time% >>%my_archive_log%
echo ----------------------------->>%my_archive_log%
rem D/2020-07-05: install msvc_runtime before packages that may want to compile
echo pip install msvc_runtime --pre --no-index --trusted-host=None --find-links=C:\WinP\packages.srcreq --upgrade
echo pip install msvc_runtime --pre --no-index --trusted-host=None --find-links=C:\WinP\packages.srcreq --upgrade>>%my_archive_log%
pip install msvc_runtime --pre --no-index --trusted-host=None --find-links=C:\WinP\packages.srcreq --upgrade
echo pip install msvc_runtime --pre --no-index --trusted-host=None --find-links=%my_find_links% --upgrade
echo pip install msvc_runtime --pre --no-index --trusted-host=None --find-links=%my_find_links% --upgrade>>%my_archive_log%
pip install msvc_runtime --pre --no-index --trusted-host=None --find-links=%my_find_links% --upgrade
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 D/2023-08-21a: add a pre_step with my_requirements_pre.txt + my_find_links_pre

echo -----------------------------
echo 2.4 add packages pre_requirements (if any)
echo %date% %time%
echo -----------------------------
echo ----------------------------->>%my_archive_log%
echo 2.4 add packages pre_requirements (if any)
echo %date% %time% >>%my_archive_log%
echo ----------------------------->>%my_archive_log%rem F/20230821 add a pre_step with my_requirements_pre.txt + my_find_links_pre

if not "Z%my_requirements_pre%Z"=="ZZ" (

rem 2023-08-21a: add a pre_step with my_requirements_pre.txt + my_find_links_pre
if "%my_find_links_pre%"=="" set my_find_links_pre=%my_find_links%

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 pip install -r %my_requirements_pre% -c %my_constraints% --pre --no-index --trusted-host=None --find-links=%my_find_links_pre% --upgrade %new_resolver%
echo pip install -r %my_requirements_pre% -c %my_constraints% --pre --no-index --trusted-host=None --find-links=%my_find_links_pre% --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 --find-links=C:\WinP\packages.srcreq --upgrade %new_resolver%>>%my_archive_log%
pip install -r %my_requirements_pre% -c %my_constraints% --pre --no-index --trusted-host=None --find-links=%my_find_links_pre% --upgrade %new_resolver%>>%my_archive_log%
)
else
(
echo no packages pre_requirements
echo no packages pre_requirements>>%my_archive_log%
)
rem F/2023-08-21a: add a pre_step with my_requirements_pre.txt + my_find_links_pre

echo mid of step 2/3
echo -----------------------------
echo 2.5 add requirement packages
echo %date% %time%
echo -----------------------------
echo ----------------------------->>%my_archive_log%
echo 2.5 add requirement packages_versions>>%my_archive_log%
echo %date% %time% >>%my_archive_log%
echo ----------------------------->>%my_archive_log%

echo pip install -r %my_requirements% -c %my_constraints% --pre --no-index --trusted-host=None --find-links=%my_find_links% --upgrade %new_resolver%
echo pip install -r %my_requirements% -c %my_constraints% --pre --no-index --trusted-host=None --find-links=%my_find_links% --upgrade %new_resolver%>>%my_archive_log%
echo if pip doesn't work, check the path of %my_WINPYDIRBASE%


rem 2020-12-05 : add a constraints.txt file from a recent pip list
pip install -r %my_requirements% -c %my_constraints% --pre --no-index --trusted-host=None --find-links=%my_find_links% --upgrade %new_resolver%>>%my_archive_log%

echo mid of step 2/3

echo -----------------------------
echo 2.8 post-build (if specific workarounds)
echo %date% %time%
echo -----------------------------
echo ----------------------------->>%my_archive_log%
echo 2.8 post-build (if specific workarounds)>>%my_archive_log%
echo %date% %time% >>%my_archive_log%
echo ----------------------------->>%my_archive_log%
rem finalize
@echo on
call %my_basedir%\run_complement_newbuild.bat %my_WINPYDIRBASE%
Expand All @@ -267,17 +338,24 @@ rem pause
rem *****************************
rem 2021-03-20 : track successes packages combination are archived for future contraint update
rem *****************************
echo -----------------------------
echo 2.9 archive success
echo %date% %time%
echo -----------------------------
echo ----------------------------->>%my_archive_log%
echo 1.99 archive success
echo %date% %time% >>%my_archive_log%
echo 2.9 archive success >>%my_archive_log%
echo %date% %time% >>%my_archive_log%
echo ----------------------------->>%my_archive_log%
echo %target_python_exe% -m pip freeze>%my_archive_log%.packages_versions.txt>>%my_archive_log%

%target_python_exe% -m pip freeze>%my_archive_log%.packages_versions.txt


echo -----------------------------
echo 3.0 Generate Changelog and binaries
echo -----------------------------
echo ----------------------------->>%my_archive_log%
echo 2.0 Create a build newage3/3 >>%my_archive_log%
echo 3.0 Generate Changelog and binaries >>%my_archive_log%
echo %date% %time% >>%my_archive_log%
echo ----------------------------->>%my_archive_log%

Expand All @@ -296,6 +374,9 @@ echo python.exe -c "from make import *;make_all(%my_release%, '%my_release_leve
rem pause
python.exe -c "from make import *;make_all(%my_release%, '%my_release_level%', pyver='%my_pyver%', basedir=r'%my_basedir%', verbose=True, architecture=%my_arch%, flavor='%my_flavor%', install_options=r'%my_install_options%', find_links=r'%my_find_links%', source_dirs=r'%my_source_dirs%', create_installer='%my_create_installer%', remove_existing=False, python_target_release='%my_python_target_release%')">>%my_archive_log%

echo ===============
echo END OF creation
echo ===============
echo ===============>>%my_archive_log%
echo END OF creation>>%my_archive_log%
echo %date% %time% >>%my_archive_log%
Expand Down
15 changes: 7 additions & 8 deletions generate_winpython_distros310_dot.bat → generate_winpython_distros311_dot.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,14 @@ rem this replace running manually from spyder the make.py
rem to launch from a winpython module 'make' directory

set my_original_path=%path%
set my_buildenv=C:\winpython-64bit-3.4.3.7Qt5

set my_root_dir_for_builds=C:\Winp
set my_python_target=310
set my_pyver=3.10
set my_python_target=311
set my_pyver=3.11

set my_flavor=dot

set my_release=
set my_release=0

set my_release_level=

Expand All @@ -23,11 +22,11 @@ set my_preclear_build_directory=Yes

set tmp_reqdir=%my_root_dir_for_builds%\bd%my_python_target%

set my_requirements=C:\Winp\bd310\dot_requirements.txt
set my_requirements=C:\Winp\bd311\dot_requirements.txt

set my_find_links=C:\Winp\packages.srcreq

set my_source_dirs=C:\Winp\bd310\packages.win-amd64
set my_source_dirs=C:\Winp\bd311\packages.win-amd64
set my_toolsdirs=C:\Winp\bdTools\Tools.dot
set my_docsdirs=C:\WinP\bdDocs\docs.dot

Expand All @@ -39,9 +38,9 @@ call %~dp0\generate_a_winpython_distro.bat
set my_arch=32
set my_preclear_build_directory=No

set my_source_dirs=C:\Winp\bd310\packages.win32
set my_source_dirs=C:\Winp\bd311\packages.win32

call %~dp0\generate_a_winpython_distro.bat
rem call %~dp0\generate_a_winpython_distro.bat


pause
Loading
0